Backport type fixes

Author: nicolas-grekas

Annotation/Route.php

@@ -132,7 +132,7 @@ public function __construct(
         }
     }
 
-    public function setPath($path)
+    public function setPath(string $path)
     {
         $this->path = $path;
     }
@@ -152,7 +152,7 @@ public function getLocalizedPaths(): array
         return $this->localizedPaths;
     }
 
-    public function setHost($pattern)
+    public function setHost(string $pattern)
     {
         $this->host = $pattern;
     }
@@ -162,7 +162,7 @@ public function getHost()
         return $this->host;
     }
 
-    public function setName($name)
+    public function setName(string $name)
     {
         $this->name = $name;
     }
@@ -172,7 +172,7 @@ public function getName()
         return $this->name;
     }
 
-    public function setRequirements($requirements)
+    public function setRequirements(array $requirements)
     {
         $this->requirements = $requirements;
     }
@@ -182,7 +182,7 @@ public function getRequirements()
         return $this->requirements;
     }
 
-    public function setOptions($options)
+    public function setOptions(array $options)
     {
         $this->options = $options;
     }
@@ -192,7 +192,7 @@ public function getOptions()
         return $this->options;
     }
 
-    public function setDefaults($defaults)
+    public function setDefaults(array $defaults)
     {
         $this->defaults = $defaults;
     }
@@ -222,7 +222,7 @@ public function getMethods()
         return $this->methods;
     }
 
-    public function setCondition($condition)
+    public function setCondition(?string $condition)
     {
         $this->condition = $condition;
     }

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/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)
@@ -104,9 +100,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)
@@ -144,10 +137,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)
@@ -220,10 +209,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

@@ -106,10 +106,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)
     {
@@ -154,10 +150,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)
     {

Route.php

@@ -120,8 +120,6 @@ public function getPath()
     }
 
     /**
-     * Sets the pattern for the path.
-     *
      * @return $this
      */
     public function setPath(string $pattern)
@@ -145,8 +143,6 @@ public function getHost()
     }
 
     /**
-     * Sets the pattern for the host.
-     *
      * @return $this
      */
     public function setHost(?string $pattern)
@@ -270,8 +266,6 @@ public function setOption(string $name, $value)
     }
 
     /**
-     * Get an option value.
-     *
      * @return mixed The option value or null when not given
      */
     public function getOption(string $name)
@@ -280,8 +274,6 @@ public function getOption(string $name)
     }
 
     /**
-     * Checks if an option has been set.
-     *
      * @return bool true if the option is set, false otherwise
      */
     public function hasOption(string $name)
@@ -325,8 +317,6 @@ public function addDefaults(array $defaults)
     }
 
     /**
-     * Gets a default value.
-     *
      * @return mixed The default value or null when not given
      */
     public function getDefault(string $name)
@@ -335,8 +325,6 @@ public function getDefault(string $name)
     }
 
     /**
-     * Checks if a default value is set for the given variable.
-     *
      * @return bool true if the default value is set, false otherwise
      */
     public function hasDefault(string $name)
@@ -399,8 +387,6 @@ public function addRequirements(array $requirements)
     }
 
     /**
-     * Returns the requirement for the given key.
-     *
      * @return string|null The regex or null when not given
      */
     public function getRequirement(string $key)
@@ -409,8 +395,6 @@ public function getRequirement(string $key)
     }
 
     /**
-     * Checks if a requirement is set for the given key.
-     *
      * @return bool true if a requirement is specified, false otherwise
      */
     public function hasRequirement(string $key)
@@ -419,8 +403,6 @@ public function hasRequirement(string $key)
     }
 
     /**
-     * Sets a requirement for the given key.
-     *
      * @return $this
      */
     public function setRequirement(string $key, string $regex)
@@ -444,8 +426,6 @@ public function getCondition()
     }
 
     /**
-     * Sets the condition.
-     *
      * @return $this
      */
     public function setCondition(?string $condition)