Apply code review suggestions

Omer LAKRAA · Omer LAKRAA · commit 2f90e0b6c326 · 2024-06-27T16:08:04.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -1346,7 +1346,6 @@ private function addExceptionsSection(ArrayNodeDefinition $rootNode): void
                             ->end()
                             ->scalarNode('log_channel')
                                 ->info('The channel of log message. Null to let Symfony decide.')
-                                ->end()
                             ->end()
                         ->end()
                     ->end()
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -5,7 +5,7 @@ CHANGELOG
 ---
 
  * Remove `@internal` flag and add `@final` to `ServicesResetter`
- * Add a new logging channel for exceptions to provide better granularity and control over exception logging.
+ * Allow configuring the logging channel per type of exceptions in ErrorListener
 
 7.1
 ---
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
@@ -164,9 +164,9 @@ public static function getSubscribedEvents(): array
      * 
      * @param ?string $logChannel
      */
-    protected function logException(\Throwable $exception, string $message, ?string $logLevel = null, /* , ?string $logChannel = null */): void
+    protected function logException(\Throwable $exception, string $message, ?string $logLevel = null, /* ?string $logChannel = null */): void
     {
-        $logChannel = 3 < \func_num_args() ? \func_get_arg(3) : $this->resolveLogChannel($exception);
+        $logChannel = (3 < \func_num_args() ? \func_get_arg(3) : null) ?? $this->resolveLogChannel($exception);
 
         $logLevel ??= $this->resolveLogLevel($exception);
         

Original file line number	Diff line number	Diff line change
`@@ -164,9 +164,9 @@ public static function getSubscribedEvents(): array`
`164`	`164`	`*`
`165`	`165`	`* @param ?string $logChannel`
`166`	`166`	`*/`
`167`		`- protected function logException(\Throwable $exception, string $message, ?string $logLevel = null, /* , ?string $logChannel = null */): void`
	`167`	`+ protected function logException(\Throwable $exception, string $message, ?string $logLevel = null, /* ?string $logChannel = null */): void`
`168`	`168`	`{`
`169`		`- $logChannel = 3 < \func_num_args() ? \func_get_arg(3) : $this->resolveLogChannel($exception);`
	`169`	`+ $logChannel = (3 < \func_num_args() ? \func_get_arg(3) : null) ?? $this->resolveLogChannel($exception);`
`170`	`170`
`171`	`171`	`$logLevel ??= $this->resolveLogLevel($exception);`
`172`	`172`