Fixes from PR feedback

mtibben · mtibben · commit e8b62bbcb4bd · 2017-12-27T15:22:08.000+11:00
diff --git a/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml b/src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml
@@ -128,7 +128,7 @@
             <tag name="monolog.logger" channel="request" />
             <argument>%twig.exception_listener.controller%</argument>
             <argument type="service" id="logger" on-invalid="null" />
-            <argument>%twig.exception_listener.http_status_codes_log_level%</argument>
+            <argument>%framework.http_exception.log_levels%</argument>
         </service>
 
         <service id="twig.controller.exception" class="Symfony\Bundle\TwigBundle\Controller\ExceptionController" public="true">
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
@@ -31,15 +31,13 @@ class ExceptionListener implements EventSubscriberInterface
 {
     protected $controller;
     protected $logger;
-    protected $httpStatusCodeLogLevel = array();
+    protected $httpStatusCodeLogLevel;
 
-    public function __construct($controller, LoggerInterface $logger = null, $httpStatusCodeLogLevel = array())
+    public function __construct($controller, LoggerInterface $logger = null, array $httpStatusCodeLogLevel = array())
     {
         $this->controller = $controller;
         $this->logger = $logger;
-        if ($httpStatusCodeLogLevel && is_array($httpStatusCodeLogLevel)) {
-            $this->httpStatusCodeLogLevel = $httpStatusCodeLogLevel;
-        }
+        $this->httpStatusCodeLogLevel = $httpStatusCodeLogLevel;
     }
 
     public function logKernelException(GetResponseForExceptionEvent $event)
@@ -87,7 +85,7 @@ public static function getSubscribedEvents()
         );
     }
 
-    protected function getExceptionLogLevel(\Exception $exception)
+    protected function getExceptionLogLevel(\Exception $exception): LogLevel
     {
         $logLevel = LogLevel::CRITICAL;
         if ($exception instanceof HttpExceptionInterface) {

Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,13 @@ class ExceptionListener implements EventSubscriberInterface`
`31`	`31`	`{`
`32`	`32`	`protected $controller;`
`33`	`33`	`protected $logger;`
`34`		`- protected $httpStatusCodeLogLevel = array();`
	`34`	`+ protected $httpStatusCodeLogLevel;`
`35`	`35`
`36`		`- public function __construct($controller, LoggerInterface $logger = null, $httpStatusCodeLogLevel = array())`
	`36`	`+ public function __construct($controller, LoggerInterface $logger = null, array $httpStatusCodeLogLevel = array())`
`37`	`37`	`{`
`38`	`38`	`$this->controller = $controller;`
`39`	`39`	`$this->logger = $logger;`
`40`		`- if ($httpStatusCodeLogLevel && is_array($httpStatusCodeLogLevel)) {`
`41`		`- $this->httpStatusCodeLogLevel = $httpStatusCodeLogLevel;`
`42`		`- }`
	`40`	`+ $this->httpStatusCodeLogLevel = $httpStatusCodeLogLevel;`
`43`	`41`	`}`
`44`	`42`
`45`	`43`	`public function logKernelException(GetResponseForExceptionEvent $event)`
`@@ -87,7 +85,7 @@ public static function getSubscribedEvents()`
`87`	`85`	`);`
`88`	`86`	`}`
`89`	`87`
`90`		`- protected function getExceptionLogLevel(\Exception $exception)`
	`88`	`+ protected function getExceptionLogLevel(\Exception $exception): LogLevel`
`91`	`89`	`{`
`92`	`90`	`$logLevel = LogLevel::CRITICAL;`
`93`	`91`	`if ($exception instanceof HttpExceptionInterface) {`