update deps from zend to laminas

antidot-framework · Jan 5, 2020 · 986749f · 986749f
1 parent 1c774a5
commit 986749f
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 30 deletions.
diff --git a/composer.json b/composer.json
@@ -14,21 +14,19 @@
         }
     ],
     "require": {
-        "php": "^7.2.13",
-        "aura/di": "^3.4",
+        "php": "^7.4.0",
         "psr/container": "^1.0.0",
         "psr/http-server-middleware": "^1.0",
         "symfony/console": "^4.2",
-        "symfony/polyfill-php73": "^1.11",
-        "zendframework/zend-config": "^3.2",
-        "zendframework/zend-config-aggregator": "^1.1",
-        "zendframework/zend-diactoros": "2.1",
-        "zendframework/zend-httphandlerrunner": "^1.1"
+        "laminas/laminas-config": "^3.2",
+        "laminas/laminas-config-aggregator": "^1.1",
+        "laminas/laminas-diactoros": "2.1",
+        "laminas/laminas-httphandlerrunner": "^1.1"
     },
     "require-dev": {
         "filp/whoops": "^2.3",
         "franzl/whoops-middleware": "^1.1",
-        "phpro/grumphp": "^0.15.0",
+        "phpro/grumphp": "^0.17.1",
         "phpstan/phpstan": "^0.11.5",
         "phpunit/phpunit": "^8.0",
         "squizlabs/php_codesniffer": "^3.4",
@@ -60,7 +58,7 @@
         "sort-packages": true
     },
     "extra": {
-        "zf": {
+        "laminas": {
             "config-provider": "Antidot\\Container\\Config\\ConfigProvider"
         }
     }

diff --git a/src/Application/Http/Middleware/ErrorMiddleware.php b/src/Application/Http/Middleware/ErrorMiddleware.php
@@ -12,7 +12,7 @@
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 use Throwable;
-use Zend\Diactoros\Response\TextResponse;
+use Laminas\Diactoros\Response\TextResponse;
 
 use function class_exists;
 use function error_reporting;

diff --git a/src/Application/Http/Middleware/RouteNotFoundMiddleware.php b/src/Application/Http/Middleware/RouteNotFoundMiddleware.php
@@ -8,7 +8,7 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response\HtmlResponse;
+use Laminas\Diactoros\Response\HtmlResponse;
 
 final class RouteNotFoundMiddleware implements MiddlewareInterface
 {

diff --git a/src/Application/Http/Response/ServerRequestErrorResponseGenerator.php b/src/Application/Http/Response/ServerRequestErrorResponseGenerator.php
@@ -7,7 +7,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Throwable;
-use Zend\Diactoros\Response;
+use Laminas\Diactoros\Response;
 
 final class ServerRequestErrorResponseGenerator implements ErrorResponseGenerator
 {

diff --git a/src/Application/Http/WebServerApplication.php b/src/Application/Http/WebServerApplication.php
@@ -6,7 +6,7 @@
 
 use Antidot\Application\Http\Middleware\Pipeline;
 use Antidot\Container\MiddlewareFactory;
-use Zend\HttpHandlerRunner\RequestHandlerRunner;
+use Laminas\HttpHandlerRunner\RequestHandlerRunner;
 
 class WebServerApplication implements Application
 {

diff --git a/src/Container/ApplicationFactory.php b/src/Container/ApplicationFactory.php
@@ -13,8 +13,8 @@
 use Antidot\Application\Http\Router;
 use Psr\Container\ContainerInterface;
 use SplQueue;
-use Zend\HttpHandlerRunner\Emitter\EmitterStack;
-use Zend\HttpHandlerRunner\RequestHandlerRunner;
+use Laminas\HttpHandlerRunner\Emitter\EmitterStack;
+use Laminas\HttpHandlerRunner\RequestHandlerRunner;
 
 final class ApplicationFactory
 {

diff --git a/src/Container/Config/ConfigProvider.php b/src/Container/Config/ConfigProvider.php
@@ -22,7 +22,7 @@
 use Antidot\Container\StreamFactory;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
-use Zend\HttpHandlerRunner\Emitter\EmitterStack;
+use Laminas\HttpHandlerRunner\Emitter\EmitterStack;
 
 class ConfigProvider
 {

diff --git a/src/Container/EmitterFactory.php b/src/Container/EmitterFactory.php
@@ -5,9 +5,9 @@
 namespace Antidot\Container;
 
 use Psr\Container\ContainerInterface;
-use Zend\HttpHandlerRunner\Emitter\EmitterInterface;
-use Zend\HttpHandlerRunner\Emitter\EmitterStack;
-use Zend\HttpHandlerRunner\Emitter\SapiEmitter;
+use Laminas\HttpHandlerRunner\Emitter\EmitterInterface;
+use Laminas\HttpHandlerRunner\Emitter\EmitterStack;
+use Laminas\HttpHandlerRunner\Emitter\SapiEmitter;
 
 class EmitterFactory
 {

diff --git a/src/Container/ErrorMiddlewareFactory.php b/src/Container/ErrorMiddlewareFactory.php
@@ -5,7 +5,6 @@
 namespace Antidot\Container;
 
 use Antidot\Application\Http\Middleware\ErrorMiddleware;
-use function dump;
 use Psr\Container\ContainerInterface;
 
 class ErrorMiddlewareFactory

diff --git a/src/Container/RequestFactory.php b/src/Container/RequestFactory.php
@@ -5,7 +5,7 @@
 namespace Antidot\Container;
 
 use Psr\Http\Message\RequestInterface;
-use Zend\Diactoros\ServerRequestFactory;
+use Laminas\Diactoros\ServerRequestFactory;
 
 class RequestFactory
 {

diff --git a/src/Container/RequestHandlerFactory.php b/src/Container/RequestHandlerFactory.php
@@ -11,7 +11,6 @@
 use Psr\Container\ContainerInterface;
 use Psr\Http\Server\RequestHandlerInterface;
 
-use function is_callable;
 use function is_string;
 
 class RequestHandlerFactory

diff --git a/src/Container/ResponseFactory.php b/src/Container/ResponseFactory.php
@@ -4,7 +4,7 @@
 
 namespace Antidot\Container;
 
-use Zend\Diactoros\Response;
+use Laminas\Diactoros\Response;
 
 class ResponseFactory
 {

diff --git a/src/Container/StreamFactory.php b/src/Container/StreamFactory.php
@@ -5,7 +5,7 @@
 namespace Antidot\Container;
 
 use Psr\Http\Message\StreamInterface;
-use Zend\Diactoros\Stream;
+use Laminas\Diactoros\Stream;
 
 class StreamFactory
 {

diff --git a/test/Application/Http/Middleware/CallableMiddlewareTest.php b/test/Application/Http/Middleware/CallableMiddlewareTest.php
@@ -12,7 +12,6 @@
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\MiddlewareInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Zend\Diactoros\Response;
 
 class CallableMiddlewareTest extends TestCase
 {
@@ -98,9 +97,6 @@ public function getInvalidCallables(): array
         return [
             [function () {}],
             [function (ServerRequestInterface $request) {}],
-//            [function ($request): ResponseInterface {
-//                return new Response();
-//            }],
         ];
     }
 }
diff --git a/test/Application/Http/Middleware/ErrorMiddlewareTest.php b/test/Application/Http/Middleware/ErrorMiddlewareTest.php
@@ -5,7 +5,6 @@
 namespace AntidotTest\Application\Http\Middleware;
 
 use Antidot\Application\Http\Middleware\ErrorMiddleware;
-use function dump;
 use InvalidArgumentException;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;

diff --git a/test/Container/ApplicationFactoryTest.php b/test/Container/ApplicationFactoryTest.php
@@ -15,7 +15,7 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use Psr\Container\ContainerInterface;
-use Zend\HttpHandlerRunner\Emitter\EmitterStack;
+use Laminas\HttpHandlerRunner\Emitter\EmitterStack;
 
 class ApplicationFactoryTest extends TestCase
 {