Merge branch '3.4' into 4.1

nicolas-grekas · nicolas-grekas · commit a31b5d0ee38d · 2018-08-08T13:48:00.000+02:00
* 3.4:
  [DI] fix analyzing lazy refs involved in circular loops
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php b/src/Symfony/Component/DependencyInjection/Compiler/AnalyzeServiceReferencesPass.php
@@ -34,15 +34,17 @@ class AnalyzeServiceReferencesPass extends AbstractRecursivePass implements Repe
     private $graph;
     private $currentDefinition;
     private $onlyConstructorArguments;
+    private $hasProxyDumper;
     private $lazy;
     private $expressionLanguage;
 
     /**
      * @param bool $onlyConstructorArguments Sets this Service Reference pass to ignore method calls
      */
-    public function __construct(bool $onlyConstructorArguments = false)
+    public function __construct(bool $onlyConstructorArguments = false, bool $hasProxyDumper = true)
     {
         $this->onlyConstructorArguments = $onlyConstructorArguments;
+        $this->hasProxyDumper = $hasProxyDumper;
     }
 
     /**
@@ -97,7 +99,7 @@ protected function processValue($value, $isRoot = false)
                 $targetId,
                 $targetDefinition,
                 $value,
-                $this->lazy || ($targetDefinition && $targetDefinition->isLazy()),
+                $this->lazy || ($this->hasProxyDumper && $targetDefinition && $targetDefinition->isLazy()),
                 ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE === $value->getInvalidBehavior()
             );
 
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -15,6 +15,7 @@
 use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
 use Symfony\Component\DependencyInjection\Argument\ServiceClosureArgument;
 use Symfony\Component\DependencyInjection\Compiler\AnalyzeServiceReferencesPass;
+use Symfony\Component\DependencyInjection\Compiler\CheckCircularReferencesPass;
 use Symfony\Component\DependencyInjection\Container;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -140,29 +141,19 @@ public function dump(array $options = array())
         $this->initializeMethodNamesMap('Container' === $baseClass ? Container::class : $baseClass);
 
         if ($this->getProxyDumper() instanceof NullDumper) {
-            (new AnalyzeServiceReferencesPass(true))->process($this->container);
-            $this->circularReferences = array();
-            $checkedNodes = array();
-            foreach ($this->container->getCompiler()->getServiceReferenceGraph()->getNodes() as $id => $node) {
-                $currentPath = array($id => $id);
-                $this->analyzeCircularReferences($node->getOutEdges(), $checkedNodes, $currentPath);
-            }
-            foreach ($this->circularReferences as $parent => $ids) {
-                $path = array($parent);
-                while (!isset($ids[$parent])) {
-                    foreach ($ids as $id) {
-                        $path[] = $id;
-                        $ids = $this->circularReferences[$id];
-                        break;
-                    }
-                }
-                $path[] = $parent.'". Try running "composer require symfony/proxy-manager-bridge';
+            (new AnalyzeServiceReferencesPass(true, false))->process($this->container);
+            try {
+                (new CheckCircularReferencesPass())->process($this->container);
+            } catch (ServiceCircularReferenceException $e) {
+                $path = $e->getPath();
+                end($path);
+                $path[key($path)] .= '". Try running "composer require symfony/proxy-manager-bridge';
 
-                throw new ServiceCircularReferenceException($parent, $path);
+                throw new ServiceCircularReferenceException($e->getServiceId(), $path);
             }
         }
 
-        (new AnalyzeServiceReferencesPass())->process($this->container);
+        (new AnalyzeServiceReferencesPass(false, !$this->getProxyDumper() instanceof NullDumper))->process($this->container);
         $this->circularReferences = array();
         $checkedNodes = array();
         foreach ($this->container->getCompiler()->getServiceReferenceGraph()->getNodes() as $id => $node) {
@@ -369,7 +360,7 @@ private function analyzeCircularReferences(array $edges, &$checkedNodes, &$curre
             $node = $edge->getDestNode();
             $id = $node->getId();
 
-            if ($node->getValue() && (($edge->isLazy() && !$this->getProxyDumper() instanceof NullDumper) || $edge->isWeak())) {
+            if ($node->getValue() && ($edge->isLazy() || $edge->isWeak())) {
                 // no-op
             } elseif (isset($currentPath[$id])) {
                 foreach (array_reverse($currentPath) as $parentId) {
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php b/src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php
@@ -578,7 +578,7 @@ public function testCircularReferenceAllowanceForLazyServices()
 
         $dumper = new PhpDumper($container);
 
-        $message = 'Circular reference detected for service "bar", path: "bar -> foo -> bar". Try running "composer require symfony/proxy-manager-bridge".';
+        $message = 'Circular reference detected for service "foo", path: "foo -> bar -> foo". Try running "composer require symfony/proxy-manager-bridge".';
         if (method_exists($this, 'expectException')) {
             $this->expectException(ServiceCircularReferenceException::class);
             $this->expectExceptionMessage($message);
