Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitab8fb18

Browse files
jschaedlnicolas-grekas
authored andcommitted
[DI] deprecates tag !tagged in favor of !tagged_iterator
1 parent8e5b657 commitab8fb18

File tree

20 files changed

+80
-16
lines changed

20 files changed

+80
-16
lines changed

‎UPGRADE-4.4.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,27 @@ DependencyInjection
2424
my_service:
2525
factory:['@factory_service', method]
2626
```
27+
* Deprecated`tagged` in favor of `tagged_iterator`
28+
29+
Before:
30+
```yaml
31+
services:
32+
App\Handler:
33+
tags: ['app.handler']
34+
35+
App\HandlerCollection:
36+
arguments: [!tagged app.handler]
37+
```
38+
39+
After:
40+
```yaml
41+
services:
42+
App\Handler:
43+
tags: ['app.handler']
44+
45+
App\HandlerCollection:
46+
arguments: [!tagged_iterator app.handler]
47+
```
2748

2849
MonologBridge
2950
--------------

‎UPGRADE-5.0.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,27 @@ DependencyInjection
8484
my_service:
8585
factory:['@factory_service', method]
8686
```
87+
* Removed`tagged` in favor of `tagged_iterator`
88+
89+
Before:
90+
```yaml
91+
services:
92+
App\Handler:
93+
tags: ['app.handler']
94+
95+
App\HandlerCollection:
96+
arguments: [!tagged app.handler]
97+
```
98+
99+
After:
100+
```yaml
101+
services:
102+
App\Handler:
103+
tags: ['app.handler']
104+
105+
App\HandlerCollection:
106+
arguments: [!tagged_iterator app.handler]
107+
```
87108

88109
DoctrineBridge
89110
--------------

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/messenger.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
<!-- transports-->
6363
<serviceid="messenger.transport_factory"class="Symfony\Component\Messenger\Transport\TransportFactory">
64-
<argumenttype="tagged"tag="messenger.transport_factory" />
64+
<argumenttype="tagged_iterator"tag="messenger.transport_factory" />
6565
</service>
6666

6767
<serviceid="messenger.transport.amqp.factory"class="Symfony\Component\Messenger\Transport\AmqpExt\AmqpTransportFactory">

‎src/Symfony/Bundle/FrameworkBundle/Resources/config/services.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@
7070
<serviceid="Symfony\Component\HttpFoundation\UrlHelper"alias="url_helper" />
7171

7272
<serviceid="cache_warmer"class="Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerAggregate"public="true">
73-
<argumenttype="tagged"tag="kernel.cache_warmer" />
73+
<argumenttype="tagged_iterator"tag="kernel.cache_warmer" />
7474
<argument>%kernel.debug%</argument>
7575
<argument>%kernel.cache_dir%/%kernel.container_class%Deprecations.log</argument>
7676
</service>
7777

7878
<serviceid="cache_clearer"class="Symfony\Component\HttpKernel\CacheClearer\ChainCacheClearer"public="true">
79-
<argumenttype="tagged"tag="kernel.cache_clearer" />
79+
<argumenttype="tagged_iterator"tag="kernel.cache_clearer" />
8080
</service>
8181

8282
<serviceid="kernel"synthetic="true"public="true" />
@@ -99,7 +99,7 @@
9999
</service>
100100

101101
<serviceid="config_cache_factory"class="Symfony\Component\Config\ResourceCheckerConfigCacheFactory">
102-
<argumenttype="tagged"tag="config_cache.resource_checker" />
102+
<argumenttype="tagged_iterator"tag="config_cache.resource_checker" />
103103
</service>
104104

105105
<serviceid="dependency_injection.config.container_parameters_resource_checker"class="Symfony\Component\DependencyInjection\Config\ContainerParametersResourceChecker">

‎src/Symfony/Bundle/FrameworkBundle/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"ext-xml":"*",
2121
"symfony/cache":"^4.3|^5.0",
2222
"symfony/config":"^4.2|^5.0",
23-
"symfony/dependency-injection":"^4.3|^5.0",
23+
"symfony/dependency-injection":"^4.4|^5.0",
2424
"symfony/http-foundation":"^4.3|^5.0",
2525
"symfony/http-kernel":"^4.3|^5.0",
2626
"symfony/polyfill-mbstring":"~1.0",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ CHANGELOG
55
-----
66

77
* deprecated support for short factories and short configurators in Yaml
8+
* deprecated`tagged` in favor of`tagged_iterator`
89

910
4.3.0
1011
-----

‎src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ private function convertParameters(array $parameters, $type, \DOMElement $parent
287287
$element->setAttribute('type','collection');
288288
$this->convertParameters($value,$type,$element,'key');
289289
}elseif ($valueinstanceof TaggedIteratorArgument || ($valueinstanceof ServiceLocatorArgument &&$tag =$value->getTaggedIteratorArgument())) {
290-
$element->setAttribute('type',$valueinstanceof TaggedIteratorArgument ?'tagged' :'tagged_locator');
290+
$element->setAttribute('type',$valueinstanceof TaggedIteratorArgument ?'tagged_iterator' :'tagged_locator');
291291
$element->setAttribute('tag',$tag->getTag());
292292

293293
if (null !==$tag->getIndexAttribute()) {

‎src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ private function dumpValue($value)
248248
}
249249
}
250250

251-
returnnewTaggedValue($valueinstanceof TaggedIteratorArgument ?'tagged' :'tagged_locator',$content);
251+
returnnewTaggedValue($valueinstanceof TaggedIteratorArgument ?'tagged_iterator' :'tagged_locator',$content);
252252
}
253253

254254
if ($valueinstanceof IteratorArgument) {

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,20 @@ function iterator(array $values): IteratorArgument
115115

116116
/**
117117
* Creates a lazy iterator by tag name.
118+
*
119+
* @deprecated since Symfony 4.4, to be removed in 5.0, use "tagged_iterator" instead.
118120
*/
119121
functiontagged(string$tag,string$indexAttribute =null,string$defaultIndexMethod =null):TaggedIteratorArgument
122+
{
123+
@trigger_error(__NAMESPACE__.'\tagged() is deprecated since Symfony 4.4 and will be removed in 5.0, use'.__NAMESPACE__.'\tagged_iterator() instead.',E_USER_DEPRECATED);
124+
125+
returnnewTaggedIteratorArgument($tag,$indexAttribute,$defaultIndexMethod);
126+
}
127+
128+
/**
129+
* Creates a lazy iterator by tag name.
130+
*/
131+
functiontagged_iterator(string$tag,string$indexAttribute =null,string$defaultIndexMethod =null):TaggedIteratorArgument
120132
{
121133
returnnewTaggedIteratorArgument($tag,$indexAttribute,$defaultIndexMethod);
122134
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,9 @@ private function getArgumentsAsPhp(\DOMElement $node, $name, $file, $lowercase =
545545
}
546546
break;
547547
case'tagged':
548+
@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);
549+
// no break
550+
case'tagged_iterator':
548551
case'tagged_locator':
549552
$type =$arg->getAttribute('type');
550553
$forLocator ='tagged_locator' ===$type;

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp