[DependencyInjection][Xml] Fix the attribute 'tag' is not allowed in …

…'bind' tag
symfony · fabpot · Nov 30, 2019 · Nov 30, 2019 · Nov 30, 2019 · e38f7d41ef612cb29107dec80b1653cece4c9e45
commit e38f7d41ef612cb29107dec80b1653cece4c9e45
diff --git a/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd b/src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
@@ -222,6 +222,7 @@
    <xsd:attribute name="key" type="xsd:string" use="required" />
    <xsd:attribute name="on-invalid" type="invalid_sequence" />
    <xsd:attribute name="method" type="xsd:string" />
+    <xsd:attribute name="tag" type="xsd:string" />
  </xsd:complexType>

  <xsd:complexType name="argument" mixed="true">

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Bar.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/Bar.php
@@ -15,7 +15,7 @@ class Bar implements BarInterface
 {
    public $quz;

-    public function __construct($quz = null, \NonExistent $nonExistent = null, BarInterface $decorated = null, array $foo = [])
+    public function __construct($quz = null, \NonExistent $nonExistent = null, BarInterface $decorated = null, array $foo = [], iterable $baz = [])
    {
        $this->quz = $quz;
    }

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_bindings.xml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/xml/services_bindings.xml
@@ -12,6 +12,7 @@
            <bind key="$foo" type="collection">
                <bind>null</bind>
            </bind>
+            <bind key="iterable $baz" type="tagged_iterator" tag="bar"/>
        </service>

        <service id="Symfony\Component\DependencyInjection\Tests\Fixtures\Bar">

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_bindings.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services_bindings.yml
@@ -12,6 +12,7 @@ services:
        bind:
            Symfony\Component\DependencyInjection\Tests\Fixtures\BarInterface: '@Symfony\Component\DependencyInjection\Tests\Fixtures\Bar'
            $foo: [ ~ ]
+            iterable $baz: !tagged_iterator bar

    Symfony\Component\DependencyInjection\Tests\Fixtures\Bar:
        factory: [ ~, 'create' ]
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php
@@ -879,12 +879,14 @@ public function testBindings()
            '$foo' => [null],
            '$quz' => 'quz',
            '$factory' => 'factory',
+            'iterable $baz' => new TaggedIteratorArgument('bar'),
        ], array_map(function (BoundArgument $v) { return $v->getValues()[0]; }, $definition->getBindings()));
        $this->assertEquals([
            'quz',
            null,
            new Reference(Bar::class),
            [null],
+            new TaggedIteratorArgument('bar'),
        ], $definition->getArguments());

        $definition = $container->getDefinition(Bar::class);

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -801,12 +801,14 @@ public function testBindings()
            '$foo' => [null],
            '$quz' => 'quz',
            '$factory' => 'factory',
+            'iterable $baz' => new TaggedIteratorArgument('bar'),
        ], array_map(function (BoundArgument $v) { return $v->getValues()[0]; }, $definition->getBindings()));
        $this->assertEquals([
            'quz',
            null,
            new Reference(Bar::class),
            [null],
+            new TaggedIteratorArgument('bar'),
        ], $definition->getArguments());

        $definition = $container->getDefinition(Bar::class);