[DI] Code review changes

jschaedl · jschaedl · commit b5bbb9832342 · 2019-04-30T12:35:54.000+02:00
diff --git a/UPGRADE-4.4.md b/UPGRADE-4.4.md
@@ -0,0 +1,27 @@
+UPGRADE FROM 4.3 to 4.4
+=======================
+
+DependencyInjection
+-------------------
+
+ * Deprecated tag `tagged` in favour of `tagged_iterator`
+
+   Before:
+   ```yaml
+   services:
+       App\Handler:
+           tags: ['app.handler']
+   
+       App\HandlerCollection:
+           arguments: [!tagged app.handler]
+   ```
+
+   After:
+   ```yaml
+   services:
+       App\Handler:
+       tags: ['app.handler']
+    
+   App\HandlerCollection:
+       arguments: [!tagged_iterator app.handler]
+   ```
diff --git a/src/Symfony/Component/DependencyInjection/CHANGELOG.md b/src/Symfony/Component/DependencyInjection/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+4.4.0
+-----
+
+ * deprecated tag `tagged` in favour of `tagged_iterator`
+
 4.3.0
 -----
 
@@ -16,7 +21,6 @@ CHANGELOG
  * made `ServiceLocator` implement `ServiceProviderInterface`
  * deprecated support for non-string default env() parameters
  * added `%env(require:...)%` processor to `require()` a PHP file and use the value returned from it
- * deprecated tag `tagged` in favour of `tagged_iterator`
  
 4.2.0
 -----
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php
@@ -116,11 +116,11 @@ function iterator(array $values): IteratorArgument
 /**
  * Creates a lazy iterator by tag name.
  *
- * @deprecated "tagged" tag is deprecated and will be removed in Symfony 5. Please use "tagged_iterator"
+ * @deprecated Function "tagged" is deprecated since Symfony 4.4, use "tagged_iterator" instead.
  */
 function tagged(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null): TaggedIteratorArgument
 {
-    @trigger_error('"tagged" tag is deprecated and will be removed in Symfony 5. Please use "tagged_iterator"', E_USER_DEPRECATED);
+    @trigger_error(sprintf('Function "%s" is deprecated since Symfony 4.4, use "tagged_iterator" instead.', __METHOD__), E_USER_DEPRECATED);
 
     return new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod);
 }
diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -546,13 +546,9 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase =
                     break;
                 case 'tagged':
                 case 'tagged_iterator':
+                    @trigger_error(sprintf('Type "%s" of Tag <%s> in "%s" is deprecated since Symfony 4.4, use "tagged_iterator" instead.', $arg->getAttribute('type'), $name, $file), E_USER_DEPRECATED);
                 case 'tagged_locator':
                     $type = $arg->getAttribute('type');
-
-                    if ('tagged' === $type) {
-                        @trigger_error(sprintf('Type "%s" of Tag <%s> in "%s" is deprecated and will be removed in Symfony 5. Please use "tagged_iterator"', $type, $name, $file), E_USER_DEPRECATED);
-                    }
-
                     $forLocator = 'tagged_locator' === $type;
 
                     if (!$arg->getAttribute('tag')) {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -726,7 +726,7 @@ private function resolveServices($value, $file, $isParameter = false)
             }
             if (\in_array($value->getTag(), ['tagged', 'tagged_iterator', 'tagged_locator'], true)) {
                 if ('tagged' === $value->getTag()) {
-                    @trigger_error('"!tagged" tag is deprecated and will be removed in Symfony 5. Please use "!tagged_iterator"', E_USER_DEPRECATED);
+                    @trigger_error('"!tagged" is deprecated since Symfony 4.4, use "!tagged_iterator" instead.', E_USER_DEPRECATED);
                 }
 
                 $forLocator = 'tagged_locator' === $value->getTag();

Original file line number	Diff line number	Diff line change
`@@ -116,11 +116,11 @@ function iterator(array $values): IteratorArgument`
`116`	`116`	`/**`
`117`	`117`	`* Creates a lazy iterator by tag name.`
`118`	`118`	`*`
`119`		`- * @deprecated "tagged" tag is deprecated and will be removed in Symfony 5. Please use "tagged_iterator"`
	`119`	`+ * @deprecated Function "tagged" is deprecated since Symfony 4.4, use "tagged_iterator" instead.`
`120`	`120`	`*/`
`121`	`121`	`function tagged(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null): TaggedIteratorArgument`
`122`	`122`	`{`
`123`		`- @trigger_error('"tagged" tag is deprecated and will be removed in Symfony 5. Please use "tagged_iterator"', E_USER_DEPRECATED);`
	`123`	`+ @trigger_error(sprintf('Function "%s" is deprecated since Symfony 4.4, use "tagged_iterator" instead.', __METHOD__), E_USER_DEPRECATED);`
`124`	`124`
`125`	`125`	`return new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod);`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -726,7 +726,7 @@ private function resolveServices($value, $file, $isParameter = false)`
`726`	`726`	`}`
`727`	`727`	`if (\in_array($value->getTag(), ['tagged', 'tagged_iterator', 'tagged_locator'], true)) {`
`728`	`728`	`if ('tagged' === $value->getTag()) {`
`729`		`- @trigger_error('"!tagged" tag is deprecated and will be removed in Symfony 5. Please use "!tagged_iterator"', E_USER_DEPRECATED);`
	`729`	`+ @trigger_error('"!tagged" is deprecated since Symfony 4.4, use "!tagged_iterator" instead.', E_USER_DEPRECATED);`
`730`	`730`	`}`
`731`	`731`
`732`	`732`	`$forLocator = 'tagged_locator' === $value->getTag();`