merged branch fabpot/deic-fix (PR #7333)

fabpot · fabpot · commit 02da7da5a6ee · 2013-03-11T23:11:53.000+01:00
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #7333). Commits ------- 6992a9e [DependencyInjection] fixed id case when setting a service (also slightly enhanced an error message) Discussion ---------- [DependencyInjection] fixed id case when setting a service (also slightly enhanced an error message) | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -347,15 +347,15 @@ public function getScopeChildren()
      */
     public function set($id, $service, $scope = self::SCOPE_CONTAINER)
     {
+        $id = strtolower($id);
+
         if ($this->isFrozen()) {
             // setting a synthetic service on a frozen container is alright
             if (!isset($this->definitions[$id]) || !$this->definitions[$id]->isSynthetic()) {
-                throw new BadMethodCallException('Setting service on a frozen container is not allowed');
+                throw new BadMethodCallException(sprintf('Setting service "%s" on a frozen container is not allowed.', $id));
             }
         }
 
-        $id = strtolower($id);
-
         unset($this->definitions[$id], $this->aliases[$id]);
 
         parent::set($id, $service, $scope);

Original file line number	Diff line number	Diff line change
`@@ -347,15 +347,15 @@ public function getScopeChildren()`
`347`	`347`	`*/`
`348`	`348`	`public function set($id, $service, $scope = self::SCOPE_CONTAINER)`
`349`	`349`	`{`
	`350`	`+ $id = strtolower($id);`
	`351`	`+`
`350`	`352`	`if ($this->isFrozen()) {`
`351`	`353`	`// setting a synthetic service on a frozen container is alright`
`352`	`354`	`if (!isset($this->definitions[$id]) \|\| !$this->definitions[$id]->isSynthetic()) {`
`353`		`- throw new BadMethodCallException('Setting service on a frozen container is not allowed');`
	`355`	`+ throw new BadMethodCallException(sprintf('Setting service "%s" on a frozen container is not allowed.', $id));`
`354`	`356`	`}`
`355`	`357`	`}`
`356`	`358`
`357`		`- $id = strtolower($id);`
`358`		`-`
`359`	`359`	`unset($this->definitions[$id], $this->aliases[$id]);`
`360`	`360`
`361`	`361`	`parent::set($id, $service, $scope);`