symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+19-5Lines changed: 19 additions & 5 deletions b/‎src/Symfony/Component/DependencyInjection/ContainerBuilder.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/ContainerBuilder.php
+19-5Lines changed: 19 additions & 5 deletions
@@ -467,6 +467,8 @@ public function getCompiler()
      */
     public function set($id, $service)
     {
+        $id = (string) $id;
+
         if ($this->isCompiled() && (isset($this->definitions[$id]) && !$this->definitions[$id]->isSynthetic())) {
             // setting a synthetic service on a compiled container is alright
             throw new BadMethodCallException(sprintf('Setting service "%s" for an unknown or non-synthetic service definition on a compiled container is not allowed.', $id));
@@ -484,7 +486,7 @@ public function set($id, $service)
      */
     public function removeDefinition($id)
     {
-        if (isset($this->definitions[$id])) {
+        if (isset($this->definitions[$id = (string) $id])) {
             unset($this->definitions[$id]);
             $this->removedIds[$id] = true;
         }
@@ -499,6 +501,8 @@ public function removeDefinition($id)
      */
     public function has($id)
     {
+        $id = (string) $id;
+
         return isset($this->definitions[$id]) || isset($this->aliasDefinitions[$id]) || parent::has($id);
     }
 
@@ -519,7 +523,7 @@ public function has($id)
      */
     public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)
     {
-        if ($this->isCompiled() && isset($this->removedIds[$id]) && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE === $invalidBehavior) {
+        if ($this->isCompiled() && isset($this->removedIds[$id = (string) $id]) && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE === $invalidBehavior) {
             return parent::get($id);
         }
 
@@ -779,6 +783,8 @@ public function setAliases(array $aliases)
      */
     public function setAlias($alias, $id)
     {
+        $alias = (string) $alias;
+
         if (is_string($id)) {
             $id = new Alias($id);
         } elseif (!$id instanceof Alias) {
@@ -801,7 +807,7 @@ public function setAlias($alias, $id)
      */
     public function removeAlias($alias)
     {
-        if (isset($this->aliasDefinitions[$alias])) {
+        if (isset($this->aliasDefinitions[$alias = (string) $alias])) {
             unset($this->aliasDefinitions[$alias]);
             $this->removedIds[$alias] = true;
         }
@@ -816,7 +822,7 @@ public function removeAlias($alias)
      */
     public function hasAlias($id)
     {
-        return isset($this->aliasDefinitions[$id]);
+        return isset($this->aliasDefinitions[$id = (string) $id]);
     }
 
     /**
@@ -840,6 +846,8 @@ public function getAliases()
      */
     public function getAlias($id)
     {
+        $id = (string) $id;
+
         if (!isset($this->aliasDefinitions[$id])) {
             throw new InvalidArgumentException(sprintf('The service alias "%s" does not exist.', $id));
         }
@@ -928,6 +936,8 @@ public function setDefinition($id, Definition $definition)
             throw new BadMethodCallException('Adding definition to a compiled container is not allowed');
         }
 
+        $id = (string) $id;
+
         unset($this->aliasDefinitions[$id], $this->removedIds[$id]);
 
         return $this->definitions[$id] = $definition;
@@ -942,7 +952,7 @@ public function setDefinition($id, Definition $definition)
      */
     public function hasDefinition($id)
     {
-        return isset($this->definitions[$id]);
+        return isset($this->definitions[(string) $id]);
     }
 
     /**
@@ -956,6 +966,8 @@ public function hasDefinition($id)
      */
     public function getDefinition($id)
     {
+        $id = (string) $id;
+
         if (!isset($this->definitions[$id])) {
             throw new ServiceNotFoundException($id);
         }
@@ -976,6 +988,8 @@ public function getDefinition($id)
      */
     public function findDefinition($id)
     {
+        $id = (string) $id;
+
         while (isset($this->aliasDefinitions[$id])) {
             $id = (string) $this->aliasDefinitions[$id];
         }
Original file line number	Diff line number	Diff line change
`@@ -467,6 +467,8 @@ public function getCompiler()`
`467`	`467`	`*/`
`468`	`468`	`public function set($id, $service)`
`469`	`469`	`{`
	`470`	`+ $id = (string) $id;`
	`471`	`+`
`470`	`472`	`if ($this->isCompiled() && (isset($this->definitions[$id]) && !$this->definitions[$id]->isSynthetic())) {`
`471`	`473`	`// setting a synthetic service on a compiled container is alright`
`472`	`474`	`throw new BadMethodCallException(sprintf('Setting service "%s" for an unknown or non-synthetic service definition on a compiled container is not allowed.', $id));`
`@@ -484,7 +486,7 @@ public function set($id, $service)`
`484`	`486`	`*/`
`485`	`487`	`public function removeDefinition($id)`
`486`	`488`	`{`
`487`		`- if (isset($this->definitions[$id])) {`
	`489`	`+ if (isset($this->definitions[$id = (string) $id])) {`
`488`	`490`	`unset($this->definitions[$id]);`
`489`	`491`	`$this->removedIds[$id] = true;`
`490`	`492`	`}`
`@@ -499,6 +501,8 @@ public function removeDefinition($id)`
`499`	`501`	`*/`
`500`	`502`	`public function has($id)`
`501`	`503`	`{`
	`504`	`+ $id = (string) $id;`
	`505`	`+`
`502`	`506`	`return isset($this->definitions[$id]) \|\| isset($this->aliasDefinitions[$id]) \|\| parent::has($id);`
`503`	`507`	`}`
`504`	`508`
`@@ -519,7 +523,7 @@ public function has($id)`
`519`	`523`	`*/`
`520`	`524`	`public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE)`
`521`	`525`	`{`
`522`		`- if ($this->isCompiled() && isset($this->removedIds[$id]) && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE === $invalidBehavior) {`
	`526`	`+ if ($this->isCompiled() && isset($this->removedIds[$id = (string) $id]) && ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE === $invalidBehavior) {`
`523`	`527`	`return parent::get($id);`
`524`	`528`	`}`
`525`	`529`
`@@ -779,6 +783,8 @@ public function setAliases(array $aliases)`
`779`	`783`	`*/`
`780`	`784`	`public function setAlias($alias, $id)`
`781`	`785`	`{`
	`786`	`+ $alias = (string) $alias;`
	`787`	`+`
`782`	`788`	`if (is_string($id)) {`
`783`	`789`	`$id = new Alias($id);`
`784`	`790`	`} elseif (!$id instanceof Alias) {`
`@@ -801,7 +807,7 @@ public function setAlias($alias, $id)`
`801`	`807`	`*/`
`802`	`808`	`public function removeAlias($alias)`
`803`	`809`	`{`
`804`		`- if (isset($this->aliasDefinitions[$alias])) {`
	`810`	`+ if (isset($this->aliasDefinitions[$alias = (string) $alias])) {`
`805`	`811`	`unset($this->aliasDefinitions[$alias]);`
`806`	`812`	`$this->removedIds[$alias] = true;`
`807`	`813`	`}`
`@@ -816,7 +822,7 @@ public function removeAlias($alias)`
`816`	`822`	`*/`
`817`	`823`	`public function hasAlias($id)`
`818`	`824`	`{`
`819`		`- return isset($this->aliasDefinitions[$id]);`
	`825`	`+ return isset($this->aliasDefinitions[$id = (string) $id]);`
`820`	`826`	`}`
`821`	`827`
`822`	`828`	`/**`
`@@ -840,6 +846,8 @@ public function getAliases()`
`840`	`846`	`*/`
`841`	`847`	`public function getAlias($id)`
`842`	`848`	`{`
	`849`	`+ $id = (string) $id;`
	`850`	`+`
`843`	`851`	`if (!isset($this->aliasDefinitions[$id])) {`
`844`	`852`	`throw new InvalidArgumentException(sprintf('The service alias "%s" does not exist.', $id));`
`845`	`853`	`}`
`@@ -928,6 +936,8 @@ public function setDefinition($id, Definition $definition)`
`928`	`936`	`throw new BadMethodCallException('Adding definition to a compiled container is not allowed');`
`929`	`937`	`}`
`930`	`938`
	`939`	`+ $id = (string) $id;`
	`940`	`+`
`931`	`941`	`unset($this->aliasDefinitions[$id], $this->removedIds[$id]);`
`932`	`942`
`933`	`943`	`return $this->definitions[$id] = $definition;`
`@@ -942,7 +952,7 @@ public function setDefinition($id, Definition $definition)`
`942`	`952`	`*/`
`943`	`953`	`public function hasDefinition($id)`
`944`	`954`	`{`
`945`		`- return isset($this->definitions[$id]);`
	`955`	`+ return isset($this->definitions[(string) $id]);`
`946`	`956`	`}`
`947`	`957`
`948`	`958`	`/**`
`@@ -956,6 +966,8 @@ public function hasDefinition($id)`
`956`	`966`	`*/`
`957`	`967`	`public function getDefinition($id)`
`958`	`968`	`{`
	`969`	`+ $id = (string) $id;`
	`970`	`+`
`959`	`971`	`if (!isset($this->definitions[$id])) {`
`960`	`972`	`throw new ServiceNotFoundException($id);`
`961`	`973`	`}`
`@@ -976,6 +988,8 @@ public function getDefinition($id)`
`976`	`988`	`*/`
`977`	`989`	`public function findDefinition($id)`
`978`	`990`	`{`
	`991`	`+ $id = (string) $id;`
	`992`	`+`
`979`	`993`	`while (isset($this->aliasDefinitions[$id])) {`
`980`	`994`	`$id = (string) $this->aliasDefinitions[$id];`
`981`	`995`	`}`