[DI] never inline lazy services

nicolas-grekas · nicolas-grekas · commit bfa3c8523e06 · 2018-05-24T16:05:16.000+02:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -116,6 +116,10 @@ private function inlineArguments(ContainerBuilder $container, array $arguments)
      */
     private function isInlineableDefinition(ContainerBuilder $container, $id, Definition $definition)
     {
+        if ($definition->isLazy()) {
+            return false;
+        }
+
         if (ContainerInterface::SCOPE_PROTOTYPE === $definition->getScope()) {
             return true;
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\DependencyInjection\Tests\Dumper;
 
-use DummyProxyDumper;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Dumper\PhpDumper;
@@ -270,6 +269,19 @@ public function testInlinedDefinitionReferencingServiceContainer()
         $this->assertStringEqualsFile(self::$fixturesPath.'/php/services13.php', $dumper->dump(), '->dump() dumps inline definitions which reference service_container');
     }
 
+    public function testNonSharedLazyDefinitionReferences()
+    {
+        $container = new ContainerBuilder();
+        $container->register('foo', 'stdClass')->setScope(ContainerBuilder::SCOPE_PROTOTYPE)->setLazy(true);
+        $container->register('bar', 'stdClass')->addArgument(new Reference('foo', ContainerBuilder::EXCEPTION_ON_INVALID_REFERENCE, false));
+        $container->compile();
+
+        $dumper = new PhpDumper($container);
+        $dumper->setProxyDumper(new \DummyProxyDumper());
+
+        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services_non_shared_lazy.php', $dumper->dump());
+    }
+
     public function testInitializePropertiesBeforeMethodCalls()
     {
         require_once self::$fixturesPath.'/includes/classes.php';
@@ -335,7 +347,7 @@ public function testCircularReferenceAllowanceForInlinedDefinitionsForLazyServic
 
         $dumper = new PhpDumper($container);
 
-        $dumper->setProxyDumper(new DummyProxyDumper());
+        $dumper->setProxyDumper(new \DummyProxyDumper());
         $dumper->dump();
 
         $this->addToAssertionCount(1);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
@@ -84,16 +84,16 @@ class DummyProxyDumper implements ProxyDumper
 {
     public function isProxyCandidate(Definition $definition)
     {
-        return false;
+        return $definition->isLazy();
     }
 
     public function getProxyFactoryCode(Definition $definition, $id)
     {
-        return '';
+        return "        // lazy factory\n\n";
     }
 
     public function getProxyCode(Definition $definition)
     {
-        return '';
+        return "// proxy code\n";
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services_non_shared_lazy.php
@@ -0,0 +1,74 @@
+<?php
+
+use Symfony\Component\DependencyInjection\ContainerInterface;
+use Symfony\Component\DependencyInjection\Container;
+use Symfony\Component\DependencyInjection\Exception\InactiveScopeException;
+use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
+use Symfony\Component\DependencyInjection\Exception\LogicException;
+use Symfony\Component\DependencyInjection\Exception\RuntimeException;
+use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
+
+/**
+ * This class has been auto-generated
+ * by the Symfony Dependency Injection Component.
+ */
+class ProjectServiceContainer extends Container
+{
+    private $parameters;
+    private $targetDirs = array();
+
+    public function __construct()
+    {
+        $this->services =
+        $this->scopedServices =
+        $this->scopeStacks = array();
+        $this->scopes = array();
+        $this->scopeChildren = array();
+        $this->methodMap = array(
+            'bar' => 'getBarService',
+            'foo' => 'getFooService',
+        );
+
+        $this->aliases = array();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function compile()
+    {
+        throw new LogicException('You cannot compile a dumped frozen container.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isFrozen()
+    {
+        return true;
+    }
+
+    /**
+     * Gets the public 'bar' shared service.
+     *
+     * @return \stdClass
+     */
+    protected function getBarService()
+    {
+        return $this->services['bar'] = new \stdClass($this->get('foo'));
+    }
+
+    /**
+     * Gets the public 'foo' service.
+     *
+     * @return \stdClass
+     */
+    public function getFooService($lazyLoad = true)
+    {
+        // lazy factory
+
+        return new \stdClass();
+    }
+}
+
+// proxy code

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,10 @@ private function inlineArguments(ContainerBuilder $container, array $arguments)`
`116`	`116`	`*/`
`117`	`117`	`private function isInlineableDefinition(ContainerBuilder $container, $id, Definition $definition)`
`118`	`118`	`{`
	`119`	`+ if ($definition->isLazy()) {`
	`120`	`+ return false;`
	`121`	`+ }`
	`122`	`+`
`119`	`123`	`if (ContainerInterface::SCOPE_PROTOTYPE === $definition->getScope()) {`
`120`	`124`	`return true;`
`121`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,16 +84,16 @@ class DummyProxyDumper implements ProxyDumper`
`84`	`84`	`{`
`85`	`85`	`public function isProxyCandidate(Definition $definition)`
`86`	`86`	`{`
`87`		`- return false;`
	`87`	`+ return $definition->isLazy();`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`public function getProxyFactoryCode(Definition $definition, $id)`
`91`	`91`	`{`
`92`		`- return '';`
	`92`	`+ return " // lazy factory\n\n";`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`public function getProxyCode(Definition $definition)`
`96`	`96`	`{`
`97`		`- return '';`
	`97`	`+ return "// proxy code\n";`
`98`	`98`	`}`
`99`	`99`	`}`