Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value

nicolas-grekas · nicolas-grekas · commit 8a03fd76b3ca · 2024-01-23T14:51:25.000+01:00
diff --git a/Annotation/Route.php b/Annotation/Route.php
@@ -49,20 +49,20 @@ class Route
     public function __construct(
         $data = [],
         $path = null,
-        string $name = null,
+        ?string $name = null,
         array $requirements = [],
         array $options = [],
         array $defaults = [],
-        string $host = null,
+        ?string $host = null,
         $methods = [],
         $schemes = [],
-        string $condition = null,
-        int $priority = null,
-        string $locale = null,
-        string $format = null,
-        bool $utf8 = null,
-        bool $stateless = null,
-        string $env = null
+        ?string $condition = null,
+        ?int $priority = null,
+        ?string $locale = null,
+        ?string $format = null,
+        ?bool $utf8 = null,
+        ?bool $stateless = null,
+        ?string $env = null
     ) {
         if (\is_string($data)) {
             $data = ['path' => $data];
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)
     {
         if (null === $message) {
             trigger_deprecation('symfony/routing', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__);
diff --git a/Generator/CompiledUrlGenerator.php b/Generator/CompiledUrlGenerator.php
@@ -23,7 +23,7 @@ class CompiledUrlGenerator extends UrlGenerator
     private $compiledRoutes = [];
     private $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
@@ -82,7 +82,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/AnnotationClassLoader.php b/Loader/AnnotationClassLoader.php
@@ -85,7 +85,7 @@ abstract class AnnotationClassLoader implements LoaderInterface
      */
     protected $defaultRouteIndex = 0;
 
-    public function __construct(Reader $reader = null, string $env = null)
+    public function __construct(?Reader $reader = null, ?string $env = null)
     {
         $this->reader = $reader;
         $this->env = $env;
@@ -108,7 +108,7 @@ public function setRouteAnnotationClass(string $class)
      *
      * @throws \InvalidArgumentException When route can't be parsed
      */
-    public function load($class, string $type = null)
+    public function load($class, ?string $type = null)
     {
         if (!class_exists($class)) {
             throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
@@ -239,7 +239,7 @@ protected function addRoute(RouteCollection $collection, object $annot, array $g
     /**
      * {@inheritdoc}
      */
-    public function supports($resource, string $type = null)
+    public function supports($resource, ?string $type = null)
     {
         return \is_string($resource) && preg_match('/^(?:\\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)+$/', $resource) && (!$type || 'annotation' === $type);
     }
diff --git a/Loader/AnnotationDirectoryLoader.php b/Loader/AnnotationDirectoryLoader.php
@@ -32,7 +32,7 @@ class AnnotationDirectoryLoader extends AnnotationFileLoader
      *
      * @throws \InvalidArgumentException When the directory does not exist or its routes cannot be parsed
      */
-    public function load($path, string $type = null)
+    public function load($path, ?string $type = null)
     {
         if (!is_dir($dir = $this->locator->locate($path))) {
             return parent::supports($path, $type) ? parent::load($path, $type) : new RouteCollection();
@@ -74,7 +74,7 @@ function (\SplFileInfo $current) {
     /**
      * {@inheritdoc}
      */
-    public function supports($resource, string $type = null)
+    public function supports($resource, ?string $type = null)
     {
         if ('annotation' === $type) {
             return true;
diff --git a/Loader/AnnotationFileLoader.php b/Loader/AnnotationFileLoader.php
@@ -47,7 +47,7 @@ public function __construct(FileLocatorInterface $locator, AnnotationClassLoader
      *
      * @throws \InvalidArgumentException When the file does not exist or its routes cannot be parsed
      */
-    public function load($file, string $type = null)
+    public function load($file, ?string $type = null)
     {
         $path = $this->locator->locate($file);
 
@@ -70,7 +70,7 @@ public function load($file, string $type = null)
     /**
      * {@inheritdoc}
      */
-    public function supports($resource, string $type = null)
+    public function supports($resource, ?string $type = null)
     {
         return \is_string($resource) && 'php' === pathinfo($resource, \PATHINFO_EXTENSION) && (!$type || 'annotation' === $type);
     }
diff --git a/Loader/ClosureLoader.php b/Loader/ClosureLoader.php
@@ -31,15 +31,15 @@ class ClosureLoader extends Loader
      *
      * @return RouteCollection
      */
-    public function load($closure, string $type = null)
+    public function load($closure, ?string $type = null)
     {
         return $closure($this->env);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function supports($resource, string $type = null)
+    public function supports($resource, ?string $type = null)
     {
         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 $parentPrefixes;
     private $host;
 
-    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 $file;
     private $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($resource, string $type = null, bool $ignoreErrors = false, $exclude = null): ImportConfigurator
+    final public function import($resource, ?string $type = null, bool $ignoreErrors = false, $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, $path, string $namePrefix = '', array $prefixes = null): RouteCollection
+    final protected function createLocalizedRoute(RouteCollection $collection, string $name, $path, string $namePrefix = '', ?array $prefixes = null): RouteCollection
     {
         $paths = [];
 
diff --git a/Loader/ContainerLoader.php b/Loader/ContainerLoader.php
@@ -22,7 +22,7 @@ class ContainerLoader extends ObjectLoader
 {
     private $container;
 
-    public function __construct(ContainerInterface $container, string $env = null)
+    public function __construct(ContainerInterface $container, ?string $env = null)
     {
         $this->container = $container;
         parent::__construct($env);
@@ -31,7 +31,7 @@ public function __construct(ContainerInterface $container, string $env = null)
     /**
      * {@inheritdoc}
      */
-    public function supports($resource, string $type = null)
+    public function supports($resource, ?string $type = null)
     {
         return 'service' === $type && \is_string($resource);
     }
diff --git a/Loader/DirectoryLoader.php b/Loader/DirectoryLoader.php
@@ -20,7 +20,7 @@ class DirectoryLoader extends FileLoader
     /**
      * {@inheritdoc}
      */
-    public function load($file, string $type = null)
+    public function load($file, ?string $type = null)
     {
         $path = $this->locator->locate($file);
 
@@ -49,7 +49,7 @@ public function load($file, string $type = null)
     /**
      * {@inheritdoc}
      */
-    public function supports($resource, string $type = null)
+    public function supports($resource, ?string $type = null)
     {
         // only when type is forced to directory, not to conflict with AnnotationLoader
 
diff --git a/Loader/GlobFileLoader.php b/Loader/GlobFileLoader.php
@@ -24,7 +24,7 @@ class GlobFileLoader extends FileLoader
     /**
      * {@inheritdoc}
      */
-    public function load($resource, string $type = null)
+    public function load($resource, ?string $type = null)
     {
         $collection = new RouteCollection();
 
@@ -40,7 +40,7 @@ public function load($resource, string $type = null)
     /**
      * {@inheritdoc}
      */
-    public function supports($resource, string $type = null)
+    public function supports($resource, ?string $type = null)
     {
         return 'glob' === $type;
     }
diff --git a/Loader/ObjectLoader.php b/Loader/ObjectLoader.php
@@ -40,7 +40,7 @@ abstract protected function getObject(string $id);
      *
      * @return RouteCollection
      */
-    public function load($resource, string $type = null)
+    public function load($resource, ?string $type = null)
     {
         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
@@ -35,7 +35,7 @@ class PhpFileLoader extends FileLoader
      *
      * @return RouteCollection
      */
-    public function load($file, string $type = null)
+    public function load($file, ?string $type = null)
     {
         $path = $this->locator->locate($file);
         $this->setCurrentDir(\dirname($path));
@@ -62,7 +62,7 @@ public function load($file, string $type = null)
     /**
      * {@inheritdoc}
      */
-    public function supports($resource, string $type = null)
+    public function supports($resource, ?string $type = null)
     {
         return \is_string($resource) && 'php' === pathinfo($resource, \PATHINFO_EXTENSION) && (!$type || 'php' === $type);
     }
diff --git a/Loader/XmlFileLoader.php b/Loader/XmlFileLoader.php
@@ -45,7 +45,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($file, string $type = null)
+    public function load($file, ?string $type = null)
     {
         $path = $this->locator->locate($file);
 
@@ -102,7 +102,7 @@ protected function parseNode(RouteCollection $collection, \DOMElement $node, str
     /**
      * {@inheritdoc}
      */
-    public function supports($resource, string $type = null)
+    public function supports($resource, ?string $type = null)
     {
         return \is_string($resource) && 'xml' === pathinfo($resource, \PATHINFO_EXTENSION) && (!$type || 'xml' === $type);
     }
diff --git a/Loader/YamlFileLoader.php b/Loader/YamlFileLoader.php
@@ -48,7 +48,7 @@ class YamlFileLoader extends FileLoader
      *
      * @throws \InvalidArgumentException When a route can't be parsed because YAML is invalid
      */
-    public function load($file, string $type = null)
+    public function load($file, ?string $type = null)
     {
         $path = $this->locator->locate($file);
 
@@ -117,7 +117,7 @@ public function load($file, string $type = null)
     /**
      * {@inheritdoc}
      */
-    public function supports($resource, string $type = null)
+    public function supports($resource, ?string $type = null)
     {
         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
@@ -27,5 +27,5 @@ interface RedirectableUrlMatcherInterface
      *
      * @return array
      */
-    public function redirect(string $path, string $route, string $scheme = null);
+    public function redirect(string $path, string $route, ?string $scheme = null);
 }
diff --git a/Matcher/TraceableUrlMatcher.php b/Matcher/TraceableUrlMatcher.php
@@ -152,7 +152,7 @@ protected function matchCollection(string $pathinfo, RouteCollection $routes)
         return [];
     }
 
-    private function addTrace(string $log, int $level = self::ROUTE_DOES_NOT_MATCH, string $name = null, Route $route = null)
+    private function addTrace(string $log, int $level = self::ROUTE_DOES_NOT_MATCH, ?string $name = null, ?Route $route = null)
     {
         $this->traces[] = [
             'log' => $log,
diff --git a/RouteCollectionBuilder.php b/RouteCollectionBuilder.php
@@ -43,7 +43,7 @@ class RouteCollectionBuilder
     private $methods;
     private $resources = [];
 
-    public function __construct(LoaderInterface $loader = null)
+    public function __construct(?LoaderInterface $loader = null)
     {
         $this->loader = $loader;
     }
@@ -59,7 +59,7 @@ public function __construct(LoaderInterface $loader = null)
      *
      * @throws LoaderLoadException
      */
-    public function import($resource, string $prefix = '/', string $type = null)
+    public function import($resource, string $prefix = '/', ?string $type = null)
     {
         /** @var RouteCollection[] $collections */
         $collections = $this->load($resource, $type);
@@ -92,7 +92,7 @@ public function import($resource, string $prefix = '/', string $type = null)
      *
      * @return Route
      */
-    public function add(string $path, string $controller, string $name = null)
+    public function add(string $path, string $controller, ?string $name = null)
     {
         $route = new Route($path);
         $route->setDefault('_controller', $controller);
@@ -125,7 +125,7 @@ public function mount(string $prefix, self $builder)
      *
      * @return $this
      */
-    public function addRoute(Route $route, string $name = null)
+    public function addRoute(Route $route, ?string $name = null)
     {
         if (null === $name) {
             // used as a flag to know which routes will need a name later
@@ -337,7 +337,7 @@ private function generateRouteName(Route $route): string
      *
      * @throws LoaderLoadException If no loader is found
      */
-    private function load($resource, string $type = null): array
+    private function load($resource, ?string $type = null): array
     {
         if (null === $this->loader) {
             throw new \BadMethodCallException('Cannot import other routing resources: you must pass a LoaderInterface when constructing RouteCollectionBuilder.');
diff --git a/Router.php b/Router.php
@@ -97,7 +97,7 @@ class Router implements RouterInterface, RequestMatcherInterface
     /**
      * @param mixed $resource The main resource to load
      */
-    public function __construct(LoaderInterface $loader, $resource, array $options = [], RequestContext $context = null, LoggerInterface $logger = null, string $defaultLocale = null)
+    public function __construct(LoaderInterface $loader, $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
@@ -1012,7 +1012,7 @@ public static function provideLookAroundRequirementsInPath()
         yield ['/app.php/bar/a/b/bam/c/d/e', '/bar/{foo}/bam/{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/AnnotationClassLoaderWithAnnotationsTest.php b/Tests/Loader/AnnotationClassLoaderWithAnnotationsTest.php
@@ -18,7 +18,7 @@
 
 class AnnotationClassLoaderWithAnnotationsTest extends AnnotationClassLoaderTestCase
 {
-    protected function setUp(string $env = null): void
+    protected function setUp(?string $env = null): void
     {
         $reader = new AnnotationReader();
         $this->loader = new class($reader, $env) extends AnnotationClassLoader {
diff --git a/Tests/Loader/AnnotationClassLoaderWithAttributesTest.php b/Tests/Loader/AnnotationClassLoaderWithAttributesTest.php
diff --git a/Tests/Loader/ClosureLoaderTest.php b/Tests/Loader/ClosureLoaderTest.php
diff --git a/Tests/Loader/ContainerLoaderTest.php b/Tests/Loader/ContainerLoaderTest.php
diff --git a/Tests/Loader/FileLocatorStub.php b/Tests/Loader/FileLocatorStub.php
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`	`if (null === $message) {`
`31`	`31`	`trigger_deprecation('symfony/routing', '5.3', 'Passing null as $message to "%s()" is deprecated, pass an empty string instead.', __METHOD__);`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class CompiledUrlGenerator extends UrlGenerator`
`23`	`23`	`private $compiledRoutes = [];`
`24`	`24`	`private $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
`@@ -82,7 +82,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt`
`82`	`82`	`'%7C' => '\|',`
`83`	`83`	`];`
`84`	`84`
`85`		`- public function __construct(RouteCollection $routes, RequestContext $context, LoggerInterface $logger = null, string $defaultLocale = null)`
	`85`	`+ public function __construct(RouteCollection $routes, RequestContext $context, ?LoggerInterface $logger = null, ?string $defaultLocale = null)`
`86`	`86`	`{`
`87`	`87`	`$this->routes = $routes;`
`88`	`88`	`$this->context = $context;`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ abstract class AnnotationClassLoader implements LoaderInterface`
`85`	`85`	`*/`
`86`	`86`	`protected $defaultRouteIndex = 0;`
`87`	`87`
`88`		`- public function __construct(Reader $reader = null, string $env = null)`
	`88`	`+ public function __construct(?Reader $reader = null, ?string $env = null)`
`89`	`89`	`{`
`90`	`90`	`$this->reader = $reader;`
`91`	`91`	`$this->env = $env;`
`@@ -108,7 +108,7 @@ public function setRouteAnnotationClass(string $class)`
`108`	`108`	`*`
`109`	`109`	`* @throws \InvalidArgumentException When route can't be parsed`
`110`	`110`	`*/`
`111`		`- public function load($class, string $type = null)`
	`111`	`+ public function load($class, ?string $type = null)`
`112`	`112`	`{`
`113`	`113`	`if (!class_exists($class)) {`
`114`	`114`	`throw new \InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));`
`@@ -239,7 +239,7 @@ protected function addRoute(RouteCollection $collection, object $annot, array $g`
`239`	`239`	`/**`
`240`	`240`	`* {@inheritdoc}`
`241`	`241`	`*/`
`242`		`- public function supports($resource, string $type = null)`
	`242`	`+ public function supports($resource, ?string $type = null)`
`243`	`243`	`{`
`244`	`244`	`return \is_string($resource) && preg_match('/^(?:\\\\?[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)+$/', $resource) && (!$type \|\| 'annotation' === $type);`
`245`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class AnnotationDirectoryLoader extends AnnotationFileLoader`
`32`	`32`	`*`
`33`	`33`	`* @throws \InvalidArgumentException When the directory does not exist or its routes cannot be parsed`
`34`	`34`	`*/`
`35`		`- public function load($path, string $type = null)`
	`35`	`+ public function load($path, ?string $type = null)`
`36`	`36`	`{`
`37`	`37`	`if (!is_dir($dir = $this->locator->locate($path))) {`
`38`	`38`	`return parent::supports($path, $type) ? parent::load($path, $type) : new RouteCollection();`
`@@ -74,7 +74,7 @@ function (\SplFileInfo $current) {`
`74`	`74`	`/**`
`75`	`75`	`* {@inheritdoc}`
`76`	`76`	`*/`
`77`		`- public function supports($resource, string $type = null)`
	`77`	`+ public function supports($resource, ?string $type = null)`
`78`	`78`	`{`
`79`	`79`	`if ('annotation' === $type) {`
`80`	`80`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function __construct(FileLocatorInterface $locator, AnnotationClassLoader`
`47`	`47`	`*`
`48`	`48`	`* @throws \InvalidArgumentException When the file does not exist or its routes cannot be parsed`
`49`	`49`	`*/`
`50`		`- public function load($file, string $type = null)`
	`50`	`+ public function load($file, ?string $type = null)`
`51`	`51`	`{`
`52`	`52`	`$path = $this->locator->locate($file);`
`53`	`53`
`@@ -70,7 +70,7 @@ public function load($file, string $type = null)`
`70`	`70`	`/**`
`71`	`71`	`* {@inheritdoc}`
`72`	`72`	`*/`
`73`		`- public function supports($resource, string $type = null)`
	`73`	`+ public function supports($resource, ?string $type = null)`
`74`	`74`	`{`
`75`	`75`	`return \is_string($resource) && 'php' === pathinfo($resource, \PATHINFO_EXTENSION) && (!$type \|\| 'annotation' === $type);`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,15 +31,15 @@ class ClosureLoader extends Loader`
`31`	`31`	`*`
`32`	`32`	`* @return RouteCollection`
`33`	`33`	`*/`
`34`		`- public function load($closure, string $type = null)`
	`34`	`+ public function load($closure, ?string $type = null)`
`35`	`35`	`{`
`36`	`36`	`return $closure($this->env);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/**`
`40`	`40`	`* {@inheritdoc}`
`41`	`41`	`*/`
`42`		`- public function supports($resource, string $type = null)`
	`42`	`+ public function supports($resource, ?string $type = null)`
`43`	`43`	`{`
`44`	`44`	`return $resource instanceof \Closure && (!$type \|\| 'closure' === $type);`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class CollectionConfigurator`
`28`	`28`	`private $parentPrefixes;`
`29`	`29`	`private $host;`
`30`	`30`
`31`		`- public function __construct(RouteCollection $parent, string $name, self $parentConfigurator = null, array $parentPrefixes = null)`
	`31`	`+ public function __construct(RouteCollection $parent, string $name, ?self $parentConfigurator = null, ?array $parentPrefixes = null)`
`32`	`32`	`{`
`33`	`33`	`$this->parent = $parent;`
`34`	`34`	`$this->name = $name;`