[DI] Exclude inline services declared in XML from autowiring candidates

nicolas-grekas · nicolas-grekas · commit d90e7212ea35 · 2017-10-08T16:39:03.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -345,7 +345,7 @@ private function populateAvailableType($id, Definition $definition)
             unset($this->ambiguousServiceTypes[$type]);
         }
 
-        if ($definition->isDeprecated() || !$reflectionClass = $this->container->getReflectionClass($definition->getClass(), false)) {
+        if (preg_match('/^\d+_[^~]++~[._a-zA-Z\d]{7}$/', $id) || $definition->isDeprecated() || !$reflectionClass = $this->container->getReflectionClass($definition->getClass(), false)) {
             return;
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -412,7 +412,7 @@ private function processAnonymousServices(\DOMDocument $xml, $file, $defaults)
             foreach ($nodes as $node) {
                 if ($services = $this->getChildren($node, 'service')) {
                     // give it a unique name
-                    $id = sprintf('%d_%s', ++$count, preg_replace('/^.*\\\\/', '', $node->getAttribute('class')).$suffix);
+                    $id = sprintf('%d_%s', ++$count, preg_replace('/^.*\\\\/', '', $services[0]->getAttribute('class')).'~'.$suffix);
                     $node->setAttribute('id', $id);
                     $node->setAttribute('service', $id);
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/AutowirePassTest.php
@@ -12,11 +12,13 @@
 namespace Symfony\Component\DependencyInjection\Tests\Compiler;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\Compiler\AutowireRequiredMethodsPass;
 use Symfony\Component\DependencyInjection\Compiler\AutowirePass;
 use Symfony\Component\DependencyInjection\Compiler\ResolveClassPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\includes\FooVariadic;
 use Symfony\Component\DependencyInjection\TypedReference;
@@ -869,4 +871,16 @@ public function testExceptionWhenAliasDoesNotExist()
         $pass = new AutowirePass();
         $pass->process($container);
     }
+
+    public function testInlineServicesAreNotCandidates()
+    {
+        $container = new ContainerBuilder();
+        $loader = new XmlFileLoader($container, new FileLocator(realpath(__DIR__.'/../Fixtures/xml')));
+        $loader->load('services_inline_not_candidate.xml');
+
+        $pass = new AutowirePass();
+        $pass->process($container);
+
+        $this->assertSame(array(), $container->getDefinition('autowired')->getArguments());
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_inline_not_candidate.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_inline_not_candidate.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+  <services>
+    <service id="foo" class="stdClass">
+      <argument type="service">
+        <service class="Symfony\Component\DependencyInjection\Tests\Compiler\D"/>
+      </argument>
+    </service>
+    <service id="autowired" class="Symfony\Component\DependencyInjection\Tests\Compiler\E" autowire="true"/>
+  </services>
+</container>

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ private function populateAvailableType($id, Definition $definition)`
`345`	`345`	`unset($this->ambiguousServiceTypes[$type]);`
`346`	`346`	`}`
`347`	`347`
`348`		`- if ($definition->isDeprecated() \|\| !$reflectionClass = $this->container->getReflectionClass($definition->getClass(), false)) {`
	`348`	`+ if (preg_match('/^\d+_[^~]++~[._a-zA-Z\d]{7}$/', $id) \|\| $definition->isDeprecated() \|\| !$reflectionClass = $this->container->getReflectionClass($definition->getClass(), false)) {`
`349`	`349`	`return;`
`350`	`350`	`}`
`351`	`351`