Re-allow to use "tagged" in service definitions
This commit is contained in:
parent
42be5f8132
commit
7b7dc0df9a
@ -502,8 +502,6 @@ class XmlFileLoader extends FileLoader
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 'tagged':
|
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_iterator':
|
||||||
case 'tagged_locator':
|
case 'tagged_locator':
|
||||||
$type = $arg->getAttribute('type');
|
$type = $arg->getAttribute('type');
|
||||||
|
@ -742,10 +742,6 @@ class YamlFileLoader extends FileLoader
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (\in_array($value->getTag(), ['tagged', 'tagged_iterator', 'tagged_locator'], true)) {
|
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();
|
$forLocator = 'tagged_locator' === $value->getTag();
|
||||||
|
|
||||||
if (\is_array($argument) && isset($argument['tag']) && $argument['tag']) {
|
if (\is_array($argument) && isset($argument['tag']) && $argument['tag']) {
|
||||||
|
@ -265,7 +265,7 @@
|
|||||||
<xsd:enumeration value="constant" />
|
<xsd:enumeration value="constant" />
|
||||||
<xsd:enumeration value="iterator" />
|
<xsd:enumeration value="iterator" />
|
||||||
<xsd:enumeration value="service_locator" />
|
<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" />
|
||||||
<xsd:enumeration value="tagged_iterator" />
|
<xsd:enumeration value="tagged_iterator" />
|
||||||
<xsd:enumeration value="tagged_locator" />
|
<xsd:enumeration value="tagged_locator" />
|
||||||
|
Reference in New Issue
Block a user