Merge branch '4.4'

* 4.4:
  Fixed tests on the Security and Form components
  Add return types to tests and final|internal|private methods

Author: nicolas-grekas

Tests/Fixtures/CustomRouteCompiler.php

@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Routing\Tests\Fixtures;
 
+use Symfony\Component\Routing\CompiledRoute;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCompiler;
 
@@ -19,7 +20,7 @@ class CustomRouteCompiler extends RouteCompiler
     /**
      * {@inheritdoc}
      */
-    public static function compile(Route $route)
+    public static function compile(Route $route): CompiledRoute
     {
         return new CustomCompiledRoute('', '', [], []);
     }

Tests/Fixtures/CustomXmlFileLoader.php

@@ -19,7 +19,7 @@
  */
 class CustomXmlFileLoader extends XmlFileLoader
 {
-    protected function loadFile(string $file)
+    protected function loadFile(string $file): \DOMDocument
     {
         return XmlUtils::loadFile($file, function () { return true; });
     }

Tests/Fixtures/RedirectableUrlMatcher.php

@@ -19,7 +19,7 @@
  */
 class RedirectableUrlMatcher extends UrlMatcher implements RedirectableUrlMatcherInterface
 {
-    public function redirect(string $path, string $route, string $scheme = null)
+    public function redirect(string $path, string $route, string $scheme = null): array
     {
         return [
             '_controller' => 'Some controller reference...',

Tests/Loader/ObjectLoaderTest.php

@@ -98,12 +98,12 @@ class TestObjectLoader extends ObjectLoader
 {
     public $loaderMap = [];
 
-    public function supports($resource, string $type = null)
+    public function supports($resource, string $type = null): bool
     {
         return 'service';
     }
 
-    protected function getObject(string $id)
+    protected function getObject(string $id): ?object
     {
         return $this->loaderMap[$id] ?? null;
     }

Tests/Matcher/CompiledRedirectableUrlMatcherTest.php

@@ -33,7 +33,7 @@ protected function getUrlMatcher(RouteCollection $routes, RequestContext $contex
 
 class TestCompiledRedirectableUrlMatcher extends CompiledUrlMatcher implements RedirectableUrlMatcherInterface
 {
-    public function redirect(string $path, string $route, string $scheme = null)
+    public function redirect(string $path, string $route, string $scheme = null): array
     {
         return [];
     }

Tests/Matcher/Dumper/CompiledUrlMatcherDumperTest.php

@@ -487,7 +487,7 @@ public function testGenerateDumperMatcherWithObject()
 
 class TestCompiledUrlMatcher extends CompiledUrlMatcher implements RedirectableUrlMatcherInterface
 {
-    public function redirect(string $path, string $route, string $scheme = null)
+    public function redirect(string $path, string $route, string $scheme = null): array
     {
         return [];
     }