Fixed and better type hinting for the Travis CI tests.

cakephp · Apr 22, 2018 · 4a19d6f · 4a19d6f
1 parent a0eb569
commit 4a19d6f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/TestSuite/IntegrationTestCase.php b/src/TestSuite/IntegrationTestCase.php
@@ -484,12 +484,13 @@ protected function _sendRequest($url, $method, $data = [])
     {
         $dispatcher = $this->_makeDispatcher();
         try {
+            $psrRequest = null;
             $request = $this->_buildRequest($url, $method, $data);
+            $psrRequest = $this->_createRequest($request);
             if ($dispatcher instanceof LegacyRequestDispatcher) {
                 //The legacy dispatcher expects an array...
                 $response = $dispatcher->execute($request);
-            } elseif ($dispatcher instanceof MiddlewareDispatcher) {
-                $psrRequest = $this->_createRequest($request);
+            } else {
                 $response = $dispatcher->execute($psrRequest);
             }
             $this->_requestSession = $request['session'];
@@ -587,7 +588,7 @@ public function controllerSpy($event, $controller = null)
      * If that class does not exist, the built-in renderer will be used.
      *
      * @param \Exception $exception Exception to handle.
-     * @param \Psr\Http\Message\ServerRequestInterface $request The request.
+     * @param \Psr\Http\Message\RequestInterface $request The request.
      * @return void
      * @throws \Exception
      */

diff --git a/src/TestSuite/MiddlewareDispatcher.php b/src/TestSuite/MiddlewareDispatcher.php
@@ -68,7 +68,7 @@ public function __construct($test, $class = null, $constructorArgs = null)
     /**
      * Run a request and get the response.
      *
-     * @param \Cake\Http\ServerRequest $request The request to execute.
+     * @param \Psr\Http\Message\RequestInterface $request The request to execute.
      * @return \Psr\Http\Message\ResponseInterface The generated response.
      */
     public function execute($request)