From f417f798681959dd7b96765f5c1a08f2135ff7fc Mon Sep 17 00:00:00 2001 From: Nyholm Date: Wed, 1 Aug 2018 17:58:15 +0200 Subject: [PATCH 1/3] Updated strategy for Nyholm/psr7 This is needed for 1.0 --- src/Strategy/CommonClassesStrategy.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Strategy/CommonClassesStrategy.php b/src/Strategy/CommonClassesStrategy.php index 31a3965..9acc708 100644 --- a/src/Strategy/CommonClassesStrategy.php +++ b/src/Strategy/CommonClassesStrategy.php @@ -32,6 +32,7 @@ use Nyholm\Psr7\Factory\MessageFactory as NyholmMessageFactory; use Nyholm\Psr7\Factory\StreamFactory as NyholmStreamFactory; use Nyholm\Psr7\Factory\UriFactory as NyholmUriFactory; +use Nyholm\Psr7\Factory\HttplugFactory as NyholmFactory; /** * @internal @@ -45,22 +46,25 @@ final class CommonClassesStrategy implements DiscoveryStrategy */ private static $classes = [ MessageFactory::class => [ - ['class' => NyholmMessageFactory::class, 'condition' => [NyholmRequest::class, NyholmMessageFactory::class]], + ['class' => NyholmFactory::class, 'condition' => [NyholmRequest::class, NyholmFactory::class]], ['class' => GuzzleMessageFactory::class, 'condition' => [GuzzleRequest::class, GuzzleMessageFactory::class]], ['class' => DiactorosMessageFactory::class, 'condition' => [DiactorosRequest::class, DiactorosMessageFactory::class]], ['class' => SlimMessageFactory::class, 'condition' => [SlimRequest::class, SlimMessageFactory::class]], + ['class' => NyholmMessageFactory::class, 'condition' => [NyholmRequest::class, NyholmMessageFactory::class]], ], StreamFactory::class => [ - ['class' => NyholmStreamFactory::class, 'condition' => [NyholmRequest::class, NyholmStreamFactory::class]], + ['class' => NyholmFactory::class, 'condition' => [NyholmRequest::class, NyholmFactory::class]], ['class' => GuzzleStreamFactory::class, 'condition' => [GuzzleRequest::class, GuzzleStreamFactory::class]], ['class' => DiactorosStreamFactory::class, 'condition' => [DiactorosRequest::class, DiactorosStreamFactory::class]], ['class' => SlimStreamFactory::class, 'condition' => [SlimRequest::class, SlimStreamFactory::class]], + ['class' => NyholmStreamFactory::class, 'condition' => [NyholmRequest::class, NyholmStreamFactory::class]], ], UriFactory::class => [ - ['class' => NyholmUriFactory::class, 'condition' => [NyholmRequest::class, NyholmUriFactory::class]], + ['class' => NyholmFactory::class, 'condition' => [NyholmRequest::class, NyholmFactory::class]], ['class' => GuzzleUriFactory::class, 'condition' => [GuzzleRequest::class, GuzzleUriFactory::class]], ['class' => DiactorosUriFactory::class, 'condition' => [DiactorosRequest::class, DiactorosUriFactory::class]], ['class' => SlimUriFactory::class, 'condition' => [SlimRequest::class, SlimUriFactory::class]], + ['class' => NyholmUriFactory::class, 'condition' => [NyholmRequest::class, NyholmUriFactory::class]], ], HttpAsyncClient::class => [ ['class' => Guzzle6::class, 'condition' => Guzzle6::class], From a107c86fcf986e7dfcd3b347c919c4264dfe4af3 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 2 Aug 2018 13:22:54 +0200 Subject: [PATCH 2/3] Drop support for nyholm/psr7 < 1.0 --- composer.json | 3 +++ src/Strategy/CommonClassesStrategy.php | 13 ++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 128af59..56a6ec8 100644 --- a/composer.json +++ b/composer.json @@ -43,6 +43,9 @@ "dev-master": "1.3-dev" } }, + "conflict": { + "nyholm/psr7": "<1.0" + }, "prefer-stable": true, "minimum-stability": "beta" } diff --git a/src/Strategy/CommonClassesStrategy.php b/src/Strategy/CommonClassesStrategy.php index 9acc708..e7589a3 100644 --- a/src/Strategy/CommonClassesStrategy.php +++ b/src/Strategy/CommonClassesStrategy.php @@ -29,10 +29,7 @@ use Http\Adapter\Zend\Client as Zend; use Http\Adapter\Artax\Client as Artax; use Nyholm\Psr7\Request as NyholmRequest; -use Nyholm\Psr7\Factory\MessageFactory as NyholmMessageFactory; -use Nyholm\Psr7\Factory\StreamFactory as NyholmStreamFactory; -use Nyholm\Psr7\Factory\UriFactory as NyholmUriFactory; -use Nyholm\Psr7\Factory\HttplugFactory as NyholmFactory; +use Nyholm\Psr7\Factory\HttplugFactory as NyholmHttplugFactory; /** * @internal @@ -46,25 +43,23 @@ final class CommonClassesStrategy implements DiscoveryStrategy */ private static $classes = [ MessageFactory::class => [ - ['class' => NyholmFactory::class, 'condition' => [NyholmRequest::class, NyholmFactory::class]], + ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]], ['class' => GuzzleMessageFactory::class, 'condition' => [GuzzleRequest::class, GuzzleMessageFactory::class]], ['class' => DiactorosMessageFactory::class, 'condition' => [DiactorosRequest::class, DiactorosMessageFactory::class]], ['class' => SlimMessageFactory::class, 'condition' => [SlimRequest::class, SlimMessageFactory::class]], - ['class' => NyholmMessageFactory::class, 'condition' => [NyholmRequest::class, NyholmMessageFactory::class]], ], StreamFactory::class => [ - ['class' => NyholmFactory::class, 'condition' => [NyholmRequest::class, NyholmFactory::class]], + ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]], ['class' => GuzzleStreamFactory::class, 'condition' => [GuzzleRequest::class, GuzzleStreamFactory::class]], ['class' => DiactorosStreamFactory::class, 'condition' => [DiactorosRequest::class, DiactorosStreamFactory::class]], ['class' => SlimStreamFactory::class, 'condition' => [SlimRequest::class, SlimStreamFactory::class]], ['class' => NyholmStreamFactory::class, 'condition' => [NyholmRequest::class, NyholmStreamFactory::class]], ], UriFactory::class => [ - ['class' => NyholmFactory::class, 'condition' => [NyholmRequest::class, NyholmFactory::class]], + ['class' => NyholmHttplugFactory::class, 'condition' => [NyholmHttplugFactory::class]], ['class' => GuzzleUriFactory::class, 'condition' => [GuzzleRequest::class, GuzzleUriFactory::class]], ['class' => DiactorosUriFactory::class, 'condition' => [DiactorosRequest::class, DiactorosUriFactory::class]], ['class' => SlimUriFactory::class, 'condition' => [SlimRequest::class, SlimUriFactory::class]], - ['class' => NyholmUriFactory::class, 'condition' => [NyholmRequest::class, NyholmUriFactory::class]], ], HttpAsyncClient::class => [ ['class' => Guzzle6::class, 'condition' => Guzzle6::class], From 94d22b067542b229cee6ba0a90d9b8fdb41ceea5 Mon Sep 17 00:00:00 2001 From: Tobias Nyholm Date: Thu, 2 Aug 2018 13:26:43 +0200 Subject: [PATCH 3/3] Added changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00c5136..1a7d586 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 1.5.0 - 2018-xx-xx + +### Added + +- Support for `nyholm/psr7` version 1.0. + ## 1.4.0 - 2018-02-06 ### Added