Skip to content

Commit ea9b340

Browse files
committed
Merge branch '5.2' into 5.x
* 5.2: Backport psr/container 1.1/2.0 compatibility Update notifier_transports.php Dont lock tables or start transactions Bump Symfony version to 5.2.5 Update VERSION for 5.2.4 Update CHANGELOG for 5.2.4 Bump Symfony version to 4.4.21 Update VERSION for 4.4.20 Update CONTRIBUTORS for 4.4.20 Update CHANGELOG for 4.4.20
2 parents 3d3ad55 + be0c792 commit ea9b340

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Compiler/AutowirePass.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot):
146146
$this->decoratedClass = null;
147147
$this->getPreviousValue = null;
148148

149-
if ($isRoot && ($definition = $this->container->getDefinition($this->currentId)) && $this->container->has($this->decoratedId = $definition->innerServiceId)) {
149+
if ($isRoot && ($definition = $this->container->getDefinition($this->currentId)) && null !== ($this->decoratedId = $definition->innerServiceId) && $this->container->has($this->decoratedId)) {
150150
$this->decoratedClass = $this->container->findDefinition($this->decoratedId)->getClass();
151151
}
152152

0 commit comments

Comments
 (0)