diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[DI] Skip unknown method calls for factories in check types pass

Browse Source
This commit is contained in:
Thomas Calvet 2019-11-24 00:18:37 +01:00 committed by Nicolas Grekas
parent a8a9e69488
commit 592bff88f2
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/TestBundle.php
View File

@ -49,6 +49,6 @@ class TestBundle extends Bundle
} }
}); });
$container->addCompilerPass(new CheckTypeDeclarationsPass(true, ['http_client', '.debug.http_client']), PassConfig::TYPE_AFTER_REMOVING, -100); $container->addCompilerPass(new CheckTypeDeclarationsPass(true), PassConfig::TYPE_AFTER_REMOVING, -100);
} }
} }

2
src/Symfony/Bundle/FrameworkBundle/composer.json
View File

@ -20,7 +20,7 @@
"ext-xml": "*", "ext-xml": "*",
"symfony/cache": "^4.4|^5.0", "symfony/cache": "^4.4|^5.0",
"symfony/config": "^4.3.4|^5.0", "symfony/config": "^4.3.4|^5.0",
"symfony/dependency-injection": "^4.4|^5.0", "symfony/dependency-injection": "^4.4.1|^5.0.1",
"symfony/http-foundation": "^4.4|^5.0", "symfony/http-foundation": "^4.4|^5.0",
"symfony/http-kernel": "^4.4", "symfony/http-kernel": "^4.4",
"symfony/polyfill-mbstring": "~1.0", "symfony/polyfill-mbstring": "~1.0",

17
src/Symfony/Component/DependencyInjection/Compiler/CheckTypeDeclarationsPass.php
View File

@ -16,6 +16,7 @@ use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\DependencyInjection\Definition; use Symfony\Component\DependencyInjection\Definition;
use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException; use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
use Symfony\Component\DependencyInjection\Exception\InvalidParameterTypeException; use Symfony\Component\DependencyInjection\Exception\InvalidParameterTypeException;
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
use Symfony\Component\DependencyInjection\Parameter; use Symfony\Component\DependencyInjection\Parameter;
use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\DependencyInjection\Reference;
use Symfony\Component\DependencyInjection\ServiceLocator; use Symfony\Component\DependencyInjection\ServiceLocator;
@ -37,16 +38,14 @@ final class CheckTypeDeclarationsPass extends AbstractRecursivePass
private const SCALAR_TYPES = ['int', 'float', 'bool', 'string']; private const SCALAR_TYPES = ['int', 'float', 'bool', 'string'];
private $autoload; private $autoload;
private $ignoredServices;
/** /**
* @param bool $autoload Whether services who's class in not loaded should be checked or not. * @param bool $autoload Whether services who's class in not loaded should be checked or not.
* Defaults to false to save loading code during compilation. * Defaults to false to save loading code during compilation.
*/ */
public function __construct(bool $autoload = false, array $ignoredServices = []) public function __construct(bool $autoload = false)
{ {
$this->autoload = $autoload; $this->autoload = $autoload;
$this->ignoredServices = array_flip($ignoredServices);
} }
/** /**
@ -54,7 +53,7 @@ final class CheckTypeDeclarationsPass extends AbstractRecursivePass
*/ */
protected function processValue($value, $isRoot = false) protected function processValue($value, $isRoot = false)
{ {
if (!$value instanceof Definition || isset($this->ignoredServices[$this->currentId])) { if (!$value instanceof Definition || $value->hasErrors()) {
return parent::processValue($value, $isRoot); return parent::processValue($value, $isRoot);
} }
@ -71,7 +70,15 @@ final class CheckTypeDeclarationsPass extends AbstractRecursivePass
} }
foreach ($value->getMethodCalls() as $methodCall) { foreach ($value->getMethodCalls() as $methodCall) {
$reflectionMethod = $this->getReflectionMethod($value, $methodCall[0]); try {
$reflectionMethod = $this->getReflectionMethod($value, $methodCall[0]);
} catch (RuntimeException $e) {
if ($value->getFactory()) {
continue;
}
throw $e;
}
$this->checkTypeDeclarations($value, $reflectionMethod, $methodCall[1]); $this->checkTypeDeclarations($value, $reflectionMethod, $methodCall[1]);
} }