[DI] Minor dumping logic simplification

nicolas-grekas · nicolas-grekas · commit 4d5a306ef0f0 · 2017-07-17T22:48:54.000+02:00
diff --git a/Dumper/PhpDumper.php b/Dumper/PhpDumper.php
@@ -1608,7 +1608,7 @@ private function getServiceCall($id, Reference $reference = null)
             $code = sprintf('$this->get(\'%s\')', $id);
         }
 
-        if ($this->container->hasDefinition($id) && (!$this->container->getDefinition($id)->isPublic() || $this->container->getDefinition($id)->isShared())) {
+        if ($this->container->hasDefinition($id) && $this->container->getDefinition($id)->isShared()) {
             // The following is PHP 5.5 syntax for what could be written as "(\$this->services['$id'] ?? $code)" on PHP>=7.0
 
             $code = "\${(\$_ = isset(\$this->services['$id']) ? \$this->services['$id'] : $code) && false ?: '_'}";

Original file line number	Diff line number	Diff line change
`@@ -1608,7 +1608,7 @@ private function getServiceCall($id, Reference $reference = null)`
`1608`	`1608`	`$code = sprintf('$this->get(\'%s\')', $id);`
`1609`	`1609`	`}`
`1610`	`1610`
`1611`		`- if ($this->container->hasDefinition($id) && (!$this->container->getDefinition($id)->isPublic() \|\| $this->container->getDefinition($id)->isShared())) {`
	`1611`	`+ if ($this->container->hasDefinition($id) && $this->container->getDefinition($id)->isShared()) {`
`1612`	`1612`	`// The following is PHP 5.5 syntax for what could be written as "(\$this->services['$id'] ?? $code)" on PHP>=7.0`
`1613`	`1613`
`1614`	`1614`	`$code = "\${(\$_ = isset(\$this->services['$id']) ? \$this->services['$id'] : $code) && false ?: '_'}";`