ResolveBindingsPass remove loading of class iterable

sveneld · nicolas-grekas · commit f9f78c7c2a35 · 2022-01-12T13:48:08.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/ResolveBindingsPass.php
@@ -125,7 +125,7 @@ protected function processValue($value, $isRoot = false)
                 $this->unusedBindings[$bindingId] = [$key, $this->currentId, $bindingType, $file];
             }
 
-            if (preg_match('/^(?:(?:array|bool|float|int|string|([^ $]++)) )\$/', $key, $m)) {
+            if (preg_match('/^(?:(?:array|bool|float|int|string|iterable|([^ $]++)) )\$/', $key, $m)) {
                 $bindingNames[substr($key, \strlen($m[0]))] = $binding;
             }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php b/src/Symfony/Component/DependencyInjection/Tests/Compiler/ResolveBindingsPassTest.php
@@ -27,6 +27,7 @@
 use Symfony\Component\DependencyInjection\Tests\Fixtures\FooUnitEnum;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedEnumArgumentDummy;
+use Symfony\Component\DependencyInjection\Tests\Fixtures\NamedIterableArgumentDummy;
 use Symfony\Component\DependencyInjection\Tests\Fixtures\ParentNotExists;
 use Symfony\Component\DependencyInjection\TypedReference;
 
@@ -209,4 +210,17 @@ public function testEmptyBindingTypehint()
         $pass = new ResolveBindingsPass();
         $pass->process($container);
     }
+
+    public function testIterableBindingTypehint()
+    {
+        $container = new ContainerBuilder();
+        $definition = $container->register('bar', NamedIterableArgumentDummy::class);
+        $definition->setBindings([
+            'iterable $items' => new TaggedIteratorArgument('foo'),
+        ]);
+        $pass = new ResolveBindingsPass();
+        $pass->process($container);
+
+        $this->assertInstanceOf(TaggedIteratorArgument::class, $container->getDefinition('bar')->getArgument(0));
+    }
 }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/NamedIterableArgumentDummy.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/NamedIterableArgumentDummy.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Component\DependencyInjection\Tests\Fixtures;
+
+class NamedIterableArgumentDummy
+{
+    public function __construct(iterable $items)
+    {
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ protected function processValue($value, $isRoot = false)`
`125`	`125`	`$this->unusedBindings[$bindingId] = [$key, $this->currentId, $bindingType, $file];`
`126`	`126`	`}`
`127`	`127`
`128`		`- if (preg_match('/^(?:(?:array\|bool\|float\|int\|string\|([^ $]++)) )\$/', $key, $m)) {`
	`128`	`+ if (preg_match('/^(?:(?:array\|bool\|float\|int\|string\|iterable\|([^ $]++)) )\$/', $key, $m)) {`
`129`	`129`	`$bindingNames[substr($key, \strlen($m[0]))] = $binding;`
`130`	`130`	`}`
`131`	`131`