minor #34430 [HttpKernel] Make ErrorListener::onKernelException()'s dispatcher argument explicit (chalasr)

nicolas-grekas · nicolas-grekas · commit 4498e7e5e37c · 2019-11-18T08:34:05.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- [HttpKernel] Make ErrorListener::onKernelException()'s dispatcher argument explicit | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - One less BC break for 5.0 Commits ------- aab9b43 [HttpKernel] Make ErrorListener::onKernelException()'s dispatcher argument explicit
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
@@ -46,15 +46,14 @@ public function logKernelException(ExceptionEvent $event)
         $this->logException($event->getThrowable(), sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), $e->getFile(), $e->getLine()));
     }
 
-    public function onKernelException(ExceptionEvent $event)
+    public function onKernelException(ExceptionEvent $event, string $eventName = null, EventDispatcherInterface $eventDispatcher = null)
     {
         if (null === $this->controller) {
             return;
         }
 
         $exception = $event->getThrowable();
         $request = $this->duplicateRequest($exception, $event->getRequest());
-        $eventDispatcher = \func_num_args() > 2 ? func_get_arg(2) : null;
 
         try {
             $response = $event->getKernel()->handle($request, HttpKernelInterface::SUB_REQUEST, false);

Original file line number	Diff line number	Diff line change
`@@ -46,15 +46,14 @@ public function logKernelException(ExceptionEvent $event)`
`46`	`46`	`$this->logException($event->getThrowable(), sprintf('Uncaught PHP Exception %s: "%s" at %s line %s', $e->getClass(), $e->getMessage(), $e->getFile(), $e->getLine()));`
`47`	`47`	`}`
`48`	`48`
`49`		`- public function onKernelException(ExceptionEvent $event)`
	`49`	`+ public function onKernelException(ExceptionEvent $event, string $eventName = null, EventDispatcherInterface $eventDispatcher = null)`
`50`	`50`	`{`
`51`	`51`	`if (null === $this->controller) {`
`52`	`52`	`return;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`$exception = $event->getThrowable();`
`56`	`56`	`$request = $this->duplicateRequest($exception, $event->getRequest());`
`57`		`- $eventDispatcher = \func_num_args() > 2 ? func_get_arg(2) : null;`
`58`	`57`
`59`	`58`	`try {`
`60`	`59`	`$response = $event->getKernel()->handle($request, HttpKernelInterface::SUB_REQUEST, false);`