Chore: Remove Zend Diactoros (#3)

bpolaszek · Jun 21, 2023 · 3edd771 · 3edd771
1 parent a6fa791
commit 3edd771
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 102 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,27 +29,22 @@ script:
   - mkdir -p build/logs && ./vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 
   # League/Uri isolated factory test
-  - composer rem --dev league/uri nyholm/psr7 guzzlehttp/psr7 zendframework/zend-diactoros ringcentral/psr7
+  - composer rem --dev league/uri nyholm/psr7 guzzlehttp/psr7 ringcentral/psr7
   - composer req --dev --prefer-dist league/uri:^5.0
   - ./vendor/bin/phpunit tests/UriFactoryTest.php
 
-  # Zend Diactoros isolated ffactory test
-  - composer rem --dev league/uri nyholm/psr7 guzzlehttp/psr7 zendframework/zend-diactoros ringcentral/psr7
-  - composer req --dev --prefer-dist zendframework/zend-diactoros
-  - ./vendor/bin/phpunit tests/UriFactoryTest.php
-
   # Guzzle PSR-7 isolated ffactory test
-  - composer rem --dev league/uri nyholm/psr7 guzzlehttp/psr7 zendframework/zend-diactoros ringcentral/psr7
+  - composer rem --dev league/uri nyholm/psr7 guzzlehttp/psr7 ringcentral/psr7
   - composer req --dev --prefer-dist guzzlehttp/psr7
   - ./vendor/bin/phpunit tests/UriFactoryTest.php
 
   # Nyholm PSR-7 isolated ffactory test
-  - composer rem --dev league/uri nyholm/psr7 guzzlehttp/psr7 zendframework/zend-diactoros ringcentral/psr7
+  - composer rem --dev league/uri nyholm/psr7 guzzlehttp/psr7 ringcentral/psr7
   - composer req --dev --prefer-dist nyholm/psr7
   - ./vendor/bin/phpunit tests/UriFactoryTest.php
 
   # Nyholm PSR-7 isolated ffactory test
-  - composer rem --dev league/uri nyholm/psr7 guzzlehttp/psr7 zendframework/zend-diactoros ringcentral/psr7
+  - composer rem --dev league/uri nyholm/psr7 guzzlehttp/psr7 ringcentral/psr7
   - composer req --dev --prefer-dist ringcentral/psr7
   - ./vendor/bin/phpunit tests/UriFactoryTest.php
 

diff --git a/README.md b/README.md
@@ -16,7 +16,6 @@ There are several PSR-7 libraries on packagist but each one has its own factory
 Supported libraries so far:
 
 * `guzzlehttp/psr7`
-* `zendframework/zend-diactoros`
 * `league/uri`
 * `nyholm/psr7`
 * `ringcentral/psr7`
@@ -39,17 +38,14 @@ You can specify which library to use, by using the corresponding adapter:
 ```php
 use BenTools\UriFactory\Adapter\GuzzleAdapter;
 use BenTools\UriFactory\Adapter\LeagueUriAdapter;
-use BenTools\UriFactory\Adapter\ZendDiactorosAdapter;
 use function BenTools\UriFactory\Helper\current_location;
 use function BenTools\UriFactory\Helper\uri;
 
 $uri = uri('http://www.example.net', GuzzleAdapter::factory());
 $uri = uri('http://www.example.net', LeagueUriAdapter::factory());
-$uri = uri('http://www.example.net', ZendDiactorosAdapter::factory());
 
 $uri = current_location(GuzzleAdapter::factory());
 $uri = current_location(LeagueUriAdapter::factory());
-$uri = current_location(ZendDiactorosAdapter::factory());
 ```
 
 ## Canonicalizer

diff --git a/composer.json b/composer.json
@@ -25,8 +25,7 @@
         "phpunit/phpunit": "~6.0|~7.0",
         "ringcentral/psr7": "^1.3",
         "squizlabs/php_codesniffer": "@stable",
-        "symfony/var-dumper": "^3.3",
-        "zendframework/zend-diactoros": "^1.6"
+        "symfony/var-dumper": "^3.3"
     },
     "autoload": {
         "psr-4": {
@@ -46,7 +45,6 @@
     },
     "suggest": {
         "league/uri": "URI manipulation Library",
-        "zendframework/zend-diactoros": "PSR-7 HTTP Message implementation",
         "guzzlehttp/psr7": "PSR-7 HTTP message library",
         "nyholm/psr7": "PSR-7 HTTP message library",
         "ringcentral/psr7": "PSR-7 HTTP message library"

diff --git a/src/Adapter/ZendDiactorosAdapter.php b/src/Adapter/ZendDiactorosAdapter.php
diff --git a/src/UriFactory.php b/src/UriFactory.php
@@ -7,7 +7,6 @@
 use BenTools\UriFactory\Adapter\LeagueUriAdapter;
 use BenTools\UriFactory\Adapter\NyholmAdapter;
 use BenTools\UriFactory\Adapter\RingCentralAdapter;
-use BenTools\UriFactory\Adapter\ZendDiactorosAdapter;
 use Psr\Http\Message\UriInterface;
 
 class UriFactory implements UriFactoryInterface
@@ -34,7 +33,6 @@ private function getDefaultAdapters()
         return [
             NyholmAdapter::class,
             GuzzleAdapter::class,
-            ZendDiactorosAdapter::class,
             LeagueUriAdapter::class,
             RingCentralAdapter::class,
         ];
@@ -58,7 +56,7 @@ public function createUri(string $uri = '', UriFactoryInterface $factory = null)
             }
         }
         throw new \RuntimeException(
-            "No adapter is installed. Please install guzzlehttp/psr7, zendframework/zend-diactoros or league/uri."
+            "No adapter is installed. Please install nyholm/psr7, ringcentral/psr7, guzzlehttp/psr7 or league/uri."
         );
     }
 

diff --git a/tests/Adapter/ZendDiactorosAdapterTest.php b/tests/Adapter/ZendDiactorosAdapterTest.php
diff --git a/tests/UriFactoryTest.php b/tests/UriFactoryTest.php
@@ -4,15 +4,13 @@
 
 use BenTools\UriFactory\Adapter\GuzzleAdapter;
 use BenTools\UriFactory\Adapter\LeagueUriAdapter;
-use BenTools\UriFactory\Adapter\ZendDiactorosAdapter;
 use BenTools\UriFactory\UriFactory;
 use GuzzleHttp\Psr7\Uri as GuzzleUri;
 use League\Uri\Http as LeagueUri;
 use PHPUnit\Framework\TestCase;
 use Psr\Http\Message\UriInterface;
 use function BenTools\UriFactory\Helper\current_location;
 use function BenTools\UriFactory\Helper\uri;
-use Zend\Diactoros\Uri as ZendUri;
 
 class UriFactoryTest extends TestCase
 {