Skip to content

Commit 730b156

Browse files
[DI] Fix non-string class handling in PhpDumper
1 parent 22a6a7e commit 730b156

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ private function addServiceInclude($cId, Definition $definition, \SplObjectStora
413413
if ($this->inlineRequires && !$this->isHotPath($definition)) {
414414
$lineage = $calls = $behavior = array();
415415
foreach ($inlinedDefinitions as $def) {
416-
if (!$def->isDeprecated() && $class = is_array($factory = $def->getFactory()) && is_string($factory[0]) ? $factory[0] : $def->getClass()) {
416+
if (!$def->isDeprecated() && is_string($class = is_array($factory = $def->getFactory()) && is_string($factory[0]) ? $factory[0] : $def->getClass())) {
417417
$this->collectLineage($class, $lineage);
418418
}
419419
$arguments = array($def->getArguments(), $def->getFactory(), $def->getProperties(), $def->getMethodCalls(), $def->getConfigurator());
@@ -425,7 +425,7 @@ private function addServiceInclude($cId, Definition $definition, \SplObjectStora
425425
&& ContainerInterface::IGNORE_ON_UNINITIALIZED_REFERENCE !== $behavior[$id]
426426
&& $this->container->has($id)
427427
&& $this->isTrivialInstance($def = $this->container->findDefinition($id))
428-
&& $class = is_array($factory = $def->getFactory()) && is_string($factory[0]) ? $factory[0] : $def->getClass()
428+
&& is_string($class = is_array($factory = $def->getFactory()) && is_string($factory[0]) ? $factory[0] : $def->getClass())
429429
) {
430430
$this->collectLineage($class, $lineage);
431431
}
@@ -1226,7 +1226,7 @@ private function addInlineRequires()
12261226
$inlinedDefinitions = $this->getDefinitionsFromArguments(array($definition));
12271227

12281228
foreach ($inlinedDefinitions as $def) {
1229-
if ($class = is_array($factory = $def->getFactory()) && is_string($factory[0]) ? $factory[0] : $def->getClass()) {
1229+
if (is_string($class = is_array($factory = $def->getFactory()) && is_string($factory[0]) ? $factory[0] : $def->getClass())) {
12301230
$this->collectLineage($class, $lineage);
12311231
}
12321232
}

0 commit comments

Comments
 (0)