Merge branch '5.2' into 5.3

* 5.2:
  Backport type fixes
  Fix CS
  Avoid triggering the autoloader in Deprecation::isLegacy()
  fix markdown markup
  Backport type fixes
  uzb translation
  [DependencyInjection] Fix doc blocks
  [DependencyInjection] Turn $defaultDeprecationTemplate into a constant
  [Form] better form doc types to support static analysis

Author: nicolas-grekas

Annotation/Route.php

@@ -150,7 +150,7 @@ public function __construct(
         }
     }
 
-    public function setPath($path)
+    public function setPath(string $path)
     {
         $this->path = $path;
     }
@@ -170,7 +170,7 @@ public function getLocalizedPaths(): array
         return $this->localizedPaths;
     }
 
-    public function setHost($pattern)
+    public function setHost(string $pattern)
     {
         $this->host = $pattern;
     }
@@ -180,7 +180,7 @@ public function getHost()
         return $this->host;
     }
 
-    public function setName($name)
+    public function setName(string $name)
     {
         $this->name = $name;
     }
@@ -190,7 +190,7 @@ public function getName()
         return $this->name;
     }
 
-    public function setRequirements($requirements)
+    public function setRequirements(array $requirements)
     {
         $this->requirements = $requirements;
     }
@@ -200,7 +200,7 @@ public function getRequirements()
         return $this->requirements;
     }
 
-    public function setOptions($options)
+    public function setOptions(array $options)
     {
         $this->options = $options;
     }
@@ -210,7 +210,7 @@ public function getOptions()
         return $this->options;
     }
 
-    public function setDefaults($defaults)
+    public function setDefaults(array $defaults)
     {
         $this->defaults = $defaults;
     }
@@ -240,7 +240,7 @@ public function getMethods()
         return $this->methods;
     }
 
-    public function setCondition($condition)
+    public function setCondition(?string $condition)
     {
         $this->condition = $condition;
     }

Loader/AnnotationFileLoader.php

@@ -26,9 +26,6 @@ class AnnotationFileLoader extends FileLoader
 {
     protected $loader;
 
-    /**
-     * @throws \RuntimeException
-     */
     public function __construct(FileLocatorInterface $locator, AnnotationClassLoader $loader)
     {
         if (!\function_exists('token_get_all')) {

Loader/Configurator/RouteConfigurator.php

@@ -24,7 +24,7 @@ class RouteConfigurator
 
     protected $parentConfigurator;
 
-    public function __construct(RouteCollection $collection, $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;

Loader/ContainerLoader.php

@@ -33,7 +33,7 @@ public function __construct(ContainerInterface $container, string $env = null)
      */
     public function supports($resource, string $type = null)
     {
-        return 'service' === $type;
+        return 'service' === $type && \is_string($resource);
     }
 
     /**

Loader/XmlFileLoader.php

@@ -69,10 +69,6 @@ public function load($file, string $type = null)
     /**
      * Parses a node from a loaded XML file.
      *
-     * @param \DOMElement $node Element to parse
-     * @param string      $path Full path of the XML file being processed
-     * @param string      $file Loaded file name
-     *
      * @throws \InvalidArgumentException When the XML is invalid
      */
     protected function parseNode(RouteCollection $collection, \DOMElement $node, string $path, string $file)
@@ -114,9 +110,6 @@ public function supports($resource, string $type = null)
     /**
      * Parses a route and adds it to the RouteCollection.
      *
-     * @param \DOMElement $node Element to parse that represents a Route
-     * @param string      $path Full path of the XML file being processed
-     *
      * @throws \InvalidArgumentException When the XML is invalid
      */
     protected function parseRoute(RouteCollection $collection, \DOMElement $node, string $path)
@@ -154,10 +147,6 @@ protected function parseRoute(RouteCollection $collection, \DOMElement $node, st
     /**
      * Parses an import and adds the routes in the resource to the RouteCollection.
      *
-     * @param \DOMElement $node Element to parse that represents a Route
-     * @param string      $path Full path of the XML file being processed
-     * @param string      $file Loaded file name
-     *
      * @throws \InvalidArgumentException When the XML is invalid
      */
     protected function parseImport(RouteCollection $collection, \DOMElement $node, string $path, string $file)
@@ -230,10 +219,6 @@ protected function parseImport(RouteCollection $collection, \DOMElement $node, s
     }
 
     /**
-     * Loads an XML file.
-     *
-     * @param string $file An XML file path
-     *
      * @return \DOMDocument
      *
      * @throws \InvalidArgumentException When loading of XML file fails because of syntax errors

Loader/YamlFileLoader.php

@@ -124,10 +124,6 @@ public function supports($resource, string $type = null)
 
     /**
      * Parses a route and adds it to the RouteCollection.
-     *
-     * @param string $name   Route name
-     * @param array  $config Route definition
-     * @param string $path   Full path of the YAML file being processed
      */
     protected function parseRoute(RouteCollection $collection, string $name, array $config, string $path)
     {
@@ -172,10 +168,6 @@ protected function parseRoute(RouteCollection $collection, string $name, array $
 
     /**
      * Parses an import and adds the routes in the resource to the RouteCollection.
-     *
-     * @param array  $config Route definition
-     * @param string $path   Full path of the YAML file being processed
-     * @param string $file   Loaded file name
      */
     protected function parseImport(RouteCollection $collection, array $config, string $path, string $file)
     {

Matcher/Dumper/StaticPrefixCollection.php

@@ -195,7 +195,7 @@ private function getCommonPrefix(string $prefix, string $anotherPrefix): array
         return [substr($prefix, 0, $i), substr($prefix, 0, $staticLength ?? $i)];
     }
 
-    public static function handleError($type, $msg)
+    public static function handleError(int $type, string $msg)
     {
         return false !== strpos($msg, 'Compilation failed: lookbehind assertion is not fixed length');
     }