Merge branch '3.4' into 4.0

nicolas-grekas · nicolas-grekas · commit 4b272d65e9c0 · 2018-05-25T13:57:52.000+02:00
* 3.4:
  [DI] fix undefined offset in InlineServiceDefinitionsPass
  [Security/Http] Fix deps conflict
diff --git a/Compiler/InlineServiceDefinitionsPass.php b/Compiler/InlineServiceDefinitionsPass.php
@@ -120,6 +120,6 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe
             return false;
         }
 
-        return $this->container->getDefinition($ids[0])->isShared();
+        return !$ids || $this->container->getDefinition($ids[0])->isShared();
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -120,6 +120,6 @@ private function isInlineableDefinition($id, Definition $definition, ServiceRefe`
`120`	`120`	`return false;`
`121`	`121`	`}`
`122`	`122`
`123`		`- return $this->container->getDefinition($ids[0])->isShared();`
	`123`	`+ return !$ids \|\| $this->container->getDefinition($ids[0])->isShared();`
`124`	`124`	`}`
`125`	`125`	`}`