Fix merge

Author: nicolas-grekas

src/Symfony/Component/DependencyInjection/Tests/Compiler/PriorityTaggedServiceTraitTest.php

@@ -514,7 +514,7 @@ public function testDecoratedServiceAsTaggedItemIndex()
 
         $priorityTaggedServiceTraitImplementation = new PriorityTaggedServiceTraitImplementation();
 
-        $tag = new TaggedIteratorArgument('my_custom_tag', 'foo', 'getFooBar');
+        $tag = new TaggedIteratorArgument('my_custom_tag', 'foo');
         $services = $priorityTaggedServiceTraitImplementation->test($tag, $container);
 
         $this->assertArrayHasKey('custom_key', $services);
@@ -544,7 +544,7 @@ public function testMultiLevelDecoratedServiceAsTaggedItemIndex()
 
         $priorityTaggedServiceTraitImplementation = new PriorityTaggedServiceTraitImplementation();
 
-        $tag = new TaggedIteratorArgument('my_custom_tag', 'foo', 'getFooBar');
+        $tag = new TaggedIteratorArgument('my_custom_tag', 'foo');
         $services = $priorityTaggedServiceTraitImplementation->test($tag, $container);
 
         $this->assertArrayHasKey('custom_key', $services);

src/Symfony/Component/DependencyInjection/Tests/Compiler/ServiceLocatorTagPassTest.php

@@ -283,7 +283,7 @@ public function testIndexedByAsTaggedItemWithDecoration()
 
         $locator = new Definition(Locator::class);
         $locator->setPublic(true);
-        $locator->addArgument(new ServiceLocatorArgument(new TaggedIteratorArgument('test_tag', 'key', null, true)));
+        $locator->addArgument(new ServiceLocatorArgument(new TaggedIteratorArgument('test_tag', 'key', true)));
 
         $container->setDefinition(Locator::class, $locator);