Fix comments

dunglas · dunglas · commit 3e06dd438256 · 2017-12-31T10:30:52.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php b/src/Symfony/Component/DependencyInjection/Compiler/DecoratorServicePass.php
@@ -16,6 +16,7 @@
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\LazyProxy\ProxyHelper;
 use Symfony\Component\DependencyInjection\Reference;
+use Symfony\Component\DependencyInjection\TypedReference;
 
 /**
  * Overwrites a service but keeps the overridden one.
@@ -72,19 +73,17 @@ public function process(ContainerBuilder $container)
 
     private function autowire(ContainerBuilder $container, Definition $definition, string $renamedId): void
     {
-        if (
-            !$definition->isAutowired() ||
+        if (!$definition->isAutowired() ||
             null === ($innerClass = $container->findDefinition($renamedId)->getClass()) ||
             !($reflectionClass = $container->getReflectionClass($definition->getClass())) ||
-            !$reflectionMethod = $reflectionClass->getConstructor()
+            !$constructor = $reflectionClass->getConstructor()
         ) {
             return;
         }
 
         $innerIndex = null;
-        foreach ($reflectionMethod->getParameters() as $index => $parameter) {
-            if (
-                null === ($type = ProxyHelper::getTypeHint($reflectionMethod, $parameter, true)) ||
+        foreach ($constructor->getParameters() as $index => $parameter) {
+            if (null === ($type = ProxyHelper::getTypeHint($constructor, $parameter, true)) ||
                 !is_a($innerClass, $type, true)
             ) {
                 continue;
@@ -99,7 +98,7 @@ private function autowire(ContainerBuilder $container, Definition $definition, s
         }
 
         if (null !== $innerIndex) {
-            $definition->setArgument($innerIndex, new Reference($renamedId));
+            $definition->setArgument($innerIndex, new TypedReference($renamedId, $innerClass));
         }
     }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/BarDecorator.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/BarDecorator.php
@@ -13,9 +13,6 @@
 
 use Psr\Log\LoggerInterface;
 
-/**
- * @author Kévin Dunglas <dunglas@gmail.com>
- */
 class BarDecorator implements BarInterface
 {
     public function __construct(LoggerInterface $logger, BarInterface $decorated)

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,6 @@`
`13`	`13`
`14`	`14`	`use Psr\Log\LoggerInterface;`
`15`	`15`
`16`		`-/**`
`17`		`- * @author Kévin Dunglas <dunglas@gmail.com>`
`18`		`- */`
`19`	`16`	`class BarDecorator implements BarInterface`
`20`	`17`	`{`
`21`	`18`	`public function __construct(LoggerInterface $logger, BarInterface $decorated)`