Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2b64932

Browse files
weaverryanweaverryan
committed
Fixing a bug where services that were eventually removed could cause autowire errors
1 parent f562455 commit 2b64932

File tree

6 files changed

+191
-5
lines changed

6 files changed

+191
-5
lines changed

‎src/Symfony/Component/DependencyInjection/Compiler/AutowireExceptionPass.php

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\DependencyInjection\Compiler;
13+
14+
use Symfony\Component\DependencyInjection\ContainerBuilder;
15+
16+
/**
17+
* Throws autowire exceptions from AutowirePass for definitions that still exist.
18+
*
19+
* @author Ryan Weaver <[email protected]>
20+
*/
21+
class AutowireExceptionPass implements CompilerPassInterface
22+
{
23+
private $autowirePass;
24+
25+
public function __construct(AutowirePass $autowirePass)
26+
{
27+
$this->autowirePass = $autowirePass;
28+
}
29+
30+
public function process(ContainerBuilder $container)
31+
{
32+
foreach ($this->autowirePass->getAutowiringExceptions() as $exception) {
33+
if ($container->hasDefinition($exception->getServiceId())) {
34+
throw $exception;
35+
}
36+
}
37+
}
38+
}

‎src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php

Lines changed: 41 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
use Symfony\Component\DependencyInjection\Config\AutowireServiceResource;
1515
use Symfony\Component\DependencyInjection\ContainerBuilder;
1616
use Symfony\Component\DependencyInjection\Definition;
17+
use Symfony\Component\DependencyInjection\Exception\AutowiringFailedException;
1718
use Symfony\Component\DependencyInjection\Exception\RuntimeException;
1819
use Symfony\Component\DependencyInjection\LazyProxy\ProxyHelper;
1920
use Symfony\Component\DependencyInjection\TypedReference;
@@ -31,6 +32,24 @@ class AutowirePass extends AbstractRecursivePass
3132
private $ambiguousServiceTypes = array();
3233
private $autowired = array();
3334
private $lastFailure;
35+
private $throwOnAutowiringException;
36+
private $autowiringExceptions = array();
37+
38+
/**
39+
* @param bool $throwOnAutowireException If false, retrieved errors via getAutowiringExceptions
40+
*/
41+
public function __construct($throwOnAutowireException = true)
42+
{
43+
$this->throwOnAutowiringException = $throwOnAutowireException;
44+
}
45+
46+
/**
47+
* @return AutowiringFailedException[]
48+
*/
49+
public function getAutowiringExceptions()
50+
{
51+
return $this->autowiringExceptions;
52+
}
3453

3554
/**
3655
* {@inheritdoc}
@@ -75,6 +94,21 @@ public static function createResourceForClass(\ReflectionClass $reflectionClass)
7594
* {@inheritdoc}
7695
*/
7796
protected function processValue($value, $isRoot = false)
97+
{
98+
try {
99+
return $this->doProcessValue($value, $isRoot);
100+
} catch (AutowiringFailedException $e) {
101+
if ($this->throwOnAutowiringException) {
102+
throw $e;
103+
}
104+
105+
$this->autowiringExceptions[] = $e;
106+
107+
return parent::processValue($value, $isRoot);
108+
}
109+
}
110+
111+
private function doProcessValue($value, $isRoot = false)
78112
{
79113
if ($value instanceof TypedReference) {
80114
if ($ref = $this->getAutowiredReference($value)) {
@@ -190,7 +224,7 @@ private function autowireCalls(\ReflectionClass $reflectionClass, array $methodC
190224

191225
if (!$reflectionMethod->isPublic()) {
192226
$class = $reflectionClass->name;
193-
throw new RuntimeException(sprintf('Cannot autowire service "%s": method "%s()" must be public.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));
227+
throw new AutowiringFailedException($this->currentId, sprintf('Cannot autowire service "%s": method "%s()" must be public.', $this->currentId, $class !== $this->currentId ? $class.'::'.$method : $method));
194228
}
195229
$methodCalls[] = array($method, $this->autowireMethod($reflectionMethod, array()));
196230
}
@@ -231,7 +265,7 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
231265

232266
// no default value? Then fail
233267
if (!$parameter->isDefaultValueAvailable()) {
234-
throw new RuntimeException(sprintf('Cannot autowire service "%s": argument "$%s" of method "%s()" must have a type-hint or be given a value explicitly.', $this->currentId, $parameter->name, $class !== $this->currentId ? $class.'::'.$method : $method));
268+
throw new AutowiringFailedException($this->currentId, sprintf('Cannot autowire service "%s": argument "$%s" of method "%s()" must have a type-hint or be given a value explicitly.', $this->currentId, $parameter->name, $class !== $this->currentId ? $class.'::'.$method : $method));
235269
}
236270

237271
// specifically pass the default value
@@ -246,7 +280,7 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
246280
if ($parameter->isDefaultValueAvailable()) {
247281
$value = $parameter->getDefaultValue();
248282
} elseif (!$parameter->allowsNull()) {
249-
throw new RuntimeException($failureMessage);
283+
throw new AutowiringFailedException($this->currentId, $failureMessage);
250284
}
251285
$this->container->log($this, $failureMessage);
252286
}
@@ -407,15 +441,18 @@ private function createAutowiredDefinition($type)
407441
$argumentDefinition->setAutowired(true);
408442

409443
try {
444+
$originalThrowSetting = $this->throwOnAutowiringException;
445+
$this->throwOnAutowiringException = true;
410446
$this->processValue($argumentDefinition, true);
411447
$this->container->setDefinition($argumentId, $argumentDefinition);
412-
} catch (RuntimeException $e) {
448+
} catch (AutowiringFailedException $e) {
413449
$this->autowired[$type] = false;
414450
$this->lastFailure = $e->getMessage();
415451
$this->container->log($this, $this->lastFailure);
416452

417453
return;
418454
} finally {
455+
$this->throwOnAutowiringException = $originalThrowSetting;
419456
$this->currentId = $currentId;
420457
}
421458

‎src/Symfony/Component/DependencyInjection/Compiler/PassConfig.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public function __construct()
5757
new CheckDefinitionValidityPass(),
5858
new RegisterServiceSubscribersPass(),
5959
new ResolveNamedArgumentsPass(),
60-
new AutowirePass(),
60+
$autowirePass = new AutowirePass(false),
6161
new ResolveServiceSubscribersPass(),
6262
new ResolveReferencesToAliasesPass(),
6363
new ResolveInvalidReferencesPass(),
@@ -77,6 +77,7 @@ public function __construct()
7777
new AnalyzeServiceReferencesPass(),
7878
new RemoveUnusedDefinitionsPass(),
7979
)),
80+
new AutowireExceptionPass($autowirePass),
8081
new CheckExceptionOnInvalidReferenceBehaviorPass(),
8182
));
8283
}

