Merge pull request #12836 from cakephp/issue-12834

Fix .json routes not rendering error pages properly
cakephp · Dec 23, 2018 · dc63c2f · dc63c2f
2 parents 0be30d0 + ac2ad08
commit dc63c2f
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 3 deletions.
diff --git a/src/Error/ExceptionRenderer.php b/src/Error/ExceptionRenderer.php
@@ -125,9 +125,18 @@ protected function _unwrap($exception)
      */
     protected function _getController()
     {
-        $request = $this->request ?: Router::getRequest(true);
+        $request = $this->request;
+        $routerRequest = Router::getRequest(true);
+        // Fallback to the request in the router or make a new one from
+        // $_SERVER
         if ($request === null) {
-            $request = ServerRequestFactory::fromGlobals();
+            $request = $routerRequest ?: ServerRequestFactory::fromGlobals();
+        }
+
+        // If the current request doesn't have routing data, but we
+        // found a request in the router context copy the params over
+        if ($request->getParam('controller') === false && $routerRequest !== null) {
+            $request = $request->withAttribute('params', $routerRequest->getAttribute('params'));
         }
 
         $response = new Response();

diff --git a/tests/TestCase/Error/ExceptionRendererTest.php b/tests/TestCase/Error/ExceptionRendererTest.php
@@ -196,7 +196,9 @@ public function testControllerInstanceForPrefixedRequest()
 
         $exception = new NotFoundException('Page not found');
         $request = new ServerRequest();
-        $request = $request->withParam('prefix', 'admin');
+        $request = $request
+            ->withParam('controller', 'Articles')
+            ->withParam('prefix', 'admin');
 
         $ExceptionRenderer = new MyCustomExceptionRenderer($exception, $request);
 
@@ -905,6 +907,38 @@ public function testRenderWithNoRequest()
         $this->assertEquals(500, $result->getStatusCode());
     }
 
+    /**
+     * Test that router request parameters are applied when the passed
+     * request has no params.
+     *
+     * @return void
+     */
+    public function testRenderInheritRoutingParams()
+    {
+        $routerRequest = new ServerRequest([
+            'params' => [
+                'controller' => 'Articles',
+                'action' => 'index',
+                'plugin' => null,
+                'pass' => [],
+                '_ext' => 'json',
+            ]
+        ]);
+        // Simulate a request having routing applied and stored in router
+        Router::pushRequest($routerRequest);
+
+        $exceptionRenderer = new ExceptionRenderer(new Exception('Terrible'), new ServerRequest());
+        $exceptionRenderer->render();
+        $properties = $exceptionRenderer->__debugInfo();
+
+        foreach (['controller', 'action', '_ext'] as $key) {
+            $this->assertSame(
+                $routerRequest->getParam($key),
+                $properties['controller']->request->getParam($key)
+            );
+        }
+    }
+
     /**
      * Test that rendering exceptions triggers shutdown events.
      *