Merge branch '4.0'

* 4.0:
  Fix tests
  PropertyInfo\DoctrineExtractor - There is bug when indexBy is meta key
  Fix PercentType error rendering.
  [minor] SCA
  [Cache] Inline some hot function calls
  fixed Silex project's URL
  fixed deprecations in tests
  fixed Twig URL
  [Cache] Add missing `@internal` tag on ProxyTrait
  fix formatting arguments in plaintext format
  Fix PSR exception context key
  Don't assume that file binary exists on *nix OS
  Fix that ESI/SSI processing can turn a \"private\" response \"public\"
  [Form] Fixed trimming choice values
  fix rendering exception stack traces
  [Routing] Fix loading multiple class annotations for invokable classes

Author: nicolas-grekas

Loader/AnnotationClassLoader.php

@@ -120,12 +120,16 @@ public function load($class, $type = null)
             }
         }
 
-        /** @var $annot RouteAnnotation */
-        if (0 === $collection->count() && $class->hasMethod('__invoke') && $annot = $this->reader->getClassAnnotation($class, $this->routeAnnotationClass)) {
-            $globals['path'] = null;
-            $globals['name'] = '';
-            $globals['localized_paths'] = array();
-            $this->addRoute($collection, $annot, $globals, $class, $class->getMethod('__invoke'));
+        if (0 === $collection->count() && $class->hasMethod('__invoke')) {
+            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'));
+                }
+            }
         }
 
         return $collection;

Tests/Loader/AnnotationClassLoaderTest.php

@@ -13,7 +13,7 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use Doctrine\Common\Annotations\AnnotationRegistry;
-use PHPUnit\Framework\TestCase;
+use Symfony\Component\Routing\Annotation\Route as RouteAnnotation;
 use Symfony\Component\Routing\Loader\AnnotationClassLoader;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\AbstractClassController;
@@ -35,7 +35,7 @@
 use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\PrefixedActionPathController;
 use Symfony\Component\Routing\Tests\Fixtures\AnnotationFixtures\RouteWithPrefixController;
 
-class AnnotationClassLoaderTest extends TestCase
+class AnnotationClassLoaderTest extends AbstractAnnotationLoaderTest
 {
     /**
      * @var AnnotationClassLoader
@@ -166,6 +166,51 @@ public function testLocalizedPrefixLocalizedRoute()
         $this->assertEquals('/en/action', $routes->get('action.en')->getPath());
     }
 
+    public function testInvokableClassMultipleRouteLoad()
+    {
+        $classRouteData1 = array(
+            'name' => 'route1',
+            'path' => '/1',
+            'schemes' => array('https'),
+            'methods' => array('GET'),
+        );
+
+        $classRouteData2 = array(
+            'name' => 'route2',
+            'path' => '/2',
+            'schemes' => array('https'),
+            'methods' => array('GET'),
+        );
+
+        $reader = $this->getReader();
+        $reader
+            ->expects($this->exactly(1))
+            ->method('getClassAnnotations')
+            ->will($this->returnValue(array(new RouteAnnotation($classRouteData1), new RouteAnnotation($classRouteData2))))
+        ;
+        $reader
+            ->expects($this->once())
+            ->method('getMethodAnnotations')
+            ->will($this->returnValue(array()))
+        ;
+        $loader = new class($reader) extends AnnotationClassLoader {
+            protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, $annot) {}
+        };
+
+        $routeCollection = $loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass');
+        $route = $routeCollection->get($classRouteData1['name']);
+
+        $this->assertSame($classRouteData1['path'], $route->getPath(), '->load preserves class route path');
+        $this->assertEquals($classRouteData1['schemes'], $route->getSchemes(), '->load preserves class route schemes');
+        $this->assertEquals($classRouteData1['methods'], $route->getMethods(), '->load preserves class route methods');
+
+        $route = $routeCollection->get($classRouteData2['name']);
+
+        $this->assertSame($classRouteData2['path'], $route->getPath(), '->load preserves class route path');
+        $this->assertEquals($classRouteData2['schemes'], $route->getSchemes(), '->load preserves class route schemes');
+        $this->assertEquals($classRouteData2['methods'], $route->getMethods(), '->load preserves class route methods');
+    }
+
     public function testMissingPrefixLocale()
     {
         $this->expectException(\LogicException::class);

Tests/Loader/AnnotationDirectoryLoaderTest.php

@@ -29,14 +29,20 @@ protected function setUp()
 
     public function testLoad()
     {
-        $this->reader->expects($this->exactly(4))->method('getClassAnnotation');
+        $this->reader->expects($this->exactly(3))->method('getClassAnnotation');
 
         $this->reader
             ->expects($this->any())
             ->method('getMethodAnnotations')
             ->will($this->returnValue(array()))
         ;
 
+        $this->reader
+            ->expects($this->any())
+            ->method('getClassAnnotations')
+            ->will($this->returnValue(array()))
+        ;
+
         $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses');
     }
 
@@ -45,7 +51,6 @@ public function testLoadIgnoresHiddenDirectories()
         $this->expectAnnotationsToBeReadFrom(array(
             'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BarClass',
             'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass',
-            'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass',
             'Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\FooClass',
         ));
 
@@ -55,6 +60,12 @@ public function testLoadIgnoresHiddenDirectories()
             ->will($this->returnValue(array()))
         ;
 
+        $this->reader
+            ->expects($this->any())
+            ->method('getClassAnnotations')
+            ->will($this->returnValue(array()))
+        ;
+
         $this->loader->load(__DIR__.'/../Fixtures/AnnotatedClasses');
     }