Backport type fixes

Author: nicolas-grekas

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/ContainerLoader.php

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

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');
     }

Route.php

@@ -116,8 +116,6 @@ public function unserialize($serialized)
     }
 
     /**
-     * Returns the pattern for the path.
-     *
      * @return string The path pattern
      */
     public function getPath()
@@ -128,8 +126,6 @@ public function getPath()
     /**
      * Sets the pattern for the path.
      *
-     * This method implements a fluent interface.
-     *
      * @param string $pattern The path pattern
      *
      * @return $this
@@ -158,8 +154,6 @@ public function setPath($pattern)
     }
 
     /**
-     * Returns the pattern for the host.
-     *
      * @return string The host pattern
      */
     public function getHost()
@@ -170,8 +164,6 @@ public function getHost()
     /**
      * Sets the pattern for the host.
      *
-     * This method implements a fluent interface.
-     *
      * @param string $pattern The host pattern
      *
      * @return $this
@@ -199,8 +191,6 @@ public function getSchemes()
      * Sets the schemes (e.g. 'https') this route is restricted to.
      * So an empty array means that any scheme is allowed.
      *
-     * This method implements a fluent interface.
-     *
      * @param string|string[] $schemes The scheme or an array of schemes
      *
      * @return $this
@@ -240,8 +230,6 @@ public function getMethods()
      * Sets the HTTP methods (e.g. 'POST') this route is restricted to.
      * So an empty array means that any method is allowed.
      *
-     * This method implements a fluent interface.
-     *
      * @param string|string[] $methods The method or an array of methods
      *
      * @return $this
@@ -255,8 +243,6 @@ public function setMethods($methods)
     }
 
     /**
-     * Returns the options.
-     *
      * @return array The options
      */
     public function getOptions()
@@ -265,10 +251,6 @@ public function getOptions()
     }
 
     /**
-     * Sets the options.
-     *
-     * This method implements a fluent interface.
-     *
      * @return $this
      */
     public function setOptions(array $options)
@@ -281,10 +263,6 @@ public function setOptions(array $options)
     }
 
     /**
-     * Adds options.
-     *
-     * This method implements a fluent interface.
-     *
      * @return $this
      */
     public function addOptions(array $options)
@@ -300,8 +278,6 @@ public function addOptions(array $options)
     /**
      * Sets an option value.
      *
-     * This method implements a fluent interface.
-     *
      * @param string $name  An option name
      * @param mixed  $value The option value
      *
@@ -340,8 +316,6 @@ public function hasOption($name)
     }
 
     /**
-     * Returns the defaults.
-     *
      * @return array The defaults
      */
     public function getDefaults()
@@ -350,12 +324,6 @@ public function getDefaults()
     }
 
     /**
-     * Sets the defaults.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param array $defaults The defaults
-     *
      * @return $this
      */
     public function setDefaults(array $defaults)
@@ -366,12 +334,6 @@ public function setDefaults(array $defaults)
     }
 
     /**
-     * Adds defaults.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param array $defaults The defaults
-     *
      * @return $this
      */
     public function addDefaults(array $defaults)
@@ -433,8 +395,6 @@ public function setDefault($name, $default)
     }
 
     /**
-     * Returns the requirements.
-     *
      * @return array The requirements
      */
     public function getRequirements()
@@ -443,12 +403,6 @@ public function getRequirements()
     }
 
     /**
-     * Sets the requirements.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param array $requirements The requirements
-     *
      * @return $this
      */
     public function setRequirements(array $requirements)
@@ -459,12 +413,6 @@ public function setRequirements(array $requirements)
     }
 
     /**
-     * Adds requirements.
-     *
-     * This method implements a fluent interface.
-     *
-     * @param array $requirements The requirements
-     *
      * @return $this
      */
     public function addRequirements(array $requirements)
@@ -526,8 +474,6 @@ public function setRequirement($key, $regex)
     }
 
     /**
-     * Returns the condition.
-     *
      * @return string The condition
      */
     public function getCondition()
@@ -538,8 +484,6 @@ public function getCondition()
     /**
      * Sets the condition.
      *
-     * This method implements a fluent interface.
-     *
      * @param string $condition The condition
      *
      * @return $this