Merge branch '4.1' into 4.2

* 4.1:
  [DI] fix combinatorial explosion when analyzing the service graph
  [Debug] workaround opcache bug mutating "$this" !?!

Author: nicolas-grekas

Compiler/InlineServiceDefinitionsPass.php

@@ -191,7 +191,9 @@ private function isInlineableDefinition($id, Definition $definition)
 
         $srcIds = array();
         $srcCount = 0;
+        $isReferencedByConstructor = false;
         foreach ($this->graph->getNode($id)->getInEdges() as $edge) {
+            $isReferencedByConstructor = $isReferencedByConstructor || $edge->isReferencedByConstructor();
             $srcId = $edge->getSourceNode()->getId();
             $this->connectedIds[$srcId] = true;
             if ($edge->isWeak()) {
@@ -211,6 +213,10 @@ private function isInlineableDefinition($id, Definition $definition)
             return false;
         }
 
+        if ($isReferencedByConstructor && $this->container->getDefinition($srcId)->isLazy() && ($definition->getProperties() || $definition->getMethodCalls() || $definition->getConfigurator())) {
+            return false;
+        }
+
         return $this->container->getDefinition($srcId)->isShared();
     }
 }

Dumper/PhpDumper.php

@@ -171,21 +171,22 @@ public function dump(array $options = array())
         }
 
         (new AnalyzeServiceReferencesPass(false, !$this->getProxyDumper() instanceof NullDumper))->process($this->container);
+        $checkedNodes = array();
         $this->circularReferences = array();
         $this->singleUsePrivateIds = array();
-        foreach (array(true, false) as $byConstructor) {
-            foreach ($this->container->getCompiler()->getServiceReferenceGraph()->getNodes() as $id => $node) {
-                if (!$node->getValue() instanceof Definition) {
-                    continue;
-                }
-                $currentPath = array($id => $id);
-                $this->analyzeCircularReferences($node->getOutEdges(), $currentPath, $id, $byConstructor);
-                if ($this->isSingleUsePrivateNode($node)) {
-                    $this->singleUsePrivateIds[$id] = $id;
-                }
+        foreach ($this->container->getCompiler()->getServiceReferenceGraph()->getNodes() as $id => $node) {
+            if (!$node->getValue() instanceof Definition) {
+                continue;
+            }
+            if (!isset($checkedNodes[$id])) {
+                $this->analyzeCircularReferences($id, $node->getOutEdges(), $checkedNodes);
+            }
+            if ($this->isSingleUsePrivateNode($node)) {
+                $this->singleUsePrivateIds[$id] = $id;
             }
         }
         $this->container->getCompiler()->getServiceReferenceGraph()->clear();
+        $checkedNodes = array();
 
         $this->docStar = $options['debug'] ? '*' : '';
 
@@ -337,12 +338,12 @@ private function getProxyDumper(): ProxyDumper
         return $this->proxyDumper;
     }
 
-    private function analyzeCircularReferences(array $edges, &$currentPath, $sourceId, $byConstructor)
+    private function analyzeCircularReferences($sourceId, array $edges, &$checkedNodes, &$currentPath = array())
     {
+        $checkedNodes[$sourceId] = true;
+        $currentPath[$sourceId] = $sourceId;
+
         foreach ($edges as $edge) {
-            if ($byConstructor && !$edge->isReferencedByConstructor()) {
-                continue;
-            }
             $node = $edge->getDestNode();
             $id = $node->getId();
 
@@ -351,20 +352,42 @@ private function analyzeCircularReferences(array $edges, &$currentPath, $sourceI
             } elseif (isset($currentPath[$id])) {
                 $currentId = $id;
                 foreach (array_reverse($currentPath) as $parentId) {
-                    if (!isset($this->circularReferences[$parentId][$currentId])) {
-                        $this->circularReferences[$parentId][$currentId] = $byConstructor;
+                    $this->circularReferences[$parentId][$currentId] = $currentId;
+                    if ($parentId === $id) {
+                        break;
                     }
+                    $currentId = $parentId;
+                }
+            } elseif (!isset($checkedNodes[$id])) {
+                $this->analyzeCircularReferences($id, $node->getOutEdges(), $checkedNodes, $currentPath);
+            } elseif (isset($this->circularReferences[$id])) {
+                $this->connectCircularReferences($id, $currentPath);
+            }
+        }
+        unset($currentPath[$sourceId]);
+    }
+
+    private function connectCircularReferences($sourceId, &$currentPath, &$subPath = array())
+    {
+        $subPath[$sourceId] = $sourceId;
+        $currentPath[$sourceId] = $sourceId;
+
+        foreach ($this->circularReferences[$sourceId] as $id) {
+            if (isset($currentPath[$id])) {
+                $currentId = $id;
+                foreach (array_reverse($currentPath) as $parentId) {
+                    $this->circularReferences[$parentId][$currentId] = $currentId;
                     if ($parentId === $id) {
                         break;
                     }
                     $currentId = $parentId;
                 }
-            } else {
-                $currentPath[$id] = $id;
-                $this->analyzeCircularReferences($node->getOutEdges(), $currentPath, $id, $byConstructor);
-                unset($currentPath[$id]);
+            } elseif (!isset($subPath[$id]) && isset($this->circularReferences[$id])) {
+                $this->connectCircularReferences($id, $currentPath, $subPath);
             }
         }
+        unset($currentPath[$sourceId]);
+        unset($subPath[$sourceId]);
     }
 
     private function collectLineage($class, array &$lineage)
@@ -572,8 +595,11 @@ private function addServiceConfigurator(Definition $definition, string $variable
 
         if (\is_array($callable)) {
             if ($callable[0] instanceof Reference
-                || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))) {
-                return sprintf("        %s->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
+                || ($callable[0] instanceof Definition && $this->definitionVariables->contains($callable[0]))
+            ) {
+                $callable[0] = $this->dumpValue($callable[0]);
+
+                return sprintf('        '.('$' === $callable[0][0] ? '%s' : '(%s)')."->%s(\$%s);\n", $callable[0], $callable[1], $variableName);
             }
 
             $class = $this->dumpValue($callable[0]);
@@ -719,7 +745,7 @@ private function addInlineReference(string $id, Definition $definition, string $
 
         $hasSelfRef = isset($this->circularReferences[$id][$targetId]);
         $forConstructor = $forConstructor && !isset($this->definitionVariables[$definition]);
-        $code = $hasSelfRef && $this->circularReferences[$id][$targetId] && !$forConstructor ? $this->addInlineService($id, $definition, $definition) : '';
+        $code = $hasSelfRef && !$forConstructor ? $this->addInlineService($id, $definition, $definition) : '';
 
         if (isset($this->referenceVariables[$targetId]) || (2 > $callCount && (!$hasSelfRef || !$forConstructor))) {
             return $code;