minor #31967 [DI] remove deprecated tag !tagged in favor of !tagged_iterator (jschaedl)

nicolas-grekas · nicolas-grekas · commit e8c2a1b807e3 · 2019-06-09T22:26:37.000+02:00
This PR was merged into the 5.0-dev branch. Discussion ---------- [DI] remove deprecated tag !tagged in favor of !tagged_iterator | Q | A | ------------- | --- | Branch? | master  | Bug fix? | no | New feature? | no  | BC breaks? | yes  | Deprecations? | no  | Tests pass? | yes  | Fixed tickets | related ticket #31289  | License | MIT | Doc PR | symfony/symfony-docs#tbd  This PR removes tag `tagged` which was deprecated in #31321 Commits ------- 9978184 [DI] removed tagged
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -11,6 +11,7 @@ CHANGELOG
  * removed support for short factory/configurator syntax from `YamlFileLoader`
  * removed `ResettableContainerInterface`, use `ResetInterface` instead
  * added argument `$returnsClone` to `Definition::addMethodCall()`
+ * removed `tagged`, use `tagged_iterator` instead
 
 4.4.0
 -----
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
@@ -113,18 +113,6 @@ function iterator(array $values): IteratorArgument
     return new IteratorArgument(AbstractConfigurator::processValue($values, true));
 }
 
-/**
- * Creates a lazy iterator by tag name.
- *
- * @deprecated since Symfony 4.4, to be removed in 5.0, use "tagged_iterator" instead.
- */
-function tagged(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null): TaggedIteratorArgument
-{
-    @trigger_error(__NAMESPACE__.'\tagged() is deprecated since Symfony 4.4 and will be removed in 5.0, use '.__NAMESPACE__.'\tagged_iterator() instead.', E_USER_DEPRECATED);
-
-    return new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod);
-}
-
 /**
  * Creates a lazy iterator by tag name.
  */
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -544,9 +544,6 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase =
                         throw new InvalidArgumentException(sprintf('Tag "<%s>" with type="service_locator" only accepts maps of type="service" references in "%s".', $name, $file));
                     }
                     break;
-                case 'tagged':
-                    @trigger_error(sprintf('Type "%s" of tag <%s> in "%s" is deprecated since Symfony 4.4 and will be removed in 5.0, use "tagged_iterator" instead.', $arg->getAttribute('type'), $name, $file), E_USER_DEPRECATED);
-                    // no break
                 case 'tagged_iterator':
                 case 'tagged_locator':
                     $type = $arg->getAttribute('type');
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -717,11 +717,7 @@ private function resolveServices($value, $file, $isParameter = false)
                     throw new InvalidArgumentException(sprintf('"!service_locator" tag only accepts maps of "@service" references in "%s".', $file));
                 }
             }
-            if (\in_array($value->getTag(), ['tagged', 'tagged_iterator', 'tagged_locator'], true)) {
-                if ('tagged' === $value->getTag()) {
-                    @trigger_error('"!tagged" is deprecated since Symfony 4.4 and will be removed in 5.0, use "!tagged_iterator" instead.', E_USER_DEPRECATED);
-                }
-
+            if (\in_array($value->getTag(), ['tagged_iterator', 'tagged_locator'], true)) {
                 $forLocator = 'tagged_locator' === $value->getTag();
 
                 if (\is_string($argument) && $argument) {
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
@@ -264,8 +264,6 @@
       <xsd:enumeration value="constant" />
       <xsd:enumeration value="iterator" />
       <xsd:enumeration value="service_locator" />
-      <!-- "tagged" is deprecated since Symfony 4.4 and will be removed in 5.0, use "tagged_iterator" instead. -->
-      <xsd:enumeration value="tagged" />
       <xsd:enumeration value="tagged_iterator" />
       <xsd:enumeration value="tagged_locator" />
     </xsd:restriction>

Original file line number	Diff line number	Diff line change
`@@ -717,11 +717,7 @@ private function resolveServices($value, $file, $isParameter = false)`
`717`	`717`	`throw new InvalidArgumentException(sprintf('"!service_locator" tag only accepts maps of "@service" references in "%s".', $file));`
`718`	`718`	`}`
`719`	`719`	`}`
`720`		`- if (\in_array($value->getTag(), ['tagged', 'tagged_iterator', 'tagged_locator'], true)) {`
`721`		`- if ('tagged' === $value->getTag()) {`
`722`		`- @trigger_error('"!tagged" is deprecated since Symfony 4.4 and will be removed in 5.0, use "!tagged_iterator" instead.', E_USER_DEPRECATED);`
`723`		`- }`
`724`		`-`
	`720`	`+ if (\in_array($value->getTag(), ['tagged_iterator', 'tagged_locator'], true)) {`
`725`	`721`	`$forLocator = 'tagged_locator' === $value->getTag();`
`726`	`722`
`727`	`723`	`if (\is_string($argument) && $argument) {`