RetailCRM-Mirror/NelmioApiDocBundle
1
0
Fork 0
mirror of https://github.com/retailcrm/NelmioApiDocBundle.git synced 2025-02-10 03:29:25 +03:00
Code Issues Projects Releases Wiki Activity

allow areas annotation for controller class (#1528)

Browse Source 
Co-authored-by: pchol <spchols@gmail.com>
Co-authored-by: Guilhem Niot <guilhem@gniot.fr>
This commit is contained in:
Dmitry Pchelintsev 2021-03-03 22:47:08 +03:00 committed by GitHub
parent 883d7b6c89
commit 8f646b8484
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Routing/FilteredRouteCollectionBuilder.php
View File

@ -120,19 +120,24 @@ final class FilteredRouteCollectionBuilder
return true; return true;
} }
$method = $this->controllerReflector->getReflectionMethod( $classAndMethod = $this->controllerReflector->getReflectionClassAndMethod($route->getDefault('_controller'));
$route->getDefault('_controller') ?? ''
); if (null === $classAndMethod) {
if (null === $method) {
return false; return false;
} }
list($class, $method) = $classAndMethod;
/** @var Areas|null $areas */ /** @var Areas|null $areas */
$areas = $this->annotationReader->getMethodAnnotation( $areas = $this->annotationReader->getMethodAnnotation(
$method, $method,
Areas::class Areas::class
); );
if (null === $areas) {
$areas = $this->annotationReader->getClassAnnotation($class, Areas::class);
}
return (null !== $areas) ? $areas->has($this->area) : false; return (null !== $areas) ? $areas->has($this->area) : false;
} }
} }

3
Tests/Routing/FilteredRouteCollectionBuilderTest.php
View File

@ -177,9 +177,10 @@ class FilteredRouteCollectionBuilderTest extends TestCase
$routes->add($name, $route); $routes->add($name, $route);
$area = 'area'; $area = 'area';
$reflectionClassStub = $this->createMock(\ReflectionClass::class);
$reflectionMethodStub = $this->createMock(\ReflectionMethod::class); $reflectionMethodStub = $this->createMock(\ReflectionMethod::class);
$controllerReflectorStub = $this->createMock(ControllerReflector::class); $controllerReflectorStub = $this->createMock(ControllerReflector::class);
$controllerReflectorStub->method('getReflectionMethod')->willReturn($reflectionMethodStub); $controllerReflectorStub->method('getReflectionClassAndMethod')->willReturn([$reflectionClassStub, $reflectionMethodStub]);
$annotationReader = $this->createMock(Reader::class); $annotationReader = $this->createMock(Reader::class);
$annotationReader $annotationReader