[DI] do not log an inlined service as removed

Tobion · Tobion · commit be0ea037897e · 2018-06-01T19:09:21.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -61,6 +61,7 @@ protected function processValue($value, $isRoot = false)
         }
 
         $this->container->log($this, sprintf('Inlined service "%s" to "%s".', $id, $this->currentId));
+        $definition->addTag('container.inlined');
 
         if ($definition->isShared()) {
             return $definition;
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php
@@ -73,7 +73,9 @@ public function process(ContainerBuilder $container)
             } elseif (0 === count($referencingAliases) && false === $isReferenced) {
                 $container->removeDefinition($id);
                 $container->resolveEnvPlaceholders(serialize($definition));
-                $container->log($this, sprintf('Removed service "%s"; reason: unused.', $id));
+                if (!$definition->hasTag('container.inlined')) {
+                    $container->log($this, sprintf('Removed service "%s"; reason: unused.', $id));
+                }
                 $hasChanged = true;
             }
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
@@ -157,11 +157,11 @@ public function testProcessNestedNonSharedServices()
 
         $this->process($container);
 
-        $baz1 = $container->getDefinition('foo')->getArgument(0)->getArgument(0);
-        $baz2 = $container->getDefinition('foo')->getArgument(1)->getArgument(0);
+        $baz1 = $container->getDefinition('foo')->getArgument(0)->getArgument(0)->clearTag('container.inlined');
+        $baz2 = $container->getDefinition('foo')->getArgument(1)->getArgument(0)->clearTag('container.inlined');
 
-        $this->assertEquals($container->getDefinition('baz'), $baz1);
-        $this->assertEquals($container->getDefinition('baz'), $baz2);
+        $this->assertEquals($container->getDefinition('baz')->clearTag('container.inlined'), $baz1);
+        $this->assertEquals($container->getDefinition('baz')->clearTag('container.inlined'), $baz2);
         $this->assertNotSame($baz1, $baz2);
     }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/anonymous.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/anonymous.expected.yml
@@ -16,4 +16,4 @@ services:
     decorated:
         class: Symfony\Component\DependencyInjection\Tests\Fixtures\StdClassDecorator
         public: true
-        arguments: [!service { class: stdClass, public: false }]
+        arguments: [!service { class: stdClass, public: false, tags: [{ name: container.inlined }] }]
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.expected.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/child.expected.yml
@@ -9,7 +9,7 @@ services:
         public: true
         file: file.php
         lazy: true
-        arguments: [!service { class: Class1, public: false }]
+        arguments: [!service { class: Class1, public: false, tags: [{ name: container.inlined }] }]
     bar:
         alias: foo
         public: true
diff --git a/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php b/src/Symfony/Component/Form/Tests/DependencyInjection/FormPassTest.php
@@ -62,7 +62,7 @@ public function testAddTaggedTypes()
                 __CLASS__.'_Type1' => new ServiceClosureArgument(new Reference('my.type1')),
                 __CLASS__.'_Type2' => new ServiceClosureArgument(new Reference('my.type2')),
             ))))->addTag('container.service_locator')->setPublic(false),
-            $extDefinition->getArgument(0)
+            $extDefinition->getArgument(0)->clearTag('container.inlined')
         );
     }
 

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ protected function processValue($value, $isRoot = false)`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`$this->container->log($this, sprintf('Inlined service "%s" to "%s".', $id, $this->currentId));`
	`64`	`+ $definition->addTag('container.inlined');`
`64`	`65`
`65`	`66`	`if ($definition->isShared()) {`
`66`	`67`	`return $definition;`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,9 @@ public function process(ContainerBuilder $container)`
`73`	`73`	`} elseif (0 === count($referencingAliases) && false === $isReferenced) {`
`74`	`74`	`$container->removeDefinition($id);`
`75`	`75`	`$container->resolveEnvPlaceholders(serialize($definition));`
`76`		`- $container->log($this, sprintf('Removed service "%s"; reason: unused.', $id));`
	`76`	`+ if (!$definition->hasTag('container.inlined')) {`
	`77`	`+ $container->log($this, sprintf('Removed service "%s"; reason: unused.', $id));`
	`78`	`+ }`
`77`	`79`	`$hasChanged = true;`
`78`	`80`	`}`
`79`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function testAddTaggedTypes()`
`62`	`62`	`__CLASS__.'_Type1' => new ServiceClosureArgument(new Reference('my.type1')),`
`63`	`63`	`__CLASS__.'_Type2' => new ServiceClosureArgument(new Reference('my.type2')),`
`64`	`64`	`))))->addTag('container.service_locator')->setPublic(false),`
`65`		`- $extDefinition->getArgument(0)`
	`65`	`+ $extDefinition->getArgument(0)->clearTag('container.inlined')`
`66`	`66`	`);`
`67`	`67`	`}`
`68`	`68`