[HttpKernel] fix leftover

nicolas-grekas · nicolas-grekas · commit cbc4efc345ce · 2019-10-15T15:39:57.000+02:00
diff --git a/src/Symfony/Component/HttpKernel/Controller/ErrorController.php b/src/Symfony/Component/HttpKernel/Controller/ErrorController.php
@@ -37,12 +37,12 @@ public function __construct(HttpKernelInterface $kernel, $controller, ErrorRende
         $this->errorRenderer = $errorRenderer;
     }
 
-    public function __invoke(Request $request, FlattenException $e): Response
+    public function __invoke(Request $request, FlattenException $exception): Response
     {
         try {
-            return new Response($this->errorRenderer->render($e, $request->getPreferredFormat()), $e->getStatusCode(), $e->getHeaders());
+            return new Response($this->errorRenderer->render($exception, $request->getPreferredFormat()), $exception->getStatusCode(), $exception->getHeaders());
         } catch (ErrorRendererNotFoundException $_) {
-            return new Response($this->errorRenderer->render($e), $e->getStatusCode(), $e->getHeaders());
+            return new Response($this->errorRenderer->render($exception), $exception->getStatusCode(), $exception->getHeaders());
         }
     }
 
@@ -57,7 +57,7 @@ public function preview(Request $request, int $code): Response
          */
         $subRequest = $request->duplicate(null, null, [
             '_controller' => $this->controller,
-            'e' => $exception,
+            'exception' => $exception,
             'logger' => null,
             'showException' => false,
         ]);
diff --git a/src/Symfony/Component/HttpKernel/Tests/Controller/ErrorControllerTest.php b/src/Symfony/Component/HttpKernel/Tests/Controller/ErrorControllerTest.php
@@ -103,7 +103,7 @@ public function testPreviewController()
             ->method('handle')
             ->with(
                 $this->callback(function (Request $request) use ($_controller, $code) {
-                    $exception = $request->attributes->get('e');
+                    $exception = $request->attributes->get('exception');
 
                     $this->assertSame($_controller, $request->attributes->get('_controller'));
                     $this->assertInstanceOf(FlattenException::class, $exception);

Original file line number	Diff line number	Diff line change
`@@ -37,12 +37,12 @@ public function __construct(HttpKernelInterface $kernel, $controller, ErrorRende`
`37`	`37`	`$this->errorRenderer = $errorRenderer;`
`38`	`38`	`}`
`39`	`39`
`40`		`- public function __invoke(Request $request, FlattenException $e): Response`
	`40`	`+ public function __invoke(Request $request, FlattenException $exception): Response`
`41`	`41`	`{`
`42`	`42`	`try {`
`43`		`- return new Response($this->errorRenderer->render($e, $request->getPreferredFormat()), $e->getStatusCode(), $e->getHeaders());`
	`43`	`+ return new Response($this->errorRenderer->render($exception, $request->getPreferredFormat()), $exception->getStatusCode(), $exception->getHeaders());`
`44`	`44`	`} catch (ErrorRendererNotFoundException $_) {`
`45`		`- return new Response($this->errorRenderer->render($e), $e->getStatusCode(), $e->getHeaders());`
	`45`	`+ return new Response($this->errorRenderer->render($exception), $exception->getStatusCode(), $exception->getHeaders());`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`@@ -57,7 +57,7 @@ public function preview(Request $request, int $code): Response`
`57`	`57`	`*/`
`58`	`58`	`$subRequest = $request->duplicate(null, null, [`
`59`	`59`	`'_controller' => $this->controller,`
`60`		`- 'e' => $exception,`
	`60`	`+ 'exception' => $exception,`
`61`	`61`	`'logger' => null,`
`62`	`62`	`'showException' => false,`
`63`	`63`	`]);`