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

[DependencyInjection] Always autowire the constructor

Browse Source
This commit is contained in:
Kévin Dunglas 2017-01-16 16:14:49 +01:00
parent 839920828e
commit be3d11faa9
No known key found for this signature in database
GPG Key ID: 4D04EBEF06AAF3A6
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
View File

@ -120,14 +120,22 @@ class AutowirePass implements CompilerPassInterface
*
* @param string $id
* @param \ReflectionClass $reflectionClass
* @param string[] $autowiredMethods
* @param string[] $configuredAutowiredMethods
*
* @return \ReflectionMethod[]
*/
private function getMethodsToAutowire($id, \ReflectionClass $reflectionClass, array $autowiredMethods)
private function getMethodsToAutowire($id, \ReflectionClass $reflectionClass, array $configuredAutowiredMethods)
{
$found = array();
$regexList = array();
// Always try to autowire the constructor
if (in_array('__construct', $configuredAutowiredMethods, true)) {
$autowiredMethods = $configuredAutowiredMethods;
} else {
$autowiredMethods = array_merge(array('__construct'), $configuredAutowiredMethods);
}
foreach ($autowiredMethods as $pattern) {
$regexList[] = '/^'.str_replace('\*', '.*', preg_quote($pattern, '/')).'$/i';
}
@ -147,7 +155,7 @@ class AutowirePass implements CompilerPassInterface
}
}
if ($notFound = array_diff($autowiredMethods, $found)) {
if ($notFound = array_diff($configuredAutowiredMethods, $found)) {
$compiler = $this->container->getCompiler();
$compiler->addLogMessage($compiler->getLoggingFormatter()->formatUnusedAutowiringPatterns($this, $id, $notFound));
}

4
src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
View File

@ -440,7 +440,7 @@ class AutowirePassTest extends \PHPUnit_Framework_TestCase
// manually configure *one* call, to override autowiring
$container
->register('setter_injection', SetterInjection::class)
->setAutowiredMethods(array('__construct', 'set*'))
->setAutowiredMethods(array('set*'))
->addMethodCall('setWithCallsConfigured', array('manual_arg1', 'manual_arg2'))
;
@ -557,7 +557,7 @@ class AutowirePassTest extends \PHPUnit_Framework_TestCase
$container->register('c1', CollisionA::class);
$container->register('c2', CollisionB::class);
$aDefinition = $container->register('setter_injection_collision', SetterInjectionCollision::class);
$aDefinition->setAutowiredMethods(array('__construct', 'set*'));
$aDefinition->setAutowiredMethods(array('set*'));
$pass = new AutowirePass();
$pass->process($container);