Fix tests

Omer Lakraa · Omer Lakraa · commit bafaf134c827 · 2025-03-21T19:07:24.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTestCase.php
@@ -613,23 +613,27 @@ public function testExceptionsConfig()
             \Symfony\Component\HttpKernel\Exception\ConflictHttpException::class,
             \Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException::class,
         ], array_keys($configuration));
-
+        
         $this->assertEqualsCanonicalizing([
+            'log_channel' => null,
             'log_level' => 'info',
             'status_code' => 422,
         ], $configuration[\Symfony\Component\HttpKernel\Exception\BadRequestHttpException::class]);
 
         $this->assertEqualsCanonicalizing([
+            'log_channel' => null,
             'log_level' => 'info',
             'status_code' => null,
         ], $configuration[\Symfony\Component\HttpKernel\Exception\NotFoundHttpException::class]);
 
         $this->assertEqualsCanonicalizing([
+            'log_channel' => null,
             'log_level' => 'info',
             'status_code' => null,
         ], $configuration[\Symfony\Component\HttpKernel\Exception\ConflictHttpException::class]);
 
         $this->assertEqualsCanonicalizing([
+            'log_channel' => null,
             'log_level' => null,
             'status_code' => 500,
         ], $configuration[\Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException::class]);
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php b/src/Symfony/Component/HttpKernel/EventListener/ErrorListener.php
@@ -62,7 +62,7 @@ public function logKernelException(ExceptionEvent $event): void
             }
             break;
         }
-
+        
         // There's no specific status code defined in the configuration for this exception
         if (!$throwable instanceof HttpExceptionInterface && $withHttpStatus = $this->getInheritedAttribute($throwable::class, WithHttpStatus::class)) {
             $throwable = HttpException::fromStatusCode($withHttpStatus->statusCode, $throwable->getMessage(), $throwable, $withHttpStatus->headers);
@@ -167,7 +167,7 @@ public static function getSubscribedEvents(): array
     protected function logException(\Throwable $exception, string $message, ?string $logLevel = null, /* ?string $logChannel = null */): void
     {
         $logChannel = (3 < \func_num_args() ? \func_get_arg(3) : null) ?? $this->resolveLogChannel($exception);
-
+        
         $logLevel ??= $this->resolveLogLevel($exception);
         
         if(!$logger = $this->getLogger($logChannel)) {
diff --git a/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php b/src/Symfony/Component/HttpKernel/Tests/EventListener/ErrorListenerTest.php
@@ -166,11 +166,10 @@ public function testHandleWithLogChannel()
         $l->logKernelException($event);
         $l->onKernelException($event);
 
-        $this->assertEquals(new Response('foo', 401), $event->getResponse());
-        $this->assertCount(0, $defaultLogger->getLogs('error'));
-        $this->assertCount(0, $defaultLogger->getLogs('warning'));
-        $this->assertCount(0, $channelLoger->getLogs('error'));
-        $this->assertCount(1, $channelLoger->getLogs('warning'));
+        $this->assertCount(0, $defaultLogger->getLogsForLevel('error'));
+        $this->assertCount(0, $defaultLogger->getLogsForLevel('warning'));
+        $this->assertCount(0, $channelLoger->getLogsForLevel('error'));
+        $this->assertCount(1, $channelLoger->getLogsForLevel('warning'));
     }
 
     public function testHandleWithLoggerChannelNotUsed()
@@ -193,14 +192,12 @@ public function testHandleWithLoggerChannelNotUsed()
         $l->logKernelException($event);
         $l->onKernelException($event);
 
-        $this->assertEquals(new Response('foo', 401), $event->getResponse());
-
         $this->assertSame(0, $defaultLogger->countErrors());
-        $this->assertCount(0, $defaultLogger->getLogs('critical'));
-        $this->assertCount(1, $defaultLogger->getLogs('warning'));
-        $this->assertCount(0, $channelLoger->getLogs('warning'));
-        $this->assertCount(0, $channelLoger->getLogs('error'));
-        $this->assertCount(0, $channelLoger->getLogs('critical'));
+        $this->assertCount(0, $defaultLogger->getLogsForLevel('critical'));
+        $this->assertCount(1, $defaultLogger->getLogsForLevel('warning'));
+        $this->assertCount(0, $channelLoger->getLogsForLevel('warning'));
+        $this->assertCount(0, $channelLoger->getLogsForLevel('error'));
+        $this->assertCount(0, $channelLoger->getLogsForLevel('critical'));
     }
 
     public function testHandleClassImplementingInterfaceWithLogLevelAttribute()

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function logKernelException(ExceptionEvent $event): void`
`62`	`62`	`}`
`63`	`63`	`break;`
`64`	`64`	`}`
`65`		`-`
	`65`	`+`
`66`	`66`	`// There's no specific status code defined in the configuration for this exception`
`67`	`67`	`if (!$throwable instanceof HttpExceptionInterface && $withHttpStatus = $this->getInheritedAttribute($throwable::class, WithHttpStatus::class)) {`
`68`	`68`	`$throwable = HttpException::fromStatusCode($withHttpStatus->statusCode, $throwable->getMessage(), $throwable, $withHttpStatus->headers);`
`@@ -167,7 +167,7 @@ public static function getSubscribedEvents(): array`
`167`	`167`	`protected function logException(\Throwable $exception, string $message, ?string $logLevel = null, /* ?string $logChannel = null */): void`
`168`	`168`	`{`
`169`	`169`	`$logChannel = (3 < \func_num_args() ? \func_get_arg(3) : null) ?? $this->resolveLogChannel($exception);`
`170`		`-`
	`170`	`+`
`171`	`171`	`$logLevel ??= $this->resolveLogLevel($exception);`
`172`	`172`
`173`	`173`	`if(!$logger = $this->getLogger($logChannel)) {`