Add types to constructors and private/final/internal methods (Batch II)

Author: derrabus

Loader/Configurator/CollectionConfigurator.php

@@ -48,7 +48,7 @@ public function __destruct()
     /**
      * Creates a sub-collection.
      */
-    final public function collection($name = ''): self
+    final public function collection(string $name = ''): self
     {
         return new self($this->collection, $this->name.$name, $this, $this->prefixes);
     }

Loader/XmlFileLoader.php

@@ -409,7 +409,7 @@ private function parseDefaultNode(\DOMElement $node, string $path)
         }
     }
 
-    private function isElementValueNull(\DOMElement $element)
+    private function isElementValueNull(\DOMElement $element): bool
     {
         $namespaceUri = 'http://www.w3.org/2001/XMLSchema-instance';
 

Matcher/Dumper/CompiledUrlMatcherDumper.php

@@ -443,7 +443,7 @@ private function compileRoute(Route $route, string $name, $vars, bool $hasTraili
         ];
     }
 
-    private function getExpressionLanguage()
+    private function getExpressionLanguage(): ExpressionLanguage
     {
         if (null === $this->expressionLanguage) {
             if (!class_exists('Symfony\Component\ExpressionLanguage\ExpressionLanguage')) {
@@ -455,7 +455,7 @@ private function getExpressionLanguage()
         return $this->expressionLanguage;
     }
 
-    private function indent(string $code, int $level = 1)
+    private function indent(string $code, int $level = 1): string
     {
         return preg_replace('/^./m', str_repeat('    ', $level).'$0', $code);
     }

Matcher/Dumper/CompiledUrlMatcherTrait.php

@@ -32,7 +32,7 @@ trait CompiledUrlMatcherTrait
     private $dynamicRoutes = [];
     private $checkCondition;
 
-    public function match($pathinfo)
+    public function match($pathinfo): array
     {
         $allow = $allowSchemes = [];
         if ($ret = $this->doMatch($pathinfo, $allow, $allowSchemes)) {

Matcher/UrlMatcher.php

@@ -276,7 +276,7 @@ protected function getExpressionLanguage()
     /**
      * @internal
      */
-    protected function createRequest($pathinfo)
+    protected function createRequest(string $pathinfo): ?Request
     {
         if (!class_exists('Symfony\Component\HttpFoundation\Request')) {
             return null;

RouteCompiler.php

@@ -92,7 +92,7 @@ public static function compile(Route $route)
         );
     }
 
-    private static function compilePattern(Route $route, $pattern, $isHost)
+    private static function compilePattern(Route $route, string $pattern, bool $isHost): array
     {
         $tokens = [];
         $variables = [];