bug #32604 Properly handle optional tag attributes for !tagged_iterator (apfelbox)

nicolas-grekas · nicolas-grekas · commit 3f988461d538 · 2019-07-18T22:37:28.000+02:00
This PR was merged into the 4.3 branch. Discussion ---------- Properly handle optional tag attributes for !tagged_iterator | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no  | BC breaks? | no  | Deprecations? |no  | Tests pass? | yes  | Fixed tickets | #32603 | License | MIT | Doc PR | — Properly handles all optional array keys when using `!tagged_iterator` in YAML service definitions. This fixes a regression and adds a test case preventing it from coming up again Commits ------- d1c6580 Properly handle optional tag attributes for !tagged_iterator
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -736,7 +736,7 @@ private function resolveServices($value, $file, $isParameter = false)
                         throw new InvalidArgumentException(sprintf('"!%s" tag contains unsupported key "%s"; supported ones are "tag", "index_by" and "default_index_method".', $value->getTag(), implode('"", "', $diff)));
                     }
 
-                    $argument = new TaggedIteratorArgument($argument['tag'], $argument['index_by'], $argument['default_index_method'] ?? null, $forLocator);
+                    $argument = new TaggedIteratorArgument($argument['tag'], $argument['index_by'] ?? null, $argument['default_index_method'] ?? null, $forLocator);
 
                     if ($forLocator) {
                         $argument = new ServiceLocatorArgument($argument);
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/tagged_iterator_optional.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/tagged_iterator_optional.yml
@@ -0,0 +1,4 @@
+services:
+    iterator_service:
+        class: FooClass
+        arguments: [!tagged {tag: test.tag}]
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
@@ -852,4 +852,18 @@ public function testOverriddenDefaultsBindings()
 
         $this->assertSame('overridden', $container->get('bar')->quz);
     }
+
+    /**
+     * When creating a tagged iterator using the array syntax, all optional parameters should be properly handled.
+     */
+    public function testDefaultValueOfTagged()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('tagged_iterator_optional.yml');
+
+        $iteratorArgument = $container->getDefinition('iterator_service')->getArgument(0);
+        $this->assertInstanceOf(TaggedIteratorArgument::class, $iteratorArgument);
+        $this->assertNull($iteratorArgument->getIndexAttribute());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -736,7 +736,7 @@ private function resolveServices($value, $file, $isParameter = false)`
`736`	`736`	`throw new InvalidArgumentException(sprintf('"!%s" tag contains unsupported key "%s"; supported ones are "tag", "index_by" and "default_index_method".', $value->getTag(), implode('"", "', $diff)));`
`737`	`737`	`}`
`738`	`738`
`739`		`- $argument = new TaggedIteratorArgument($argument['tag'], $argument['index_by'], $argument['default_index_method'] ?? null, $forLocator);`
	`739`	`+ $argument = new TaggedIteratorArgument($argument['tag'], $argument['index_by'] ?? null, $argument['default_index_method'] ?? null, $forLocator);`
`740`	`740`
`741`	`741`	`if ($forLocator) {`
`742`	`742`	`$argument = new ServiceLocatorArgument($argument);`