[DI] Dont share service when no id provided

nicolas-grekas · nicolas-grekas · commit 948dc96e0dcb · 2017-01-10T11:49:03.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -430,7 +430,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV
         }
 
         if (!array_key_exists($id, $this->definitions) && isset($this->aliasDefinitions[$id])) {
-            return $this->get($this->aliasDefinitions[$id], $invalidBehavior);
+            return $this->get((string) $this->aliasDefinitions[$id], $invalidBehavior);
         }
 
         try {
@@ -1099,15 +1099,15 @@ private function callMethod($service, $call)
     /**
      * Shares a given service in the container.
      *
-     * @param Definition $definition
-     * @param mixed      $service
-     * @param string     $id
+     * @param Definition  $definition
+     * @param mixed       $service
+     * @param string|null $id
      *
      * @throws InactiveScopeException
      */
     private function shareService(Definition $definition, $service, $id)
     {
-        if (self::SCOPE_PROTOTYPE !== $scope = $definition->getScope()) {
+        if (null !== $id && self::SCOPE_PROTOTYPE !== $scope = $definition->getScope()) {
             if (self::SCOPE_CONTAINER !== $scope && !isset($this->scopedServices[$scope])) {
                 throw new InactiveScopeException($id, $scope);
             }

Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,7 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV`
`430`	`430`	`}`
`431`	`431`
`432`	`432`	`if (!array_key_exists($id, $this->definitions) && isset($this->aliasDefinitions[$id])) {`
`433`		`- return $this->get($this->aliasDefinitions[$id], $invalidBehavior);`
	`433`	`+ return $this->get((string) $this->aliasDefinitions[$id], $invalidBehavior);`
`434`	`434`	`}`
`435`	`435`
`436`	`436`	`try {`
`@@ -1099,15 +1099,15 @@ private function callMethod($service, $call)`
`1099`	`1099`	`/**`
`1100`	`1100`	`* Shares a given service in the container.`
`1101`	`1101`	`*`
`1102`		`- * @param Definition $definition`
`1103`		`- * @param mixed $service`
`1104`		`- * @param string $id`
	`1102`	`+ * @param Definition $definition`
	`1103`	`+ * @param mixed $service`
	`1104`	`+ * @param string\|null $id`
`1105`	`1105`	`*`
`1106`	`1106`	`* @throws InactiveScopeException`
`1107`	`1107`	`*/`
`1108`	`1108`	`private function shareService(Definition $definition, $service, $id)`
`1109`	`1109`	`{`
`1110`		`- if (self::SCOPE_PROTOTYPE !== $scope = $definition->getScope()) {`
	`1110`	`+ if (null !== $id && self::SCOPE_PROTOTYPE !== $scope = $definition->getScope()) {`
`1111`	`1111`	`if (self::SCOPE_CONTAINER !== $scope && !isset($this->scopedServices[$scope])) {`
`1112`	`1112`	`throw new InactiveScopeException($id, $scope);`
`1113`	`1113`	`}`