Merge branch '4.1' into 4.2

nicolas-grekas · nicolas-grekas · commit cb57f87ad11f · 2018-12-01T10:30:54.000+01:00
* 4.1:
  [DI] fix InlineServiceDefinitionsPass' fix
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/InlineServiceDefinitionsPass.php
@@ -164,11 +164,11 @@ private function isInlineableDefinition($id, Definition $definition)
             return false;
         }
 
-        if (!$this->graph->hasNode($id)) {
-            return true;
-        }
-
         if (!$definition->isShared()) {
+            if (!$this->graph->hasNode($id)) {
+                return true;
+            }
+
             foreach ($this->graph->getNode($id)->getInEdges() as $edge) {
                 $srcId = $edge->getSourceNode()->getId();
                 $this->connectedIds[$srcId] = true;
@@ -184,6 +184,10 @@ private function isInlineableDefinition($id, Definition $definition)
             return false;
         }
 
+        if (!$this->graph->hasNode($id)) {
+            return true;
+        }
+
         if ($this->currentId == $id) {
             return false;
         }
