php 7.4, laminas-diactoros

Author: devosc

composer.json

@@ -11,13 +11,13 @@
     }
   ],
   "require": {
-    "php": "^7.1",
+    "php": "^7.4",
     "ext-json": "*",
-    "mvc5/mvc5": "10.*",
+    "mvc5/mvc5": "^11.0",
     "psr/http-factory": "^1.0",
     "psr/http-message": "^1.0",
-    "zendframework/zend-diactoros": "^2.1",
-    "symfony/http-foundation": "~4.0"
+    "laminas/laminas-diactoros": "^2.2",
+    "symfony/http-foundation": "^5.0"
   },
   "autoload": {
     "psr-4": {

src/Http/Request.php

@@ -5,12 +5,12 @@
 
 namespace Valar\Http;
 
+use Laminas\Diactoros\Stream;
 use Mvc5\Arg;
 use Mvc5\Http\HttpHeaders;
 use Mvc5\Model;
 use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\UriInterface;
-use Zend\Diactoros\Stream;
 
 use function is_array;
 

src/Http/Response.php

@@ -5,11 +5,11 @@
 
 namespace Valar\Http;
 
+use Laminas\Diactoros\Stream;
 use Mvc5\Arg;
 use Mvc5\Http\HttpHeaders;
 use Mvc5\Model;
 use Psr\Http\Message\ResponseInterface;
-use Zend\Diactoros\Stream;
 
 use function is_array;
 

src/Http/ServerRequest.php

@@ -5,16 +5,16 @@
 
 namespace Valar\Http;
 
+use Laminas\Diactoros\PhpInputStream;
 use Mvc5\Arg;
 use Mvc5\Cookie\HttpCookies;
 use Mvc5\Http\HttpHeaders;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\PhpInputStream;
 
 use function is_array;
 use function strlen;
 use function substr;
-use function Zend\Diactoros\ {
+use function Laminas\Diactoros\ {
     marshalHeadersFromSapi,
     marshalUriFromSapi,
     normalizeServer,

src/Plugin/Body.php

@@ -5,9 +5,9 @@
 
 namespace Valar\Plugin;
 
+use Laminas\Diactoros\PhpInputStream;
 use Mvc5\Plugin\ScopedCall;
 use Mvc5\Plugin\Shared;
-use Zend\Diactoros\PhpInputStream;
 
 class Body
     extends Shared

src/Plugin/Cookies.php

@@ -10,7 +10,7 @@
 use Mvc5\Plugin\ScopedCall;
 use Mvc5\Plugin\Shared;
 
-use function Zend\Diactoros\parseCookieHeader;
+use function Laminas\Diactoros\parseCookieHeader;
 
 class Cookies
     extends Shared

src/Plugin/Files.php

@@ -18,7 +18,7 @@ class Files
     function __construct(string $name = 'files')
     {
         parent::__construct(
-            $name, new Call('@Zend\Diactoros\normalizeUploadedFiles', [new GlobalVar('_FILES')])
+            $name, new Call('@Laminas\Diactoros\normalizeUploadedFiles', [new GlobalVar('_FILES')])
         );
     }
 }

src/Plugin/Headers.php

@@ -10,7 +10,7 @@
 use Mvc5\Plugin\ScopedCall;
 use Mvc5\Plugin\Shared;
 
-use function Zend\Diactoros\ {
+use function Laminas\Diactoros\ {
     marshalHeadersFromSapi,
     marshalUriFromSapi
 };

src/Plugin/Server.php

@@ -18,7 +18,7 @@ class Server
     function __construct(string $name = 'server')
     {
         parent::__construct(
-            $name, new Call('@Zend\Diactoros\normalizeServer', [new GlobalVar('_SERVER')])
+            $name, new Call('@Laminas\Diactoros\normalizeServer', [new GlobalVar('_SERVER')])
         );
     }
 }

src/Plugin/Uri.php

@@ -13,7 +13,7 @@
 
 use function rawurldecode;
 use function urldecode;
-use function Zend\Diactoros\marshalUriFromSapi;
+use function Laminas\Diactoros\marshalUriFromSapi;
 
 class Uri
     extends Shared