Merge pull request #14508 from cakephp/backport-laminas-diactoros

3.9 - Backport Zend to Laminas package change

composer.json

@@ -33,9 +33,9 @@
         "ext-mbstring": "*",
         "cakephp/chronos": "^1.0.1",
         "aura/intl": "^3.0.0",
+        "laminas/laminas-diactoros": "^1.4.0",
         "psr/log": "^1.0.0",
         "psr/simple-cache": "^1.0.0",
-        "zendframework/zend-diactoros": "^1.4.0",
         "paragonie/random_compat": "^1.4|^2.0|9.99.99"
     },
     "suggest": {

src/Http/CallbackStream.php

@@ -14,12 +14,12 @@
  */
 namespace Cake\Http;
 
-use Zend\Diactoros\CallbackStream as BaseCallbackStream;
+use Laminas\Diactoros\CallbackStream as BaseCallbackStream;
 
 /**
  * Implementation of PSR HTTP streams.
  *
- * This differs from Zend\Diactoros\Callback stream in that
+ * This differs from Laminas\Diactoros\Callback stream in that
  * it allows the use of `echo` inside the callback, and gracefully
  * handles the callback not returning a string.
  *

src/Http/Client.php

@@ -24,7 +24,7 @@ use Cake\Http\Cookie\CookieCollection;
 use Cake\Http\Cookie\CookieInterface;
 use Cake\Utility\Hash;
 use InvalidArgumentException;
-use Zend\Diactoros\Uri;
+use Laminas\Diactoros\Uri;
 
 /**
  * The end user interface for doing HTTP requests.

src/Http/Client/Request.php

@@ -14,9 +14,9 @@
 namespace Cake\Http\Client;
 
 use Cake\Core\Exception\Exception;
+use Laminas\Diactoros\RequestTrait;
+use Laminas\Diactoros\Stream;
 use Psr\Http\Message\RequestInterface;
-use Zend\Diactoros\RequestTrait;
-use Zend\Diactoros\Stream;
 
 /**
  * Implements methods for HTTP requests.

src/Http/Client/Response.php

@@ -17,10 +17,10 @@ namespace Cake\Http\Client;
 // with the deprecated class in this namespace.
 use Cake\Http\Cookie\CookieCollection as CookiesCollection;
 use Cake\Http\Cookie\CookieInterface;
+use Laminas\Diactoros\MessageTrait;
+use Laminas\Diactoros\Stream;
 use Psr\Http\Message\ResponseInterface;
 use RuntimeException;
-use Zend\Diactoros\MessageTrait;
-use Zend\Diactoros\Stream;
 
 /**
  * Implements methods for HTTP responses.

src/Http/Response.php

@@ -27,10 +27,10 @@ use DateTime;
 use DateTimeInterface;
 use DateTimeZone;
 use InvalidArgumentException;
+use Laminas\Diactoros\MessageTrait;
+use Laminas\Diactoros\Stream;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\StreamInterface;
-use Zend\Diactoros\MessageTrait;
-use Zend\Diactoros\Stream;
 
 /**
  * Responses contain the response text, status and headers of a HTTP response.

src/Http/ResponseEmitter.php

@@ -21,9 +21,9 @@ namespace Cake\Http;
 
 use Cake\Core\Configure;
 use Cake\Log\Log;
+use Laminas\Diactoros\RelativeStream;
+use Laminas\Diactoros\Response\EmitterInterface;
 use Psr\Http\Message\ResponseInterface;
-use Zend\Diactoros\RelativeStream;
-use Zend\Diactoros\Response\EmitterInterface;
 
 /**
  * Emits a Response to the PHP Server API.

src/Http/Server.php

@@ -20,10 +20,10 @@ use Cake\Event\EventDispatcherInterface;
 use Cake\Event\EventDispatcherTrait;
 use Cake\Event\EventManager;
 use InvalidArgumentException;
+use Laminas\Diactoros\Response\EmitterInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use RuntimeException;
-use Zend\Diactoros\Response\EmitterInterface;
 
 /**
  * Runs an application invoking all the PSR7 middleware and the registered application.
@@ -128,7 +128,7 @@ class Server implements EventDispatcherInterface
      * Emit the response using the PHP SAPI.
      *
      * @param \Psr\Http\Message\ResponseInterface $response The response to emit
-     * @param \Zend\Diactoros\Response\EmitterInterface|null $emitter The emitter to use.
+     * @param \Laminas\Diactoros\Response\EmitterInterface|null $emitter The emitter to use.
      *   When null, a SAPI Stream Emitter will be used.
      * @return void
      */

src/Http/ServerRequest.php

@@ -22,13 +22,13 @@ use Cake\Http\Exception\MethodNotAllowedException;
 use Cake\Http\Session;
 use Cake\Utility\Hash;
 use InvalidArgumentException;
+use Laminas\Diactoros\PhpInputStream;
+use Laminas\Diactoros\Stream;
+use Laminas\Diactoros\UploadedFile;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Message\StreamInterface;
 use Psr\Http\Message\UploadedFileInterface;
 use Psr\Http\Message\UriInterface;
-use Zend\Diactoros\PhpInputStream;
-use Zend\Diactoros\Stream;
-use Zend\Diactoros\UploadedFile;
 
 /**
  * A class that helps wrap Request information and particulars about a single request.

src/Http/ServerRequestFactory.php

@@ -16,7 +16,7 @@ namespace Cake\Http;
 
 use Cake\Core\Configure;
 use Cake\Utility\Hash;
-use Zend\Diactoros\ServerRequestFactory as BaseFactory;
+use Laminas\Diactoros\ServerRequestFactory as BaseFactory;
 
 /**
  * Factory for making ServerRequest instances.

src/Routing/Middleware/AssetMiddleware.php

@@ -17,10 +17,10 @@ namespace Cake\Routing\Middleware;
 use Cake\Core\Plugin;
 use Cake\Filesystem\File;
 use Cake\Utility\Inflector;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\Stream;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\Stream;
 
 /**
  * Handles serving plugin assets in development mode.

src/Routing/Middleware/RoutingMiddleware.php

@@ -21,9 +21,9 @@ use Cake\Http\MiddlewareQueue;
 use Cake\Http\Runner;
 use Cake\Routing\Exception\RedirectException;
 use Cake\Routing\Router;
+use Laminas\Diactoros\Response\RedirectResponse;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Zend\Diactoros\Response\RedirectResponse;
 
 /**
  * Applies routing rules to the request and creates the controller

src/TestSuite/IntegrationTestTrait.php

@@ -54,9 +54,9 @@ use Cake\Utility\Security;
 use Cake\Utility\Text;
 use Cake\View\Helper\SecureFieldTokenTrait;
 use Exception;
+use Laminas\Diactoros\Uri;
 use LogicException;
 use PHPUnit\Exception as PhpunitException;
-use Zend\Diactoros\Uri;
 
 /**
  * A trait intended to make integration tests of your controllers easier.

src/TestSuite/MiddlewareDispatcher.php

@@ -20,10 +20,10 @@ use Cake\Event\EventManager;
 use Cake\Http\Server;
 use Cake\Http\ServerRequestFactory;
 use Cake\Routing\Router;
+use Laminas\Diactoros\Stream;
 use LogicException;
 use ReflectionClass;
 use ReflectionException;
-use Zend\Diactoros\Stream;
 
 /**
  * Dispatches a request capturing the response for integration

tests/TestCase/Controller/ControllerTest.php

@@ -23,10 +23,10 @@ use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
+use Laminas\Diactoros\Uri;
 use PHPUnit\Framework\Error\Notice;
 use TestApp\Controller\Admin\PostsController;
 use TestPlugin\Controller\TestPluginController;
-use Zend\Diactoros\Uri;
 
 /**
  * AppController class

tests/TestCase/Http/Middleware/CsrfProtectionMiddlewareTest.php

@@ -19,6 +19,8 @@ use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\I18n\Time;
 use Cake\TestSuite\TestCase;
+use Laminas\Diactoros\Response as DiactorosResponse;
+use Laminas\Diactoros\Response\RedirectResponse;
 use Psr\Http\Message\ServerRequestInterface;
 
 /**

tests/TestCase/Http/Middleware/SecurityHeadersMiddlewareTest.php

@@ -17,7 +17,7 @@ namespace Cake\Test\TestCase\Http\Middleware;
 use Cake\Http\Middleware\SecurityHeadersMiddleware;
 use Cake\Http\ServerRequestFactory;
 use Cake\TestSuite\TestCase;
-use Zend\Diactoros\Response;
+use Laminas\Diactoros\Response;
 
 /**
  * Test for SecurityMiddleware

tests/TestCase/Http/ResponseTest.php

@@ -25,7 +25,7 @@ use Cake\Http\Response;
 use Cake\Http\ServerRequest;
 use Cake\I18n\FrozenTime;
 use Cake\TestSuite\TestCase;
-use Zend\Diactoros\Stream;
+use Laminas\Diactoros\Stream;
 
 /**
  * ResponseTest
@@ -2168,7 +2168,7 @@ class ResponseTest extends TestCase
         $this->assertEquals('bytes', $new->getHeaderLine('Accept-Ranges'));
         $this->assertEquals('binary', $new->getHeaderLine('Content-Transfer-Encoding'));
         $body = $new->getBody();
-        $this->assertInstanceOf('Zend\Diactoros\Stream', $body);
+        $this->assertInstanceOf('Laminas\Diactoros\Stream', $body);
 
         $expected = '/* this is the test asset css file */';
         $this->assertEquals($expected, trim($body->getContents()));

tests/TestCase/Http/ServerRequestFactoryTest.php

@@ -18,7 +18,7 @@ use Cake\Core\Configure;
 use Cake\Http\ServerRequestFactory;
 use Cake\Http\Session;
 use Cake\TestSuite\TestCase;
-use Zend\Diactoros\UploadedFile;
+use Laminas\Diactoros\UploadedFile;
 
 /**
  * Test case for the server factory.

tests/TestCase/Http/ServerRequestTest.php

@@ -22,8 +22,8 @@ use Cake\Http\ServerRequest;
 use Cake\Http\ServerRequestFactory;
 use Cake\Http\Session;
 use Cake\TestSuite\TestCase;
-use Zend\Diactoros\UploadedFile;
-use Zend\Diactoros\Uri;
+use Laminas\Diactoros\UploadedFile;
+use Laminas\Diactoros\Uri;
 
 /**
  * ServerRequest Test

tests/TestCase/Http/ServerTest.php

@@ -23,12 +23,12 @@ use Cake\Http\MiddlewareQueue;
 use Cake\Http\Server;
 use Cake\TestSuite\TestCase;
 use InvalidArgumentException;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\ServerRequestFactory;
 use RuntimeException;
 use TestApp\Http\BadResponseApplication;
 use TestApp\Http\InvalidMiddlewareApplication;
 use TestApp\Http\MiddlewareApplication;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\ServerRequestFactory;
 
 require_once __DIR__ . '/server_mocks.php';
 
@@ -221,7 +221,7 @@ class ServerTest extends TestCase
             ->withHeader('X-First', 'first')
             ->withHeader('X-Second', 'second');
 
-        $emitter = $this->getMockBuilder('Zend\Diactoros\Response\EmitterInterface')->getMock();
+        $emitter = $this->getMockBuilder('Laminas\Diactoros\Response\EmitterInterface')->getMock();
         $emitter->expects($this->once())
             ->method('emit')
             ->with($final);

tests/TestCase/I18n/Middleware/LocaleSelectorMiddlewareTest.php

@@ -17,9 +17,9 @@ namespace Cake\Test\TestCase\I18n\Middleware;
 use Cake\I18n\I18n;
 use Cake\I18n\Middleware\LocaleSelectorMiddleware;
 use Cake\TestSuite\TestCase;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\ServerRequestFactory;
 use Locale;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\ServerRequestFactory;
 
 /**
  * Test for LocaleSelectorMiddleware

tests/TestCase/Routing/Middleware/RoutingMiddlewareTest.php

@@ -20,11 +20,11 @@ use Cake\Routing\RouteBuilder;
 use Cake\Routing\RouteCollection;
 use Cake\Routing\Router;
 use Cake\TestSuite\TestCase;
+use Laminas\Diactoros\Response;
+use Laminas\Diactoros\ServerRequest;
+use Laminas\Diactoros\ServerRequestFactory;
 use TestApp\Application;
 use TestApp\Middleware\DumbMiddleware;
-use Zend\Diactoros\Response;
-use Zend\Diactoros\ServerRequest;
-use Zend\Diactoros\ServerRequestFactory;
 
 /**
  * Test for RoutingMiddleware

tests/TestCase/TestSuite/IntegrationTestTraitTest.php

@@ -28,8 +28,8 @@ use Cake\Routing\Route\InflectedRoute;
 use Cake\TestSuite\IntegrationTestCase;
 use Cake\Test\Fixture\AssertIntegrationTestCase;
 use Cake\Utility\Security;
+use Laminas\Diactoros\UploadedFile;
 use PHPUnit\Framework\AssertionFailedError;
-use Zend\Diactoros\UploadedFile;
 
 /**
  * Self test of the IntegrationTestCase

tests/TestCase/Validation/ValidationTest.php

@@ -20,9 +20,9 @@ use Cake\Filesystem\File;
 use Cake\I18n\I18n;
 use Cake\TestSuite\TestCase;
 use Cake\Validation\Validation;
+use Laminas\Diactoros\UploadedFile;
 use Locale;
 use stdClass;
-use Zend\Diactoros\UploadedFile;
 
 require_once __DIR__ . '/stubs.php';
 

tests/TestCase/Validation/ValidatorTest.php

@@ -19,7 +19,7 @@ use Cake\Validation\Validation;
 use Cake\Validation\ValidationRule;
 use Cake\Validation\ValidationSet;
 use Cake\Validation\Validator;
-use Zend\Diactoros\UploadedFile;
+use Laminas\Diactoros\UploadedFile;
 
 /**
  * Tests Validator class