Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit 02d63e77a176 · 2024-01-23T15:51:35.000+01:00
* 6.3:
  minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench)
  Fix bad merge
  List CS fix in .git-blame-ignore-revs
  Fix implicitly-required parameters
  List CS fix in .git-blame-ignore-revs
  Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value
diff --git a/Attribute/Route.php b/Attribute/Route.php
@@ -35,7 +35,7 @@ class Route
      * @param string[]|string           $schemes
      */
     public function __construct(
-        string|array $path = null,
+        string|array|null $path = null,
         private ?string $name = null,
         private array $requirements = [],
         private array $options = [],
@@ -45,10 +45,10 @@ public function __construct(
         array|string $schemes = [],
         private ?string $condition = null,
         private ?int $priority = null,
-        string $locale = null,
-        string $format = null,
-        bool $utf8 = null,
-        bool $stateless = null,
+        ?string $locale = null,
+        ?string $format = null,
+        ?bool $utf8 = null,
+        ?bool $stateless = null,
         private ?string $env = null
     ) {
         if (\is_array($path)) {
diff --git a/CompiledRoute.php b/CompiledRoute.php
@@ -37,7 +37,7 @@ class CompiledRoute implements \Serializable
      * @param array       $hostVariables An array of host variables
      * @param array       $variables     An array of variables (variables defined in the path and in the host patterns)
      */
-    public function __construct(string $staticPrefix, string $regex, array $tokens, array $pathVariables, string $hostRegex = null, array $hostTokens = [], array $hostVariables = [], array $variables = [])
+    public function __construct(string $staticPrefix, string $regex, array $tokens, array $pathVariables, ?string $hostRegex = null, array $hostTokens = [], array $hostVariables = [], array $variables = [])
     {
         $this->staticPrefix = $staticPrefix;
         $this->regex = $regex;
diff --git a/Exception/MethodNotAllowedException.php b/Exception/MethodNotAllowedException.php
@@ -25,7 +25,7 @@ class MethodNotAllowedException extends \RuntimeException implements ExceptionIn
     /**
      * @param string[] $allowedMethods
      */
-    public function __construct(array $allowedMethods, string $message = '', int $code = 0, \Throwable $previous = null)
+    public function __construct(array $allowedMethods, string $message = '', int $code = 0, ?\Throwable $previous = null)
     {
         $this->allowedMethods = array_map('strtoupper', $allowedMethods);
 
diff --git a/Exception/MissingMandatoryParametersException.php b/Exception/MissingMandatoryParametersException.php
@@ -26,7 +26,7 @@ class MissingMandatoryParametersException extends \InvalidArgumentException impl
      * @param string[] $missingParameters
      * @param int      $code
      */
-    public function __construct(string $routeName = '', $missingParameters = null, $code = 0, \Throwable $previous = null)
+    public function __construct(string $routeName = '', $missingParameters = null, $code = 0, ?\Throwable $previous = null)
     {
         if (\is_array($missingParameters)) {
             $this->routeName = $routeName;
diff --git a/Generator/CompiledUrlGenerator.php b/Generator/CompiledUrlGenerator.php
@@ -23,7 +23,7 @@ class CompiledUrlGenerator extends UrlGenerator
     private array $compiledRoutes = [];
     private ?string $defaultLocale;
 
-    public function __construct(array $compiledRoutes, RequestContext $context, LoggerInterface $logger = null, string $defaultLocale = null)
+    public function __construct(array $compiledRoutes, RequestContext $context, ?LoggerInterface $logger = null, ?string $defaultLocale = null)
     {
         $this->compiledRoutes = $compiledRoutes;
         $this->context = $context;
diff --git a/Generator/UrlGenerator.php b/Generator/UrlGenerator.php
@@ -83,7 +83,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
         '%7C' => '|',
     ];
 
-    public function __construct(RouteCollection $routes, RequestContext $context, LoggerInterface $logger = null, string $defaultLocale = null)
+    public function __construct(RouteCollection $routes, RequestContext $context, ?LoggerInterface $logger = null, ?string $defaultLocale = null)
     {
         $this->routes = $routes;
         $this->context = $context;
diff --git a/Loader/AttributeClassLoader.php b/Loader/AttributeClassLoader.php
@@ -111,7 +111,7 @@ public function setRouteAnnotationClass(string $class)
     /**
      * @throws \InvalidArgumentException When route can't be parsed
      */
-    public function load(mixed $class, string $type = null): RouteCollection
+    public function load(mixed $class, ?string $type = null): RouteCollection
     {
         if (!class_exists($class)) {
             throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
@@ -267,7 +267,7 @@ protected function addRoute(RouteCollection $collection, object $annot, array $g
         }
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if ('annotation' === $type) {
             trigger_deprecation('symfony/routing', '6.4', 'The "annotation" route type is deprecated, use the "attribute" route type instead.');
diff --git a/Loader/AttributeDirectoryLoader.php b/Loader/AttributeDirectoryLoader.php
@@ -26,7 +26,7 @@ class AttributeDirectoryLoader extends AttributeFileLoader
     /**
      * @throws \InvalidArgumentException When the directory does not exist or its routes cannot be parsed
      */
-    public function load(mixed $path, string $type = null): ?RouteCollection
+    public function load(mixed $path, ?string $type = null): ?RouteCollection
     {
         if (!is_dir($dir = $this->locator->locate($path))) {
             return parent::supports($path, $type) ? parent::load($path, $type) : new RouteCollection();
@@ -61,7 +61,7 @@ public function load(mixed $path, string $type = null): ?RouteCollection
         return $collection;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if (!\is_string($resource)) {
             return false;
diff --git a/Loader/AttributeFileLoader.php b/Loader/AttributeFileLoader.php
@@ -43,7 +43,7 @@ public function __construct(FileLocatorInterface $locator, AttributeClassLoader
      *
      * @throws \InvalidArgumentException When the file does not exist or its routes cannot be parsed
      */
-    public function load(mixed $file, string $type = null): ?RouteCollection
+    public function load(mixed $file, ?string $type = null): ?RouteCollection
     {
         $path = $this->locator->locate($file);
 
@@ -63,7 +63,7 @@ public function load(mixed $file, string $type = null): ?RouteCollection
         return $collection;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         if ('annotation' === $type) {
             trigger_deprecation('symfony/routing', '6.4', 'The "annotation" route type is deprecated, use the "attribute" route type instead.');
diff --git a/Loader/ClosureLoader.php b/Loader/ClosureLoader.php
@@ -26,12 +26,12 @@ class ClosureLoader extends Loader
     /**
      * Loads a Closure.
      */
-    public function load(mixed $closure, string $type = null): RouteCollection
+    public function load(mixed $closure, ?string $type = null): RouteCollection
     {
         return $closure($this->env);
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return $resource instanceof \Closure && (!$type || 'closure' === $type);
     }
diff --git a/Loader/Configurator/CollectionConfigurator.php b/Loader/Configurator/CollectionConfigurator.php
@@ -28,7 +28,7 @@ class CollectionConfigurator
     private ?array $parentPrefixes;
     private string|array|null $host = null;
 
-    public function __construct(RouteCollection $parent, string $name, self $parentConfigurator = null, array $parentPrefixes = null)
+    public function __construct(RouteCollection $parent, string $name, ?self $parentConfigurator = null, ?array $parentPrefixes = null)
     {
         $this->parent = $parent;
         $this->name = $name;
diff --git a/Loader/Configurator/RouteConfigurator.php b/Loader/Configurator/RouteConfigurator.php
@@ -24,7 +24,7 @@ class RouteConfigurator
 
     protected $parentConfigurator;
 
-    public function __construct(RouteCollection $collection, RouteCollection $route, string $name = '', CollectionConfigurator $parentConfigurator = null, array $prefixes = null)
+    public function __construct(RouteCollection $collection, RouteCollection $route, string $name = '', ?CollectionConfigurator $parentConfigurator = null, ?array $prefixes = null)
     {
         $this->collection = $collection;
         $this->route = $route;
diff --git a/Loader/Configurator/RoutingConfigurator.php b/Loader/Configurator/RoutingConfigurator.php
@@ -26,7 +26,7 @@ class RoutingConfigurator
     private string $file;
     private ?string $env;
 
-    public function __construct(RouteCollection $collection, PhpFileLoader $loader, string $path, string $file, string $env = null)
+    public function __construct(RouteCollection $collection, PhpFileLoader $loader, string $path, string $file, ?string $env = null)
     {
         $this->collection = $collection;
         $this->loader = $loader;
@@ -38,7 +38,7 @@ public function __construct(RouteCollection $collection, PhpFileLoader $loader,
     /**
      * @param string|string[]|null $exclude Glob patterns to exclude from the import
      */
-    final public function import(string|array $resource, string $type = null, bool $ignoreErrors = false, string|array $exclude = null): ImportConfigurator
+    final public function import(string|array $resource, ?string $type = null, bool $ignoreErrors = false, string|array|null $exclude = null): ImportConfigurator
     {
         $this->loader->setCurrentDir(\dirname($this->path));
 
diff --git a/Loader/Configurator/Traits/LocalizedRouteTrait.php b/Loader/Configurator/Traits/LocalizedRouteTrait.php
@@ -27,7 +27,7 @@ trait LocalizedRouteTrait
      *
      * @param string|array $path the path, or the localized paths of the route
      */
-    final protected function createLocalizedRoute(RouteCollection $collection, string $name, string|array $path, string $namePrefix = '', array $prefixes = null): RouteCollection
+    final protected function createLocalizedRoute(RouteCollection $collection, string $name, string|array $path, string $namePrefix = '', ?array $prefixes = null): RouteCollection
     {
         $paths = [];
 
diff --git a/Loader/ContainerLoader.php b/Loader/ContainerLoader.php
@@ -22,13 +22,13 @@ class ContainerLoader extends ObjectLoader
 {
     private ContainerInterface $container;
 
-    public function __construct(ContainerInterface $container, string $env = null)
+    public function __construct(ContainerInterface $container, ?string $env = null)
     {
         $this->container = $container;
         parent::__construct($env);
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return 'service' === $type && \is_string($resource);
     }
diff --git a/Loader/DirectoryLoader.php b/Loader/DirectoryLoader.php
@@ -17,7 +17,7 @@
 
 class DirectoryLoader extends FileLoader
 {
-    public function load(mixed $file, string $type = null): mixed
+    public function load(mixed $file, ?string $type = null): mixed
     {
         $path = $this->locator->locate($file);
 
@@ -43,7 +43,7 @@ public function load(mixed $file, string $type = null): mixed
         return $collection;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         // only when type is forced to directory, not to conflict with AttributeLoader
 
diff --git a/Loader/GlobFileLoader.php b/Loader/GlobFileLoader.php
@@ -21,7 +21,7 @@
  */
 class GlobFileLoader extends FileLoader
 {
-    public function load(mixed $resource, string $type = null): mixed
+    public function load(mixed $resource, ?string $type = null): mixed
     {
         $collection = new RouteCollection();
 
@@ -34,7 +34,7 @@ public function load(mixed $resource, string $type = null): mixed
         return $collection;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return 'glob' === $type;
     }
diff --git a/Loader/ObjectLoader.php b/Loader/ObjectLoader.php
@@ -33,7 +33,7 @@ abstract protected function getObject(string $id): object;
     /**
      * Calls the object method that will load the routes.
      */
-    public function load(mixed $resource, string $type = null): RouteCollection
+    public function load(mixed $resource, ?string $type = null): RouteCollection
     {
         if (!preg_match('/^[^\:]+(?:::(?:[^\:]+))?$/', $resource)) {
             throw new \InvalidArgumentException(sprintf('Invalid resource "%s" passed to the %s route loader: use the format "object_id::method" or "object_id" if your object class has an "__invoke" method.', $resource, \is_string($type) ? '"'.$type.'"' : 'object'));
diff --git a/Loader/PhpFileLoader.php b/Loader/PhpFileLoader.php
@@ -30,7 +30,7 @@ class PhpFileLoader extends FileLoader
     /**
      * Loads a PHP file.
      */
-    public function load(mixed $file, string $type = null): RouteCollection
+    public function load(mixed $file, ?string $type = null): RouteCollection
     {
         $path = $this->locator->locate($file);
         $this->setCurrentDir(\dirname($path));
@@ -54,7 +54,7 @@ public function load(mixed $file, string $type = null): RouteCollection
         return $collection;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return \is_string($resource) && 'php' === pathinfo($resource, \PATHINFO_EXTENSION) && (!$type || 'php' === $type);
     }
diff --git a/Loader/Psr4DirectoryLoader.php b/Loader/Psr4DirectoryLoader.php
@@ -36,7 +36,7 @@ public function __construct(
     /**
      * @param array{path: string, namespace: string} $resource
      */
-    public function load(mixed $resource, string $type = null): ?RouteCollection
+    public function load(mixed $resource, ?string $type = null): ?RouteCollection
     {
         $path = $this->locator->locate($resource['path'], $this->currentDirectory);
         if (!is_dir($path)) {
@@ -46,7 +46,7 @@ public function load(mixed $resource, string $type = null): ?RouteCollection
         return $this->loadFromDirectory($path, trim($resource['namespace'], '\\'));
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return ('attribute' === $type || 'annotation' === $type) && \is_array($resource) && isset($resource['path'], $resource['namespace']);
     }
diff --git a/Loader/XmlFileLoader.php b/Loader/XmlFileLoader.php
@@ -38,7 +38,7 @@ class XmlFileLoader extends FileLoader
      * @throws \InvalidArgumentException when the file cannot be loaded or when the XML cannot be
      *                                   parsed because it does not validate against the scheme
      */
-    public function load(mixed $file, string $type = null): RouteCollection
+    public function load(mixed $file, ?string $type = null): RouteCollection
     {
         $path = $this->locator->locate($file);
 
@@ -94,7 +94,7 @@ protected function parseNode(RouteCollection $collection, \DOMElement $node, str
         }
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return \is_string($resource) && 'xml' === pathinfo($resource, \PATHINFO_EXTENSION) && (!$type || 'xml' === $type);
     }
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -41,7 +41,7 @@ class YamlFileLoader extends FileLoader
     /**
      * @throws \InvalidArgumentException When a route can't be parsed because YAML is invalid
      */
-    public function load(mixed $file, string $type = null): RouteCollection
+    public function load(mixed $file, ?string $type = null): RouteCollection
     {
         $path = $this->locator->locate($file);
 
@@ -105,7 +105,7 @@ public function load(mixed $file, string $type = null): RouteCollection
         return $collection;
     }
 
-    public function supports(mixed $resource, string $type = null): bool
+    public function supports(mixed $resource, ?string $type = null): bool
     {
         return \is_string($resource) && \in_array(pathinfo($resource, \PATHINFO_EXTENSION), ['yml', 'yaml'], true) && (!$type || 'yaml' === $type);
     }
diff --git a/Matcher/RedirectableUrlMatcherInterface.php b/Matcher/RedirectableUrlMatcherInterface.php
@@ -25,5 +25,5 @@ interface RedirectableUrlMatcherInterface
      * @param string      $route  The route name that matched
      * @param string|null $scheme The URL scheme (null to keep the current one)
      */
-    public function redirect(string $path, string $route, string $scheme = null): array;
+    public function redirect(string $path, string $route, ?string $scheme = null): array;
 }
diff --git a/Matcher/TraceableUrlMatcher.php b/Matcher/TraceableUrlMatcher.php
@@ -160,7 +160,7 @@ protected function matchCollection(string $pathinfo, RouteCollection $routes): a
         return [];
     }
 
-    private function addTrace(string $log, int $level = self::ROUTE_DOES_NOT_MATCH, string $name = null, Route $route = null): void
+    private function addTrace(string $log, int $level = self::ROUTE_DOES_NOT_MATCH, ?string $name = null, ?Route $route = null): void
     {
         $this->traces[] = [
             'log' => $log,
diff --git a/Router.php b/Router.php
@@ -91,7 +91,7 @@ class Router implements RouterInterface, RequestMatcherInterface
 
     private static ?array $cache = [];
 
-    public function __construct(LoaderInterface $loader, mixed $resource, array $options = [], RequestContext $context = null, LoggerInterface $logger = null, string $defaultLocale = null)
+    public function __construct(LoaderInterface $loader, mixed $resource, array $options = [], ?RequestContext $context = null, ?LoggerInterface $logger = null, ?string $defaultLocale = null)
     {
         $this->loader = $loader;
         $this->resource = $resource;
diff --git a/Tests/Generator/UrlGeneratorTest.php b/Tests/Generator/UrlGeneratorTest.php
@@ -1050,7 +1050,7 @@ public function testUtf8VarName()
         $this->assertSame('/app.php/foo/baz', $this->getGenerator($routes)->generate('test', ['bär' => 'baz']));
     }
 
-    protected function getGenerator(RouteCollection $routes, array $parameters = [], $logger = null, string $defaultLocale = null)
+    protected function getGenerator(RouteCollection $routes, array $parameters = [], $logger = null, ?string $defaultLocale = null)
     {
         $context = new RequestContext('/app.php');
         foreach ($parameters as $key => $value) {
diff --git a/Tests/Loader/AttributeClassLoaderWithAnnotationsTest.php b/Tests/Loader/AttributeClassLoaderWithAnnotationsTest.php
@@ -19,7 +19,7 @@
  */
 class AttributeClassLoaderWithAnnotationsTest extends AttributeClassLoaderTestCase
 {
-    protected function setUp(string $env = null): void
+    protected function setUp(?string $env = null): void
     {
         $reader = new AnnotationReader();
         $this->loader = new TraceableAttributeClassLoader($reader, $env);
diff --git a/Tests/Loader/AttributeClassLoaderWithAttributesTest.php b/Tests/Loader/AttributeClassLoaderWithAttributesTest.php
@@ -15,7 +15,7 @@
 
 class AttributeClassLoaderWithAttributesTest extends AttributeClassLoaderTestCase
 {
-    protected function setUp(string $env = null): void
+    protected function setUp(?string $env = null): void
     {
         $this->loader = new TraceableAttributeClassLoader($env);
     }
diff --git a/Tests/Loader/ClosureLoaderTest.php b/Tests/Loader/ClosureLoaderTest.php
@@ -36,7 +36,7 @@ public function testLoad()
         $loader = new ClosureLoader('some-env');
 
         $route = new Route('/');
-        $routes = $loader->load(function (string $env = null) use ($route) {
+        $routes = $loader->load(function (?string $env = null) use ($route) {
             $this->assertSame('some-env', $env);
 
             $routes = new RouteCollection();
diff --git a/Tests/Loader/ContainerLoaderTest.php b/Tests/Loader/ContainerLoaderTest.php
@@ -20,7 +20,7 @@ class ContainerLoaderTest extends TestCase
     /**
      * @dataProvider supportsProvider
      */
-    public function testSupports(bool $expected, string $type = null)
+    public function testSupports(bool $expected, ?string $type = null)
     {
         $this->assertSame($expected, (new ContainerLoader(new Container()))->supports('foo', $type));
     }
diff --git a/Tests/Loader/FileLocatorStub.php b/Tests/Loader/FileLocatorStub.php
@@ -15,7 +15,7 @@
 
 class FileLocatorStub implements FileLocatorInterface
 {
-    public function locate(string $name, string $currentPath = null, bool $first = true): string|array
+    public function locate(string $name, ?string $currentPath = null, bool $first = true): string|array
     {
         if (str_starts_with($name, 'http')) {
             return $name;
diff --git a/Tests/Loader/GlobFileLoaderTest.php b/Tests/Loader/GlobFileLoaderTest.php
diff --git a/Tests/Loader/ObjectLoaderTest.php b/Tests/Loader/ObjectLoaderTest.php
diff --git a/Tests/Matcher/CompiledRedirectableUrlMatcherTest.php b/Tests/Matcher/CompiledRedirectableUrlMatcherTest.php
diff --git a/Tests/Matcher/CompiledUrlMatcherTest.php b/Tests/Matcher/CompiledUrlMatcherTest.php
diff --git a/Tests/Matcher/Dumper/CompiledUrlMatcherDumperTest.php b/Tests/Matcher/Dumper/CompiledUrlMatcherDumperTest.php
diff --git a/Tests/Matcher/RedirectableUrlMatcherTest.php b/Tests/Matcher/RedirectableUrlMatcherTest.php
diff --git a/Tests/Matcher/TraceableUrlMatcherTest.php b/Tests/Matcher/TraceableUrlMatcherTest.php
diff --git a/Tests/Matcher/UrlMatcherTest.php b/Tests/Matcher/UrlMatcherTest.php

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class CompiledRoute implements \Serializable`
`37`	`37`	`* @param array $hostVariables An array of host variables`
`38`	`38`	`* @param array $variables An array of variables (variables defined in the path and in the host patterns)`
`39`	`39`	`*/`
`40`		`- public function __construct(string $staticPrefix, string $regex, array $tokens, array $pathVariables, string $hostRegex = null, array $hostTokens = [], array $hostVariables = [], array $variables = [])`
	`40`	`+ public function __construct(string $staticPrefix, string $regex, array $tokens, array $pathVariables, ?string $hostRegex = null, array $hostTokens = [], array $hostVariables = [], array $variables = [])`
`41`	`41`	`{`
`42`	`42`	`$this->staticPrefix = $staticPrefix;`
`43`	`43`	`$this->regex = $regex;`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class MethodNotAllowedException extends \RuntimeException implements ExceptionIn`
`25`	`25`	`/**`
`26`	`26`	`* @param string[] $allowedMethods`
`27`	`27`	`*/`
`28`		`- public function __construct(array $allowedMethods, string $message = '', int $code = 0, \Throwable $previous = null)`
	`28`	`+ public function __construct(array $allowedMethods, string $message = '', int $code = 0, ?\Throwable $previous = null)`
`29`	`29`	`{`
`30`	`30`	`$this->allowedMethods = array_map('strtoupper', $allowedMethods);`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class MissingMandatoryParametersException extends \InvalidArgumentException impl`
`26`	`26`	`* @param string[] $missingParameters`
`27`	`27`	`* @param int $code`
`28`	`28`	`*/`
`29`		`- public function __construct(string $routeName = '', $missingParameters = null, $code = 0, \Throwable $previous = null)`
	`29`	`+ public function __construct(string $routeName = '', $missingParameters = null, $code = 0, ?\Throwable $previous = null)`
`30`	`30`	`{`
`31`	`31`	`if (\is_array($missingParameters)) {`
`32`	`32`	`$this->routeName = $routeName;`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class CompiledUrlGenerator extends UrlGenerator`
`23`	`23`	`private array $compiledRoutes = [];`
`24`	`24`	`private ?string $defaultLocale;`
`25`	`25`
`26`		`- public function __construct(array $compiledRoutes, RequestContext $context, LoggerInterface $logger = null, string $defaultLocale = null)`
	`26`	`+ public function __construct(array $compiledRoutes, RequestContext $context, ?LoggerInterface $logger = null, ?string $defaultLocale = null)`
`27`	`27`	`{`
`28`	`28`	`$this->compiledRoutes = $compiledRoutes;`
`29`	`29`	`$this->context = $context;`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt`
`83`	`83`	`'%7C' => '\|',`
`84`	`84`	`];`
`85`	`85`
`86`		`- public function __construct(RouteCollection $routes, RequestContext $context, LoggerInterface $logger = null, string $defaultLocale = null)`
	`86`	`+ public function __construct(RouteCollection $routes, RequestContext $context, ?LoggerInterface $logger = null, ?string $defaultLocale = null)`
`87`	`87`	`{`
`88`	`88`	`$this->routes = $routes;`
`89`	`89`	`$this->context = $context;`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function setRouteAnnotationClass(string $class)`
`111`	`111`	`/**`
`112`	`112`	`* @throws \InvalidArgumentException When route can't be parsed`
`113`	`113`	`*/`
`114`		`- public function load(mixed $class, string $type = null): RouteCollection`
	`114`	`+ public function load(mixed $class, ?string $type = null): RouteCollection`
`115`	`115`	`{`
`116`	`116`	`if (!class_exists($class)) {`
`117`	`117`	`throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));`
`@@ -267,7 +267,7 @@ protected function addRoute(RouteCollection $collection, object $annot, array $g`
`267`	`267`	`}`
`268`	`268`	`}`
`269`	`269`
`270`		`- public function supports(mixed $resource, string $type = null): bool`
	`270`	`+ public function supports(mixed $resource, ?string $type = null): bool`
`271`	`271`	`{`
`272`	`272`	`if ('annotation' === $type) {`
`273`	`273`	`trigger_deprecation('symfony/routing', '6.4', 'The "annotation" route type is deprecated, use the "attribute" route type instead.');`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class AttributeDirectoryLoader extends AttributeFileLoader`
`26`	`26`	`/**`
`27`	`27`	`* @throws \InvalidArgumentException When the directory does not exist or its routes cannot be parsed`
`28`	`28`	`*/`
`29`		`- public function load(mixed $path, string $type = null): ?RouteCollection`
	`29`	`+ public function load(mixed $path, ?string $type = null): ?RouteCollection`
`30`	`30`	`{`
`31`	`31`	`if (!is_dir($dir = $this->locator->locate($path))) {`
`32`	`32`	`return parent::supports($path, $type) ? parent::load($path, $type) : new RouteCollection();`
`@@ -61,7 +61,7 @@ public function load(mixed $path, string $type = null): ?RouteCollection`
`61`	`61`	`return $collection;`
`62`	`62`	`}`
`63`	`63`
`64`		`- public function supports(mixed $resource, string $type = null): bool`
	`64`	`+ public function supports(mixed $resource, ?string $type = null): bool`
`65`	`65`	`{`
`66`	`66`	`if (!\is_string($resource)) {`
`67`	`67`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public function __construct(FileLocatorInterface $locator, AttributeClassLoader`
`43`	`43`	`*`
`44`	`44`	`* @throws \InvalidArgumentException When the file does not exist or its routes cannot be parsed`
`45`	`45`	`*/`
`46`		`- public function load(mixed $file, string $type = null): ?RouteCollection`
	`46`	`+ public function load(mixed $file, ?string $type = null): ?RouteCollection`
`47`	`47`	`{`
`48`	`48`	`$path = $this->locator->locate($file);`
`49`	`49`
`@@ -63,7 +63,7 @@ public function load(mixed $file, string $type = null): ?RouteCollection`
`63`	`63`	`return $collection;`
`64`	`64`	`}`
`65`	`65`
`66`		`- public function supports(mixed $resource, string $type = null): bool`
	`66`	`+ public function supports(mixed $resource, ?string $type = null): bool`
`67`	`67`	`{`
`68`	`68`	`if ('annotation' === $type) {`
`69`	`69`	`trigger_deprecation('symfony/routing', '6.4', 'The "annotation" route type is deprecated, use the "attribute" route type instead.');`
Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@ class ClosureLoader extends Loader`
`26`	`26`	`/**`
`27`	`27`	`* Loads a Closure.`
`28`	`28`	`*/`
`29`		`- public function load(mixed $closure, string $type = null): RouteCollection`
	`29`	`+ public function load(mixed $closure, ?string $type = null): RouteCollection`
`30`	`30`	`{`
`31`	`31`	`return $closure($this->env);`
`32`	`32`	`}`
`33`	`33`
`34`		`- public function supports(mixed $resource, string $type = null): bool`
	`34`	`+ public function supports(mixed $resource, ?string $type = null): bool`
`35`	`35`	`{`
`36`	`36`	`return $resource instanceof \Closure && (!$type \|\| 'closure' === $type);`
`37`	`37`	`}`