Merge branch '5.2' into 5.x

derrabus · derrabus · commit 20e5441eb893 · 2021-02-24T01:41:59.000+01:00
* 5.2:
  Switched to non-null defaults in exception constructors
  Allow x-forwarded-prefix trusted header.
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
@@ -98,7 +98,7 @@ public function getConfigTreeBuilder()
                     ->enumPrototype()
                         ->values([
                             'forwarded',
-                            'x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port',
+                            'x-forwarded-for', 'x-forwarded-host', 'x-forwarded-proto', 'x-forwarded-port', 'x-forwarded-prefix',
                         ])
                     ->end()
                 ->end()
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -2395,6 +2395,7 @@ private function resolveTrustedHeaders(array $headers): int
                 case 'x-forwarded-host': $trustedHeaders |= Request::HEADER_X_FORWARDED_HOST; break;
                 case 'x-forwarded-proto': $trustedHeaders |= Request::HEADER_X_FORWARDED_PROTO; break;
                 case 'x-forwarded-port': $trustedHeaders |= Request::HEADER_X_FORWARDED_PORT; break;
+                case 'x-forwarded-prefix': $trustedHeaders |= Request::HEADER_X_FORWARDED_PREFIX; break;
             }
         }
 
diff --git a/src/Symfony/Component/Config/Exception/LoaderLoadException.php b/src/Symfony/Component/Config/Exception/LoaderLoadException.php
@@ -19,13 +19,13 @@
 class LoaderLoadException extends \Exception
 {
     /**
-     * @param string     $resource       The resource that could not be imported
-     * @param string     $sourceResource The original resource importing the new resource
-     * @param int        $code           The error code
-     * @param \Throwable $previous       A previous exception
-     * @param string     $type           The type of resource
+     * @param string          $resource       The resource that could not be imported
+     * @param string|null     $sourceResource The original resource importing the new resource
+     * @param int|null        $code           The error code
+     * @param \Throwable|null $previous       A previous exception
+     * @param string|null     $type           The type of resource
      */
-    public function __construct(string $resource, string $sourceResource = null, int $code = null, \Throwable $previous = null, string $type = null)
+    public function __construct(string $resource, string $sourceResource = null, ?int $code = 0, \Throwable $previous = null, string $type = null)
     {
         $message = '';
         if ($previous) {

Original file line number	Diff line number	Diff line change
`@@ -2395,6 +2395,7 @@ private function resolveTrustedHeaders(array $headers): int`
`2395`	`2395`	`case 'x-forwarded-host': $trustedHeaders \|= Request::HEADER_X_FORWARDED_HOST; break;`
`2396`	`2396`	`case 'x-forwarded-proto': $trustedHeaders \|= Request::HEADER_X_FORWARDED_PROTO; break;`
`2397`	`2397`	`case 'x-forwarded-port': $trustedHeaders \|= Request::HEADER_X_FORWARDED_PORT; break;`
	`2398`	`+ case 'x-forwarded-prefix': $trustedHeaders \|= Request::HEADER_X_FORWARDED_PREFIX; break;`
`2398`	`2399`	`}`
`2399`	`2400`	`}`
`2400`	`2401`