diff --git a/.travis.yml b/.travis.yml index 2348030..1c5e371 100644 --- 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 index b651102..f29a549 100644 --- 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 index 950b779..d1c56b9 100644 --- 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 index b1b803f..d353316 100644 --- 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 index 28ee3df..630501f 100644 --- 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 index 23f138d..62a869b 100644 --- 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 index f09a43a..9f9940b 100644 --- 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 index eb0195c..c407695 100644 --- 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 index 38025ea..ea96bde 100644 --- 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 index d122f63..3bcc5f4 100644 --- a/tests/Proxy/Filter/RewriteLocationFilterTest.php +++ b/tests/Proxy/Filter/RewriteLocationFilterTest.php @@ -1,8 +1,8 @@