‎src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\DependencyInjection\Exception;
13+
14+
/**
15+
* Thrown when a definition cannot be autowired.
16+
*/
17+
class AutowiringFailedException extends RuntimeException
18+
{
19+
private $serviceId;
20+
21+
public function __construct($serviceId, $message = '', $code = 0, Exception $previous = null)
22+
{
23+
$this->serviceId = $serviceId;
24+
25+
parent::__construct($message, $code, $previous);
26+
}
27+
28+
public function getServiceId()
29+
{
30+
return $this->serviceId;
31+
}
32+
}

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowireExceptionPassTest.php

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\DependencyInjection\Tests\Compiler;
13+
14+
use PHPUnit\Framework\TestCase;
15+
use Symfony\Component\DependencyInjection\Compiler\AutowireExceptionPass;
16+
use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
17+
use Symfony\Component\DependencyInjection\ContainerBuilder;
18+
use Symfony\Component\DependencyInjection\Exception\AutowiringFailedException;
19+
20+
class AutowireExceptionPassTest extends TestCase
21+
{
22+
public function testThrowsException()
23+
{
24+
$autowirePass = $this->getMockBuilder(AutowirePass::class)
25+
->getMock();
26+
27+
$autowireException = new AutowiringFailedException('foo_service_id', 'An autowiring exception message');
28+
$autowirePass->expects($this->any())
29+
->method('getAutowiringExceptions')
30+
->will($this->returnValue(array($autowireException)));
31+
32+
$container = new ContainerBuilder();
33+
$container->register('foo_service_id');
34+
35+
$pass = new AutowireExceptionPass($autowirePass);
36+
37+
try {
38+
$pass->process($container);
39+
$this->fail('->process() should throw the exception if the service id exists');
40+
} catch (\Exception $e) {
41+
$this->assertSame($autowireException, $e);
42+
}
43+
}
44+
45+
public function testNoExceptionIfServiceRemoved()
46+
{
47+
$autowirePass = $this->getMockBuilder(AutowirePass::class)
48+
->getMock();
49+
50+
$autowireException = new AutowiringFailedException('non_existent_service');
51+
$autowirePass->expects($this->any())
52+
->method('getAutowiringExceptions')
53+
->will($this->returnValue(array($autowireException)));
54+
55+
$container = new ContainerBuilder();
56+
57+
$pass = new AutowireExceptionPass($autowirePass);
58+
59+
$pass->process($container);
60+
// mark the test as passed
61+
$this->assertTrue(true);
62+
}
63+
}

‎src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,21 @@ public function testCompleteExistingDefinitionWithNotDefinedArguments()
135135
$this->assertEquals(DInterface::class, (string) $container->getDefinition('h')->getArgument(1));
136136
}
137137

138+
public function testExceptionsAreStored()
139+
{
140+
$container = new ContainerBuilder();
141+
142+
$container->register('c1', __NAMESPACE__.'\CollisionA');
143+
$container->register('c2', __NAMESPACE__.'\CollisionB');
144+
$container->register('c3', __NAMESPACE__.'\CollisionB');
145+
$aDefinition = $container->register('a', __NAMESPACE__.'\CannotBeAutowired');
146+
$aDefinition->setAutowired(true);
147+
148+
$pass = new AutowirePass(false);
149+
$pass->process($container);
150+
$this->assertCount(1, $pass->getAutowiringExceptions());
151+
}
152+
138153
/**
139154
* @expectedException \Symfony\Component\DependencyInjection\Exception\RuntimeException
140155
* @expectedExceptionMessage Cannot autowire service "a": argument "$collision" of method "Symfony\Component\DependencyInjection\Tests\Compiler\CannotBeAutowired::__construct()" references interface "Symfony\Component\DependencyInjection\Tests\Compiler\CollisionInterface" but no such service exists. You should maybe alias this interface to one of these existing services: "c1", "c2", "c3".

0 commit comments

Comments
 (0)