diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-allow to use "tagged" in service definitions

Browse Source
This commit is contained in:
Kévin Dunglas 2019-10-29 15:09:41 +01:00
parent 42be5f8132
commit 7b7dc0df9a
No known key found for this signature in database
GPG Key ID: 4D04EBEF06AAF3A6
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
View File

@ -502,8 +502,6 @@ class XmlFileLoader extends FileLoader
}
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');

4
src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
View File

@ -742,10 +742,6 @@ class YamlFileLoader extends FileLoader
}
}
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']) {

2
src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd
View File

@ -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" />