[DI] Add missing deprecation when fetching private services from ContainerBuilder

nicolas-grekas · nicolas-grekas · commit 9f8d989df796 · 2017-12-01T12:54:47.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -559,10 +559,10 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV
         if ($this->isCompiled()) {
             $id = $this->normalizeId($id);
 
-            if (isset($this->definitions[$id]) && $this->definitions[$id]->isPrivate()) {
+            if (isset($this->definitions[$id]) && (!$this->definitions[$id]->isPublic() || $this->definitions[$id]->isPrivate())) {
                 @trigger_error(sprintf('Fetching the "%s" private service is deprecated and will fail in Symfony 4.0. Make the service public instead.', $id), E_USER_DEPRECATED);
             }
-            if (isset($this->aliasDefinitions[$id]) && $this->aliasDefinitions[$id]->isPrivate()) {
+            if (isset($this->aliasDefinitions[$id]) && (!$this->aliasDefinitions[$id]->isPublic() || $this->aliasDefinitions[$id]->isPrivate())) {
                 @trigger_error(sprintf('Fetching the "%s" private alias is deprecated and will fail in Symfony 4.0. Make the alias public instead.', $id), E_USER_DEPRECATED);
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -559,10 +559,10 @@ public function get($id, $invalidBehavior = ContainerInterface::EXCEPTION_ON_INV`
`559`	`559`	`if ($this->isCompiled()) {`
`560`	`560`	`$id = $this->normalizeId($id);`
`561`	`561`
`562`		`- if (isset($this->definitions[$id]) && $this->definitions[$id]->isPrivate()) {`
	`562`	`+ if (isset($this->definitions[$id]) && (!$this->definitions[$id]->isPublic() \|\| $this->definitions[$id]->isPrivate())) {`
`563`	`563`	`@trigger_error(sprintf('Fetching the "%s" private service is deprecated and will fail in Symfony 4.0. Make the service public instead.', $id), E_USER_DEPRECATED);`
`564`	`564`	`}`
`565`		`- if (isset($this->aliasDefinitions[$id]) && $this->aliasDefinitions[$id]->isPrivate()) {`
	`565`	`+ if (isset($this->aliasDefinitions[$id]) && (!$this->aliasDefinitions[$id]->isPublic() \|\| $this->aliasDefinitions[$id]->isPrivate())) {`
`566`	`566`	`@trigger_error(sprintf('Fetching the "%s" private alias is deprecated and will fail in Symfony 4.0. Make the alias public instead.', $id), E_USER_DEPRECATED);`
`567`	`567`	`}`
`568`	`568`	`}`