Apply nicolas-grekas diff

alamirault · alamirault · commit 68f55ba6b209 · 2023-02-15T21:01:16.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php b/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php
@@ -276,24 +276,18 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a
                 continue;
             }
 
-            $type = ProxyHelper::exportType($parameter, true);
-
             if ($checkAttributes) {
                 foreach ($parameter->getAttributes() as $attribute) {
                     if (\in_array($attribute->getName(), [TaggedIterator::class, TaggedLocator::class, Autowire::class, MapDecorated::class], true)) {
                         $arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());
 
-                        break;
+                        continue 2;
                     }
                 }
-
-                if ('' !== ($arguments[$index] ?? '')) {
-                    continue;
-                }
             }
 
-            if (!$type) {
-                if (\array_key_exists($index, $arguments)) {
+            if (!$type = ProxyHelper::exportType($parameter, true)) {
+                if (isset($arguments[$index])) {
                     continue;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -276,24 +276,18 @@ private function autowireMethod(\ReflectionFunctionAbstract $reflectionMethod, a`
`276`	`276`	`continue;`
`277`	`277`	`}`
`278`	`278`
`279`		`- $type = ProxyHelper::exportType($parameter, true);`
`280`		`-`
`281`	`279`	`if ($checkAttributes) {`
`282`	`280`	`foreach ($parameter->getAttributes() as $attribute) {`
`283`	`281`	`if (\in_array($attribute->getName(), [TaggedIterator::class, TaggedLocator::class, Autowire::class, MapDecorated::class], true)) {`
`284`	`282`	`$arguments[$index] = $this->processAttribute($attribute->newInstance(), $parameter->allowsNull());`
`285`	`283`
`286`		`- break;`
	`284`	`+ continue 2;`
`287`	`285`	`}`
`288`	`286`	`}`
`289`		`-`
`290`		`- if ('' !== ($arguments[$index] ?? '')) {`
`291`		`- continue;`
`292`		`- }`
`293`	`287`	`}`
`294`	`288`
`295`		`- if (!$type) {`
`296`		`- if (\array_key_exists($index, $arguments)) {`
	`289`	`+ if (!$type = ProxyHelper::exportType($parameter, true)) {`
	`290`	`+ if (isset($arguments[$index])) {`
`297`	`291`	`continue;`
`298`	`292`	`}`
`299`	`293`