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

Commit4366566

Browse files
[DI] Deprecate autowiring-types in favor of aliases
1 parentb4ff1c8 commit4366566

File tree

44 files changed

+199
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+199
-175
lines changed

‎UPGRADE-3.3.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Debug
1414
DependencyInjection
1515
-------------------
1616

17+
* Autoriwing-types have been deprecated, use aliases instead.
18+
1719
* The`Reference` and`Alias` classes do not make service identifiers lowercase anymore.
1820

1921
* Case insensitivity of service identifiers is deprecated and will be removed in 4.0.

‎UPGRADE-4.0.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ Debug
2424
DependencyInjection
2525
-------------------
2626

27+
* Autoriwing-types have been removed, use aliases instead.
28+
2729
* Service identifiers are now case sensitive.
2830

2931
* The`Reference` and`Alias` classes do not make service identifiers lowercase anymore.

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/JsonDescriptor.php‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,9 @@ private function getContainerDefinitionData(Definition $definition, $omitTags =
220220
'shared' =>$definition->isShared(),
221221
'abstract' =>$definition->isAbstract(),
222222
'autowire' =>$definition->isAutowired(),
223-
'autowiring_types' =>array(),
224223
);
225224

226-
foreach ($definition->getAutowiringTypes()as$autowiringType) {
225+
foreach ($definition->getAutowiringTypes(false)as$autowiringType) {
227226
$data['autowiring_types'][] =$autowiringType;
228227
}
229228

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/MarkdownDescriptor.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ protected function describeContainerDefinition(Definition $definition, array $op
185185
."\n".'- Autowired:'.($definition->isAutowired() ?'yes' :'no')
186186
;
187187

188-
foreach ($definition->getAutowiringTypes()as$autowiringType) {
188+
foreach ($definition->getAutowiringTypes(false)as$autowiringType) {
189189
$output .="\n" .'- Autowiring Type: `' .$autowiringType .'`';
190190
}
191191

‎src/Symfony/Bundle/FrameworkBundle/Console/Descriptor/TextDescriptor.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,9 @@ protected function describeContainerDefinition(Definition $definition, array $op
294294
$tableRows[] =array('Abstract',$definition->isAbstract() ?'yes' :'no');
295295
$tableRows[] =array('Autowired',$definition->isAutowired() ?'yes' :'no');
296296

297-
$autowiringTypes =$definition->getAutowiringTypes();
298-
$tableRows[] =array('Autowiring Types',$autowiringTypes ?implode(',',$autowiringTypes) :'-');
297+
if ($autowiringTypes =$definition->getAutowiringTypes(false)) {
298+
$tableRows[] =array('Autowiring Types',implode(',',$autowiringTypes));
299+
}
299300

300301
if ($definition->getFile()) {
301302
$tableRows[] =array('Required File',$definition->getFile() ?$definition->getFile() :'-');

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/TemplatingPass.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public function process(ContainerBuilder $container)
2525
}
2626

2727
if ($container->hasAlias('templating')) {
28-
$definition =$container->findDefinition('templating');
29-
$definition->setAutowiringTypes(array(ComponentEngineInterface::class,FrameworkBundleEngineInterface::class));
28+
$container->setAlias(ComponentEngineInterface::class,'templating');
29+
$container->setAlias(FrameworkBundleEngineInterface::class,'templating');
3030
}
3131

3232
if ($container->hasDefinition('templating.engine.php')) {

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1096,8 +1096,8 @@ private function registerAnnotationsConfiguration(array $config, ContainerBuilde
10961096
->getDefinition('annotations.cached_reader')
10971097
->replaceArgument(1,newReference($cacheService))
10981098
->replaceArgument(2,$config['debug'])
1099-
->addAutowiringType(Reader::class)
11001099
;
1100+
$container->setAlias(Reader::class,newAlias('annotations.cached_reader',false));
11011101
}else {
11021102
$container->removeDefinition('annotations.cached_reader');
11031103
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
66

77
<services>
8-
<serviceid="annotations.reader"class="Doctrine\Common\Annotations\AnnotationReader"public="false">
9-
<autowiring-type>Doctrine\Common\Annotations\Reader</autowiring-type>
10-
</service>
8+
<serviceid="annotations.reader"class="Doctrine\Common\Annotations\AnnotationReader"public="false" />
9+
<serviceid="Doctrine\Common\Annotations\Reader"alias="annotations.reader"public="false" />
1110

1211
<serviceid="annotations.cached_reader"class="Doctrine\Common\Annotations\CachedReader"public="false">
1312
<argumenttype="service"id="annotations.reader" />

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<services>
88
<serviceid="event_dispatcher"class="Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher">
99
<argumenttype="service"id="service_container" />
10-
<autowiring-type>Symfony\Component\EventDispatcher\EventDispatcherInterface</autowiring-type>
11-
<autowiring-type>Symfony\Component\EventDispatcher\EventDispatcher</autowiring-type>
1210
</service>
11+
<serviceid="Symfony\Component\EventDispatcher\EventDispatcherInterface"alias="event_dispatcher" />
12+
<serviceid="Symfony\Component\EventDispatcher\EventDispatcher"alias="event_dispatcher" />
1313

1414
<serviceid="http_kernel"class="Symfony\Component\HttpKernel\HttpKernel">
1515
<argumenttype="service"id="event_dispatcher" />
@@ -40,10 +40,9 @@
4040
<argumenttype="collection" />
4141
</service>
4242

43-
<serviceid="service_container"synthetic="true">
44-
<autowiring-type>Symfony\Component\DependencyInjection\ContainerInterface</autowiring-type>
45-
<autowiring-type>Symfony\Component\DependencyInjection\Container</autowiring-type>
46-
</service>
43+
<serviceid="service_container"synthetic="true" />
44+
<serviceid="Symfony\Component\DependencyInjection\ContainerInterface"alias="service_container" />
45+
<serviceid="Symfony\Component\DependencyInjection\Container"alias="service_container" />
4746

4847
<serviceid="kernel"synthetic="true" />
4948

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@
1717
<callmethod="setConfigCacheFactory">
1818
<argumenttype="service"id="config_cache_factory" />
1919
</call>
20-
21-
<autowiring-type>Symfony\Component\Translation\TranslatorInterface</autowiring-type>
2220
</service>
21+
<serviceid="Symfony\Component\Translation\TranslatorInterface"alias="translator.default" />
2322

2423
<serviceid="translator.logging"class="Symfony\Component\Translation\LoggingTranslator"public="false">
2524
<argumenttype="service"id="translator.logging.inner" />

0 commit comments

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