Add types to public and protected properties

Author: nicolas-grekas

Exception/MethodNotAllowedException.php

@@ -20,7 +20,7 @@
  */
 class MethodNotAllowedException extends \RuntimeException implements ExceptionInterface
 {
-    protected $allowedMethods = [];
+    protected array $allowedMethods = [];
 
     /**
      * @param string[] $allowedMethods

Generator/UrlGenerator.php

@@ -42,15 +42,10 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
         '%2A' => '*',
     ];
 
-    protected $routes;
-    protected $context;
-
-    /**
-     * @var bool|null
-     */
-    protected $strictRequirements = true;
-
-    protected $logger;
+    protected RouteCollection $routes;
+    protected RequestContext $context;
+    protected ?bool $strictRequirements = true;
+    protected ?LoggerInterface $logger;
 
     private ?string $defaultLocale;
 
@@ -62,7 +57,7 @@ class UrlGenerator implements UrlGeneratorInterface, ConfigurableRequirementsInt
      * "?" and "#" (would be interpreted wrongly as query and fragment identifier),
      * "'" and """ (are used as delimiters in HTML).
      */
-    protected $decodedChars = [
+    protected array $decodedChars = [
         // the slash can be used to designate a hierarchical structure and we want allow using it with this meaning
         // some webservers don't allow the slash in encoded form in the path for security reasons anyway
         // see http://stackoverflow.com/questions/4069002/http-400-if-2f-part-of-get-url-in-jboss

Loader/AnnotationFileLoader.php

@@ -24,7 +24,7 @@
  */
 class AnnotationFileLoader extends FileLoader
 {
-    protected $loader;
+    protected AnnotationClassLoader $loader;
 
     public function __construct(FileLocatorInterface $locator, AnnotationClassLoader $loader)
     {

Loader/Configurator/RouteConfigurator.php

@@ -22,7 +22,7 @@ class RouteConfigurator
     use Traits\HostTrait;
     use Traits\RouteTrait;
 
-    protected $parentConfigurator;
+    protected ?CollectionConfigurator $parentConfigurator;
 
     public function __construct(RouteCollection $collection, RouteCollection $route, string $name = '', CollectionConfigurator $parentConfigurator = null, array $prefixes = null)
     {

Loader/Configurator/Traits/AddTrait.php

@@ -23,12 +23,9 @@ trait AddTrait
 {
     use LocalizedRouteTrait;
 
-    /**
-     * @var RouteCollection
-     */
-    protected $collection;
-    protected $name = '';
-    protected $prefixes;
+    protected RouteCollection $collection;
+    protected string $name = '';
+    protected ?array $prefixes = null;
 
     /**
      * Adds a route.

Loader/Configurator/Traits/RouteTrait.php

@@ -16,10 +16,7 @@
 
 trait RouteTrait
 {
-    /**
-     * @var RouteCollection|Route
-     */
-    protected $route;
+    protected RouteCollection|Route $route;
 
     /**
      * Adds defaults.

Matcher/TraceableUrlMatcher.php

@@ -27,7 +27,7 @@ class TraceableUrlMatcher extends UrlMatcher
     public const ROUTE_ALMOST_MATCHES = 1;
     public const ROUTE_MATCHES = 2;
 
-    protected $traces;
+    protected array $traces;
 
     public function getTraces(string $pathinfo): array
     {

Matcher/UrlMatcher.php

@@ -32,13 +32,12 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
     public const REQUIREMENT_MISMATCH = 1;
     public const ROUTE_MATCH = 2;
 
-    /** @var RequestContext */
-    protected $context;
+    protected RequestContext $context;
 
     /**
      * Collects HTTP methods that would be allowed for the request.
      */
-    protected $allow = [];
+    protected array $allow = [];
 
     /**
      * Collects URI schemes that would be allowed for the request.
@@ -47,14 +46,14 @@ class UrlMatcher implements UrlMatcherInterface, RequestMatcherInterface
      */
     protected array $allowSchemes = [];
 
-    protected $routes;
-    protected $request;
-    protected $expressionLanguage;
+    protected RouteCollection $routes;
+    protected ?Request $request = null;
+    protected ExpressionLanguage $expressionLanguage;
 
     /**
      * @var ExpressionFunctionProviderInterface[]
      */
-    protected $expressionLanguageProviders = [];
+    protected array $expressionLanguageProviders = [];
 
     public function __construct(RouteCollection $routes, RequestContext $context)
     {

Router.php

@@ -37,47 +37,15 @@
  */
 class Router implements RouterInterface, RequestMatcherInterface
 {
-    /**
-     * @var UrlMatcherInterface|null
-     */
-    protected $matcher;
-
-    /**
-     * @var UrlGeneratorInterface|null
-     */
-    protected $generator;
-
-    /**
-     * @var RequestContext
-     */
-    protected $context;
-
-    /**
-     * @var LoaderInterface
-     */
-    protected $loader;
-
-    /**
-     * @var RouteCollection|null
-     */
-    protected $collection;
-
-    protected $resource;
-
-    /**
-     * @var array
-     */
-    protected $options = [];
-
-    /**
-     * @var LoggerInterface|null
-     */
-    protected $logger;
-
-    /**
-     * @var string|null
-     */
-    protected $defaultLocale;
+    protected UrlMatcherInterface|RequestMatcherInterface $matcher;
+    protected UrlGeneratorInterface $generator;
+    protected RequestContext $context;
+    protected LoaderInterface $loader;
+    protected RouteCollection $collection;
+    protected mixed $resource;
+    protected array $options = [];
+    protected ?LoggerInterface $logger;
+    protected ?string $defaultLocale;
 
     private ConfigCacheFactoryInterface $configCacheFactory;