Merge pull request #78 from octahedroid/fix-rollback-package-name

fix(#75): replace deprecated dependency
jenssegers · Mar 6, 2020 · 7bbe462 · 7bbe462
2 parents 74bd607 + 201953e
commit 7bbe462
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 20 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,6 @@
 language: php
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
   - 7.3

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ The following example creates a request object, based on the current browser req
 use Proxy\Proxy;
 use Proxy\Adapter\Guzzle\GuzzleAdapter;
 use Proxy\Filter\RemoveEncodingFilter;
-use Zend\Diactoros\ServerRequestFactory;
+use Laminas\Diactoros\ServerRequestFactory;
 
 // Create a PSR7 request based on the current browser request.
 $request = ServerRequestFactory::fromGlobals();
@@ -38,7 +38,7 @@ $proxy->filter(new RemoveEncodingFilter());
 $response = $proxy->forward($request)->to('http://example.com');
 
 // Output response to the browser.
-(new Zend\Diactoros\Response\SapiEmitter)->emit($response);
+(new Laminas\HttpHandlerRunner\Emitter\SapiEmitter)->emit($response);
 ```
 
 ## Filters

diff --git a/composer.json b/composer.json
@@ -19,8 +19,9 @@
         "php": "^5.6 || ^7.0",
         "psr/http-message": "^1.0",
         "guzzlehttp/guzzle": "^6.0",
-        "zendframework/zend-diactoros": "^1.0 || ^2.0",
-        "relay/relay": "^1.0"
+        "laminas/laminas-diactoros": "^2.0",
+        "relay/relay": "^1.0",
+        "laminas/laminas-httphandlerrunner": "^1.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0|^6.0|^7.0",

diff --git a/src/Adapter/Dummy/DummyAdapter.php b/src/Adapter/Dummy/DummyAdapter.php
@@ -4,7 +4,7 @@
 
 use Proxy\Adapter\AdapterInterface;
 use Psr\Http\Message\RequestInterface;
-use Zend\Diactoros\Response;
+use Laminas\Diactoros\Response;
 
 class DummyAdapter implements AdapterInterface
 {

diff --git a/src/Proxy.php b/src/Proxy.php
@@ -7,8 +7,8 @@
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Relay\RelayBuilder;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Uri;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\Uri;
 
 class Proxy
 {

diff --git a/tests/Proxy/Adapter/Dummy/DummyAdapterTest.php b/tests/Proxy/Adapter/Dummy/DummyAdapterTest.php
@@ -3,7 +3,7 @@
 namespace Proxy\Adapter\Dummy;
 
 use Psr\Http\Message\ResponseInterface;
-use Zend\Diactoros\ServerRequestFactory;
+use Laminas\Diactoros\ServerRequestFactory;
 use PHPUnit\Framework\TestCase;
 
 class DummyAdapterTest extends TestCase

diff --git a/tests/Proxy/Adapter/Guzzle/GuzzleAdapterTest.php b/tests/Proxy/Adapter/Guzzle/GuzzleAdapterTest.php
@@ -8,7 +8,7 @@
 use PHPUnit\Framework\TestCase;
 use Proxy\Adapter\Guzzle\GuzzleAdapter;
 use Psr\Http\Message\ResponseInterface;
-use Zend\Diactoros\Request;
+use Laminas\Diactoros\Request;
 
 class GuzzleAdapterTest extends TestCase
 {

diff --git a/tests/Proxy/Filter/RemoveEncodingFilterTest.php b/tests/Proxy/Filter/RemoveEncodingFilterTest.php
@@ -3,8 +3,8 @@
 namespace Proxy\Filter;
 
 use PHPUnit\Framework\TestCase;
-use Zend\Diactoros\Request;
-use Zend\Diactoros\Response;
+use Laminas\Diactoros\Request;
+use Laminas\Diactoros\Response;
 
 class RemoveEncodingFilterTest extends TestCase
 {

diff --git a/tests/Proxy/Filter/RemoveLocationFilterTest.php b/tests/Proxy/Filter/RemoveLocationFilterTest.php
@@ -3,8 +3,8 @@
 namespace Proxy\Filter;
 
 use PHPUnit\Framework\TestCase;
-use Zend\Diactoros\Request;
-use Zend\Diactoros\Response;
+use Laminas\Diactoros\Request;
+use Laminas\Diactoros\Response;
 
 class RemoveLocationFilterTest extends TestCase
 {

diff --git a/tests/Proxy/Filter/RewriteLocationFilterTest.php b/tests/Proxy/Filter/RewriteLocationFilterTest.php
@@ -1,8 +1,8 @@
 <?php namespace Proxy\Filter;
 
 use PHPUnit\Framework\TestCase;
-use Zend\Diactoros\Request;
-use Zend\Diactoros\Response;
+use Laminas\Diactoros\Request;
+use Laminas\Diactoros\Response;
 
 class RewriteLocationFilterTest extends TestCase
 {

diff --git a/tests/Proxy/ProxyTest.php b/tests/Proxy/ProxyTest.php
@@ -6,9 +6,9 @@
 use Proxy\Adapter\Dummy\DummyAdapter;
 use Proxy\Exception\UnexpectedValueException;
 use Psr\Http\Message\RequestInterface;
-use Zend\Diactoros\Request;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\ServerRequestFactory;
+use Laminas\Diactoros\Request;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\ServerRequestFactory;
 
 class ProxyTest extends TestCase
 {