[DI] Shared services should not be inlined in non-shared ones

nicolas-grekas · nicolas-grekas · commit 6f8b8625f45f · 2018-05-14T18:07:37.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -138,6 +138,6 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe
             return false;
         }
 
-        return true;
+        return $this->container->getDefinition($ids[0])->isShared();
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/InlineServiceDefinitionsPassTest.php
@@ -92,7 +92,7 @@ public function testProcessDoesInlineNonSharedService()
         $this->assertNotSame($container->getDefinition('bar'), $arguments[2]);
     }
 
-    public function testProcessInlinesMixedServicesLoop()
+    public function testProcessDoesNotInlineMixedServicesLoop()
     {
         $container = new ContainerBuilder();
         $container
@@ -108,7 +108,7 @@ public function testProcessInlinesMixedServicesLoop()
 
         $this->process($container);
 
-        $this->assertEquals($container->getDefinition('foo')->getArgument(0), $container->getDefinition('bar'));
+        $this->assertEquals(new Reference('bar'), $container->getDefinition('foo')->getArgument(0));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,6 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe`
`138`	`138`	`return false;`
`139`	`139`	`}`
`140`	`140`
`141`		`- return true;`
	`141`	`+ return $this->container->getDefinition($ids[0])->isShared();`
`142`	`142`	`}`
`143`	`143`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function testProcessDoesInlineNonSharedService()`
`92`	`92`	`$this->assertNotSame($container->getDefinition('bar'), $arguments[2]);`
`93`	`93`	`}`
`94`	`94`
`95`		`- public function testProcessInlinesMixedServicesLoop()`
	`95`	`+ public function testProcessDoesNotInlineMixedServicesLoop()`
`96`	`96`	`{`
`97`	`97`	`$container = new ContainerBuilder();`
`98`	`98`	`$container`
`@@ -108,7 +108,7 @@ public function testProcessInlinesMixedServicesLoop()`
`108`	`108`
`109`	`109`	`$this->process($container);`
`110`	`110`
`111`		`- $this->assertEquals($container->getDefinition('foo')->getArgument(0), $container->getDefinition('bar'));`
	`111`	`+ $this->assertEquals(new Reference('bar'), $container->getDefinition('foo')->getArgument(0));`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`/**`