Merge branch '4.0'

fabpot · fabpot · commit 7693469bc863 · 2018-01-29T10:29:25.000+01:00
* 4.0:
  fixed bad merge
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -149,8 +149,6 @@ public function set($id, $service)
             $initialize();
         }
 
-        $id = $this->normalizeId($id);
-
         if ('service_container' === $id) {
             throw new InvalidArgumentException('You cannot set service "service_container".');
         }

Original file line number	Diff line number	Diff line change
`@@ -149,8 +149,6 @@ public function set($id, $service)`
`149`	`149`	`$initialize();`
`150`	`150`	`}`
`151`	`151`
`152`		`- $id = $this->normalizeId($id);`
`153`		`-`
`154`	`152`	`if ('service_container' === $id) {`
`155`	`153`	`throw new InvalidArgumentException('You cannot set service "service_container".');`
`156`	`154`	`}`