[DI] Trigger deprecation when setting a to-be-private synthetic service

nicolas-grekas · nicolas-grekas · commit 28175767d2bb · 2017-12-02T00:46:52.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -174,7 +174,7 @@ public function set($id, $service)
         }
 
         if (isset($this->privates[$id]) || !(isset($this->fileMap[$id]) || isset($this->methodMap[$id]))) {
-            if (isset($this->syntheticIds[$id]) || (!isset($this->privates[$id]) && !isset($this->getRemovedIds()[$id]))) {
+            if (!isset($this->privates[$id]) && !isset($this->getRemovedIds()[$id])) {
                 // no-op
             } elseif (null === $service) {
                 @trigger_error(sprintf('The "%s" service is private, unsetting it is deprecated since Symfony 3.2 and will fail in 4.0.', $id), E_USER_DEPRECATED);

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ public function set($id, $service)`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`if (isset($this->privates[$id]) \|\| !(isset($this->fileMap[$id]) \|\| isset($this->methodMap[$id]))) {`
`177`		`- if (isset($this->syntheticIds[$id]) \|\| (!isset($this->privates[$id]) && !isset($this->getRemovedIds()[$id]))) {`
	`177`	`+ if (!isset($this->privates[$id]) && !isset($this->getRemovedIds()[$id])) {`
`178`	`178`	`// no-op`
`179`	`179`	`} elseif (null === $service) {`
`180`	`180`	`@trigger_error(sprintf('The "%s" service is private, unsetting it is deprecated since Symfony 3.2 and will fail in 4.0.', $id), E_USER_DEPRECATED);`