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

Merge pull request #695 from ogizanagi/fix_callable_controllers

Browse Source 
Fix ApiDocExtractor to accept callable classes as controllers
This commit is contained in:
William Durand 2015-08-13 09:46:00 +02:00
commit 874c8752e6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Extractor/ApiDocExtractor.php
View File

@ -211,14 +211,20 @@ class ApiDocExtractor
if (preg_match('#(.+)::([\w]+)#', $controller, $matches)) { if (preg_match('#(.+)::([\w]+)#', $controller, $matches)) {
$class = $matches[1]; $class = $matches[1];
$method = $matches[2]; $method = $matches[2];
} elseif (preg_match('#(.+):([\w]+)#', $controller, $matches)) { } else {
if (preg_match('#(.+):([\w]+)#', $controller, $matches)) {
$controller = $matches[1]; $controller = $matches[1];
$method = $matches[2]; $method = $matches[2];
}
if ($this->container->has($controller)) { if ($this->container->has($controller)) {
$this->container->enterScope('request'); $this->container->enterScope('request');
$this->container->set('request', new Request(), 'request'); $this->container->set('request', new Request(), 'request');
$class = ClassUtils::getRealClass(get_class($this->container->get($controller))); $class = ClassUtils::getRealClass(get_class($this->container->get($controller)));
$this->container->leaveScope('request'); $this->container->leaveScope('request');
if (!isset($method) && method_exists($class, '__invoke')) {
$method = '__invoke';
}
} }
} }