Merge branch '6.1' into 6.2

* 6.1:
  fix merge
  [FrameworkBundle] Allow to specify `null` for exception mapping configuration values
  Fix BinaryFileResponse content type detection logic
  [Notifier] [Expo] Throw exception on error-response from expo api
  Bump Symfony version to 6.1.6
  Update VERSION for 6.1.5
  Update CHANGELOG for 6.1.5
  Bump Symfony version to 6.0.14
  Update VERSION for 6.0.13
  Update CHANGELOG for 6.0.13
  Bump Symfony version to 5.4.14
  Update VERSION for 5.4.13
  Update CHANGELOG for 5.4.13
  Bump Symfony version to 4.4.47
  Update VERSION for 4.4.46
  Update CONTRIBUTORS for 4.4.46
  Update CHANGELOG for 4.4.46
  [Security] Fix login url matching when app is not run with url rewriting or from a sub folder
  [symfony/mailjet-mailer] Fix bug #47701

Author: xabbuh

DependencyInjection/Configuration.php

@@ -1222,15 +1222,19 @@ private function addExceptionsSection(ArrayNodeDefinition $rootNode)
                             ->scalarNode('log_level')
                                 ->info('The level of log message. Null to let Symfony decide.')
                                 ->validate()
-                                    ->ifTrue(function ($v) use ($logLevels) { return !\in_array($v, $logLevels); })
+                                    ->ifTrue(function ($v) use ($logLevels) { return null !== $v && !\in_array($v, $logLevels, true); })
                                     ->thenInvalid(sprintf('The log level is not valid. Pick one among "%s".', implode('", "', $logLevels)))
                                 ->end()
                                 ->defaultNull()
                             ->end()
                             ->scalarNode('status_code')
-                                ->info('The status code of the response. Null to let Symfony decide.')
+                                ->info('The status code of the response. Null or 0 to let Symfony decide.')
+                                ->beforeNormalization()
+                                    ->ifTrue(function ($v) { return 0 === $v; })
+                                    ->then(function ($v) { return null; })
+                                ->end()
                                 ->validate()
-                                    ->ifTrue(function ($v) { return $v < 100 || $v > 599; })
+                                    ->ifTrue(function ($v) { return null !== $v && ($v < 100 || $v > 599); })
                                     ->thenInvalid('The status code is not valid. Pick a value between 100 and 599.')
                                 ->end()
                                 ->defaultNull()

Tests/DependencyInjection/Fixtures/php/exceptions.php

@@ -1,6 +1,9 @@
 <?php
 
 use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException;
 
 $container->loadFromExtension('framework', [
     'http_method_override' => false,
@@ -9,5 +12,17 @@
             'log_level' => 'info',
             'status_code' => 422,
         ],
+        NotFoundHttpException::class => [
+            'log_level' => 'info',
+            'status_code' => null,
+        ],
+        ConflictHttpException::class => [
+            'log_level' => 'info',
+            'status_code' => 0,
+        ],
+        ServiceUnavailableHttpException::class => [
+            'log_level' => null,
+            'status_code' => 500,
+        ],
     ],
 ]);

Tests/DependencyInjection/Fixtures/xml/exceptions.xml

@@ -8,6 +8,9 @@
     <framework:config http-method-override="false">
         <framework:exceptions>
             <framework:exception name="Symfony\Component\HttpKernel\Exception\BadRequestHttpException" log-level="info" status-code="422" />
+            <framework:exception name="Symfony\Component\HttpKernel\Exception\NotFoundHttpException" log-level="info" status-code="0" />
+            <framework:exception name="Symfony\Component\HttpKernel\Exception\ConflictHttpException" log-level="info" status-code="0" />
+            <framework:exception name="Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException" log-level="null" status-code="500" />
         </framework:exceptions>
     </framework:config>
 </container>

Tests/DependencyInjection/Fixtures/yml/exceptions.yml

@@ -4,3 +4,12 @@ framework:
         Symfony\Component\HttpKernel\Exception\BadRequestHttpException:
             log_level: info
             status_code: 422
+        Symfony\Component\HttpKernel\Exception\NotFoundHttpException:
+            log_level: info
+            status_code: null
+        Symfony\Component\HttpKernel\Exception\ConflictHttpException:
+            log_level: info
+            status_code: 0
+        Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException:
+            log_level: null
+            status_code: 500

Tests/DependencyInjection/FrameworkExtensionTest.php

@@ -584,6 +584,18 @@ public function testExceptionsConfig()
                 'log_level' => 'info',
                 'status_code' => 422,
             ],
+            \Symfony\Component\HttpKernel\Exception\NotFoundHttpException::class => [
+                'log_level' => 'info',
+                'status_code' => null,
+            ],
+            \Symfony\Component\HttpKernel\Exception\ConflictHttpException::class => [
+                'log_level' => 'info',
+                'status_code' => null,
+            ],
+            \Symfony\Component\HttpKernel\Exception\ServiceUnavailableHttpException::class => [
+                'log_level' => null,
+                'status_code' => 500,
+            ],
         ], $container->getDefinition('exception_listener')->getArgument(3));
     }