Add full route definition to invokable class

yceruto · yceruto · commit 34e360ade317 · 2017-02-23T11:32:28.000-05:00
diff --git a/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php b/src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
@@ -127,6 +127,11 @@ public function load($class, $type = null)
             }
         }
 
+        if (0 === $collection->count() && $class->hasMethod('__invoke') && $annot = $this->reader->getClassAnnotation($class, $this->routeAnnotationClass)) {
+            $globals['path'] = '';
+            $this->addRoute($collection, $annot, $globals, $class, $class->getMethod('__invoke'));
+        }
+
         return $collection;
     }
 
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/BazClass.php b/src/Symfony/Component/Routing/Tests/Fixtures/AnnotatedClasses/BazClass.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses;
+
+class BazClass
+{
+    public function __invoke()
+    {
+    }
+}
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
@@ -180,6 +180,73 @@ public function testClassRouteLoad()
         $this->assertEquals(array_merge($classRouteData['methods'], $methodRouteData['methods']), $route->getMethods(), '->load merges class and method route methods');
     }
 
+    public function testInvokableClassRouteLoad()
+    {
+        $classRouteData = array(
+            'name' => 'route1',
+            'path' => '/',
+            'schemes' => array('https'),
+            'methods' => array('GET'),
+        );
+
+        $this->reader
+            ->expects($this->exactly(2))
+            ->method('getClassAnnotation')
+            ->will($this->returnValue($this->getAnnotatedRoute($classRouteData)))
+        ;
+        $this->reader
+            ->expects($this->once())
+            ->method('getMethodAnnotations')
+            ->will($this->returnValue(array()))
+        ;
+
+        $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass');
+        $route = $routeCollection->get($classRouteData['name']);
+
+        $this->assertSame($classRouteData['path'], $route->getPath(), '->load preserves class route path');
+        $this->assertEquals(array_merge($classRouteData['schemes'], $classRouteData['schemes']), $route->getSchemes(), '->load preserves class route schemes');
+        $this->assertEquals(array_merge($classRouteData['methods'], $classRouteData['methods']), $route->getMethods(), '->load preserves class route methods');
+    }
+
+    public function testInvokableClassWithMethodRouteLoad()
+    {
+        $classRouteData = array(
+            'name' => 'route1',
+            'path' => '/prefix',
+            'schemes' => array('https'),
+            'methods' => array('GET'),
+        );
+
+        $methodRouteData = array(
+            'name' => 'route2',
+            'path' => '/path',
+            'schemes' => array('http'),
+            'methods' => array('POST', 'PUT'),
+        );
+
+        $this->reader
+            ->expects($this->once())
+            ->method('getClassAnnotation')
+            ->will($this->returnValue($this->getAnnotatedRoute($classRouteData)))
+        ;
+        $this->reader
+            ->expects($this->once())
+            ->method('getMethodAnnotations')
+            ->will($this->returnValue(array($this->getAnnotatedRoute($methodRouteData))))
+        ;
+
+        $routeCollection = $this->loader->load('Symfony\Component\Routing\Tests\Fixtures\AnnotatedClasses\BazClass');
+        $route = $routeCollection->get($classRouteData['name']);
+
+        $this->assertNull($route, '->load ignores class route');
+
+        $route = $routeCollection->get($methodRouteData['name']);
+
+        $this->assertSame($classRouteData['path'].$methodRouteData['path'], $route->getPath(), '->load concatenates class and method route path');
+        $this->assertEquals(array_merge($classRouteData['schemes'], $methodRouteData['schemes']), $route->getSchemes(), '->load merges class and method route schemes');
+        $this->assertEquals(array_merge($classRouteData['methods'], $methodRouteData['methods']), $route->getMethods(), '->load merges class and method route methods');
+    }
+
     private function getAnnotatedRoute($data)
     {
         return new Route($data);
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AnnotationDirectoryLoaderTest.php
@@ -29,7 +29,7 @@ protected function setUp()
 
     public function testLoad()
     {
-        $this->reader->expects($this->exactly(2))->method('getClassAnnotation');
+        $this->reader->expects($this->exactly(4))->method('getClassAnnotation');
 
         $this->reader
             ->expects($this->any())

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,11 @@ public function load($class, $type = null)`
`127`	`127`	`}`
`128`	`128`	`}`
`129`	`129`
	`130`	`+ if (0 === $collection->count() && $class->hasMethod('__invoke') && $annot = $this->reader->getClassAnnotation($class, $this->routeAnnotationClass)) {`
	`131`	`+ $globals['path'] = '';`
	`132`	`+ $this->addRoute($collection, $annot, $globals, $class, $class->getMethod('__invoke'));`
	`133`	`+ }`
	`134`	`+`
`130`	`135`	`return $collection;`
`131`	`136`	`}`
`132`	`137`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ protected function setUp()`
`29`	`29`
`30`	`30`	`public function testLoad()`
`31`	`31`	`{`
`32`		`- $this->reader->expects($this->exactly(2))->method('getClassAnnotation');`
	`32`	`+ $this->reader->expects($this->exactly(4))->method('getClassAnnotation');`
`33`	`33`
`34`	`34`	`$this->reader`
`35`	`35`	`->expects($this->any())`