diff --git a/Routing/FilteredRouteCollectionBuilder.php b/Routing/FilteredRouteCollectionBuilder.php index 7e989ee..5a166c1 100644 --- a/Routing/FilteredRouteCollectionBuilder.php +++ b/Routing/FilteredRouteCollectionBuilder.php @@ -120,19 +120,24 @@ final class FilteredRouteCollectionBuilder return true; } - $method = $this->controllerReflector->getReflectionMethod( - $route->getDefault('_controller') ?? '' - ); - if (null === $method) { + $classAndMethod = $this->controllerReflector->getReflectionClassAndMethod($route->getDefault('_controller')); + + if (null === $classAndMethod) { return false; } + list($class, $method) = $classAndMethod; + /** @var Areas|null $areas */ $areas = $this->annotationReader->getMethodAnnotation( $method, Areas::class ); + if (null === $areas) { + $areas = $this->annotationReader->getClassAnnotation($class, Areas::class); + } + return (null !== $areas) ? $areas->has($this->area) : false; } } diff --git a/Tests/Routing/FilteredRouteCollectionBuilderTest.php b/Tests/Routing/FilteredRouteCollectionBuilderTest.php index 028c646..3f9b084 100644 --- a/Tests/Routing/FilteredRouteCollectionBuilderTest.php +++ b/Tests/Routing/FilteredRouteCollectionBuilderTest.php @@ -177,9 +177,10 @@ class FilteredRouteCollectionBuilderTest extends TestCase $routes->add($name, $route); $area = 'area'; + $reflectionClassStub = $this->createMock(\ReflectionClass::class); $reflectionMethodStub = $this->createMock(\ReflectionMethod::class); $controllerReflectorStub = $this->createMock(ControllerReflector::class); - $controllerReflectorStub->method('getReflectionMethod')->willReturn($reflectionMethodStub); + $controllerReflectorStub->method('getReflectionClassAndMethod')->willReturn([$reflectionClassStub, $reflectionMethodStub]); $annotationReader = $this->createMock(Reader::class); $annotationReader