8000 [DI] Code review changes · symfony/symfony@6cd7c47 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6cd7c47

Browse files
jschaedljschaedl
committed
[DI] Code review changes
1 parent b77754e commit 6cd7c47

File tree

5 files changed

+36
-9
lines changed

5 files changed

+36
-9
lines changed

‎UPGRADE-4.4.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
UPGRADE FROM 4.3 to 4.4
2+
=======================
3+
4+
DependencyInjection
5+
-------------------
6+
7+
* Deprecated tag `tagged` in favour of `tagged_iterator`
8+
9+
Before:
10+
```yaml
11+
services:
12+
App\Handler:
13+
tags: ['app.handler']
14+
15+
App\HandlerCollection:
16+
arguments: [!tagged app.handler]
17+
```
18+
19+
After:
20+
```yaml
21+
services:
22+
App\Handler:
23+
tags: ['app.handler']
24+
25+
App\HandlerCollection:
26+
arguments: [!tagged_iterator app.handler]
27+
```

‎src/Symfony/Component/DependencyInjection/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
CHANGELOG
22
=========
33

4+
4.4.0
5+
-----
6+
7+
* deprecated tag `tagged` in favour of `tagged_iterator`
8+
49
4.3.0
510
-----
611

@@ -16,7 +21,6 @@ CHANGELOG
1621
* made `ServiceLocator` implement `ServiceProviderInterface`
1722
* deprecated support for non-string default env() parameters
1823
* added `%env(require:...)%` processor to `require()` a PHP file and use the value returned from it
19-
* deprecated tag `tagged` in favour of `tagged_iterator`
2024

2125
4.2.0
2226
-----

‎src/Symfony/Component/DependencyInjection/Loader/Configurator/ContainerConfigurator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,11 @@ function iterator(array $values): IteratorArgument
116116
/**
117117
* Creates a lazy iterator by tag name.
118118
*
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.
120120
*/
121121
function tagged(string $tag, string $indexAttribute = null, string $defaultIndexMethod = null): TaggedIteratorArgument
122122
{
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);
124124

125125
return new TaggedIteratorArgument($tag, $indexAttribute, $defaultIndexMethod);
126126
}

‎src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -546,13 +546,9 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase =
546546
break;
547547
case 'tagged':
548548
case 'tagged_iterator':
549+
@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);
549550
case 'tagged_locator':
550551
$type = $arg->getAttribute('type');
551-
552-
if ('tagged' === $type) {
553-
@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);
554-
}
555-
556552
$forLocator = 'tagged_locator' === $type;
557553

558554
if (!$arg->getAttribute('tag')) {

‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ private function resolveServices($value, $file, $isParameter = false)
726726
}
727727
if (\in_array($value->getTag(), ['tagged', 'tagged_iterator', 'tagged_locator'], true)) {
728728
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);
730730
}
731731

732732
$forLocator = 'tagged_locator' === $value->getTag();

0 commit comments

Comments
 (0)
0