Merge remote-tracking branch 'origin/issue-11974' into issue-11974

cakephp · Apr 22, 2018 · a0eb569 · a0eb569
2 parents ae0104d + f10a9fe
commit a0eb569
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/src/Error/ExceptionRenderer.php b/src/Error/ExceptionRenderer.php
@@ -126,7 +126,7 @@ protected function _unwrap($exception)
     protected function _getController()
     {
         $request = $this->request;
-        if(!$request) {
+        if (!$request) {
             if (!$request = Router::getRequest(true)) {
                 $request = ServerRequestFactory::fromGlobals();
             }

diff --git a/src/TestSuite/IntegrationTestCase.php b/src/TestSuite/IntegrationTestCase.php
@@ -485,10 +485,10 @@ protected function _sendRequest($url, $method, $data = [])
         $dispatcher = $this->_makeDispatcher();
         try {
             $request = $this->_buildRequest($url, $method, $data);
-            if($dispatcher instanceof LegacyRequestDispatcher ){
+            if ($dispatcher instanceof LegacyRequestDispatcher) {
                 //The legacy dispatcher expects an array...
                 $response = $dispatcher->execute($request);
-            }elseif($dispatcher instanceof MiddlewareDispatcher ){
+            } elseif ($dispatcher instanceof MiddlewareDispatcher) {
                 $psrRequest = $this->_createRequest($request);
                 $response = $dispatcher->execute($psrRequest);
             }
@@ -538,7 +538,6 @@ protected function _createRequest($spec)
         return $request;
     }
 
-
     /**
      * Get the correct dispatcher instance.
      *

diff --git a/src/TestSuite/MiddlewareDispatcher.php b/src/TestSuite/MiddlewareDispatcher.php
@@ -91,7 +91,7 @@ public function execute($request)
         );
 
         $server = new Server($app);
+
         return $server->run($request);
     }
-
 }
diff --git a/tests/test_app/TestApp/Error/TestAppsExceptionRenderer.php b/tests/test_app/TestApp/Error/TestAppsExceptionRenderer.php
@@ -19,7 +19,7 @@ class TestAppsExceptionRenderer extends ExceptionRenderer
     protected function _getController()
     {
         $request = $this->request;
-        if(!$request) {
+        if (!$request) {
             if (!$request = Router::getRequest(true)) {
                 $request = new ServerRequest();
             }