feature #34170 Re-allow to use "tagged" in service definitions (dunglas)

nicolas-grekas · nicolas-grekas · commit d08273236cc8 · 2019-10-29T15:17:53.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- Re-allow to use "tagged" in service definitions | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | yes  | Deprecations? | no  | Tickets | n/a | License | MIT | Doc PR | n/a Re-allow to use `tagged` in 4.4 and 5.0. It makes it easier for bundles to support both Symfony 4.3- and Symfony 4.4+. Needed to make API Platform compatible with Symfony 5 (api-platform/core#3009) Commits ------- 7b7dc0d Re-allow to use "tagged" in service definitions
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -502,8 +502,6 @@ private function getArgumentsAsPhp(\DOMElement $node, string $name, string $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
@@ -742,10 +742,6 @@ private function resolveServices($value, string $file, bool $isParameter = false
                 }
             }
             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);
-                }
-
                 $forLocator = 'tagged_locator' === $value->getTag();
 
                 if (\is_array($argument) && isset($argument['tag']) && $argument['tag']) {
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
@@ -265,7 +265,7 @@
       <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. -->
+      <!-- "tagged" is an alias of "tagged_iterator", using "tagged_iterator" is preferred. -->
       <xsd:enumeration value="tagged" />
       <xsd:enumeration value="tagged_iterator" />
       <xsd:enumeration value="tagged_locator" />

Original file line number	Diff line number	Diff line change
`@@ -502,8 +502,6 @@ private function getArgumentsAsPhp(\DOMElement $node, string $name, string $file`
`502`	`502`	`}`
`503`	`503`	`break;`
`504`	`504`	`case 'tagged':`
`505`		`- @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);`
`506`		`- // no break`
`507`	`505`	`case 'tagged_iterator':`
`508`	`506`	`case 'tagged_locator':`
`509`	`507`	`$type = $arg->getAttribute('type');`
Original file line number	Diff line number	Diff line change
`@@ -742,10 +742,6 @@ private function resolveServices($value, string $file, bool $isParameter = false`
`742`	`742`	`}`
`743`	`743`	`}`
`744`	`744`	`if (\in_array($value->getTag(), ['tagged', 'tagged_iterator', 'tagged_locator'], true)) {`
`745`		`- if ('tagged' === $value->getTag()) {`
`746`		`- @trigger_error('"!tagged" is deprecated since Symfony 4.4 and will be removed in 5.0, use "!tagged_iterator" instead.', E_USER_DEPRECATED);`
`747`		`- }`
`748`		`-`
`749`	`745`	`$forLocator = 'tagged_locator' === $value->getTag();`
`750`	`746`
`751`	`747`	`if (\is_array($argument) && isset($argument['tag']) && $argument['tag']) {`