Skip to content

Commit 72c14cb

Browse files
Merge branch '3.4' into 4.2
* 3.4: [DI] Fix dumping Doctrine-like service graphs fix serialization workaround in CustomUserMessageAuthenticationException PHPUnit Bridge: Rollback to traditional array syntax. [Form] fix some docblocks and type checks
2 parents 4f59668 + b514f5b commit 72c14cb

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

Compiler/InlineServiceDefinitionsPass.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,6 @@ private function isInlineableDefinition($id, Definition $definition)
217217
return false;
218218
}
219219

220-
if ($isReferencedByConstructor && $this->container->getDefinition($srcId)->isLazy() && ($definition->getProperties() || $definition->getMethodCalls() || $definition->getConfigurator())) {
221-
return false;
222-
}
223-
224220
return $this->container->getDefinition($srcId)->isShared();
225221
}
226222
}

Dumper/PhpDumper.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -655,6 +655,7 @@ private function addService(string $id, Definition $definition): array
655655
$autowired = $definition->isAutowired() ? ' autowired' : '';
656656

657657
if ($definition->isLazy()) {
658+
unset($this->circularReferences[$id]);
658659
$lazyInitialization = '$lazyLoad = true';
659660
} else {
660661
$lazyInitialization = '';

0 commit comments

Comments
 (0)