Merge branch '3.4' into 4.1

* 3.4:
  fix authorization checker variable name
  [Routing] Remove duplicate schemes and methods for invokable controllers
  [Bridge/PhpUnit] fix the fix

Author: fabpot

Loader/AnnotationClassLoader.php

@@ -120,12 +120,9 @@ public function load($class, $type = null)
         }
 
         if (0 === $collection->count() && $class->hasMethod('__invoke')) {
+            $globals = $this->resetGlobals();
             foreach ($this->reader->getClassAnnotations($class) as $annot) {
                 if ($annot instanceof $this->routeAnnotationClass) {
-                    $globals['path'] = '';
-                    $globals['name'] = '';
-                    $globals['localized_paths'] = array();
-
                     $this->addRoute($collection, $annot, $globals, $class, $class->getMethod('__invoke'));
                 }
             }
@@ -254,18 +251,7 @@ protected function getDefaultRouteName(\ReflectionClass $class, \ReflectionMetho
 
     protected function getGlobals(\ReflectionClass $class)
     {
-        $globals = array(
-            'path' => null,
-            'localized_paths' => array(),
-            'requirements' => array(),
-            'options' => array(),
-            'defaults' => array(),
-            'schemes' => array(),
-            'methods' => array(),
-            'host' => '',
-            'condition' => '',
-            'name' => '',
-        );
+        $globals = $this->resetGlobals();
 
         if ($annot = $this->reader->getClassAnnotation($class, $this->routeAnnotationClass)) {
             if (null !== $annot->getName()) {
@@ -310,6 +296,22 @@ protected function getGlobals(\ReflectionClass $class)
         return $globals;
     }
 
+    private function resetGlobals()
+    {
+        return array(
+            'path' => null,
+            'localized_paths' => array(),
+            'requirements' => array(),
+            'options' => array(),
+            'defaults' => array(),
+            'schemes' => array(),
+            'methods' => array(),
+            'host' => '',
+            'condition' => '',
+            'name' => '',
+        );
+    }
+
     protected function createRoute($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition)
     {
         return new Route($path, $defaults, $requirements, $options, $host, $schemes, $methods, $condition);

Tests/Fixtures/AnnotationFixtures/InvokableController.php

@@ -5,7 +5,7 @@
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
- * @Route("/here", name="lol")
+ * @Route("/here", name="lol", methods={"GET", "POST"}, schemes={"https"})
  */
 class InvokableController
 {

Tests/Loader/AnnotationClassLoaderTest.php

@@ -92,6 +92,8 @@ public function testInvokableControllerLoader()
         $routes = $this->loader->load(InvokableController::class);
         $this->assertCount(1, $routes);
         $this->assertEquals('/here', $routes->get('lol')->getPath());
+        $this->assertEquals(array('GET', 'POST'), $routes->get('lol')->getMethods());
+        $this->assertEquals(array('https'), $routes->get('lol')->getSchemes());
     }
 
     public function testInvokableLocalizedControllerLoading()
@@ -134,7 +136,7 @@ public function testMethodActionControllers()
         $this->assertEquals('/the/path', $routes->get('post')->getPath());
     }
 
-    public function testLocalizedMethodActionControllers()
+    public function testInvokableClassRouteLoadWithMethodAnnotation()
     {
         $routes = $this->loader->load(LocalizedMethodActionControllers::class);
         $this->assertCount(4, $routes);