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

Commit05f24d5

Browse files
ogizanaginicolas-grekas
authored andcommitted
[DI] Add "defaults" tag to XML services configuration
1 parent7b4a18b commit05f24d5

File tree

5 files changed

+149
-6
lines changed

5 files changed

+149
-6
lines changed

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

Lines changed: 64 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,28 +118,74 @@ private function parseDefinitions(\DOMDocument $xml, $file)
118118
}
119119

120120
foreach ($servicesas$service) {
121-
if (null !==$definition =$this->parseDefinition($service,$file)) {
121+
if (null !==$definition =$this->parseDefinition($service,$file,$this->getServiceDefaults($xml,$file))) {
122122
$this->container->setDefinition((string)$service->getAttribute('id'),$definition);
123123
}
124124
}
125125
}
126126

127+
/**
128+
* Get service defaults.
129+
*
130+
* @return array
131+
*/
132+
privatefunctiongetServiceDefaults(\DOMDocument$xml,$file)
133+
{
134+
$xpath =new \DOMXPath($xml);
135+
$xpath->registerNamespace('container',self::NS);
136+
137+
if (null ===$defaultsNode =$xpath->query('//container:services/container:defaults')->item(0)) {
138+
returnarray();
139+
}
140+
$defaults =array(
141+
'tags' =>$this->getChildren($defaultsNode,'tag'),
142+
'autowire' =>$this->getChildren($defaultsNode,'autowire'),
143+
);
144+
145+
foreach ($defaults['tags']as$tag) {
146+
if ('' ===$tag->getAttribute('name')) {
147+
thrownewInvalidArgumentException(sprintf('The tag name for tag "<defaults>" in %s must be a non-empty string.',$file));
148+
}
149+
}
150+
if ($defaultsNode->hasAttribute('public')) {
151+
$defaults['public'] = XmlUtils::phpize($defaultsNode->getAttribute('public'));
152+
}
153+
if (!$defaultsNode->hasAttribute('autowire')) {
154+
foreach ($defaults['autowire']as$k =>$v) {
155+
$defaults['autowire'][$k] =$v->textContent;
156+
}
157+
158+
return$defaults;
159+
}
160+
if ($defaults['autowire']) {
161+
thrownewInvalidArgumentException(sprintf('The "autowire" attribute cannot be used together with "<autowire>" tags for tag "<defaults>" in %s.',$file));
162+
}
163+
if (XmlUtils::phpize($defaultsNode->getAttribute('autowire'))) {
164+
$defaults['autowire'][] ='__construct';
165+
}
166+
167+
return$defaults;
168+
}
169+
127170
/**
128171
* Parses an individual Definition.
129172
*
130173
* @param \DOMElement $service
131174
* @param string $file
175+
* @param array $defaults
132176
*
133177
* @return Definition|null
134178
*/
135-
privatefunctionparseDefinition(\DOMElement$service,$file)
179+
privatefunctionparseDefinition(\DOMElement$service,$file,array$defaults =array())
136180
{
137181
if ($alias =$service->getAttribute('alias')) {
138182
$this->validateAlias($service,$file);
139183

140184
$public =true;
141185
if ($publicAttr =$service->getAttribute('public')) {
142186
$public = XmlUtils::phpize($publicAttr);
187+
}elseif (isset($defaults['public'])) {
188+
$public =$defaults['public'];
143189
}
144190
$this->container->setAlias((string)$service->getAttribute('id'),newAlias($alias,$public));
145191

@@ -148,11 +194,18 @@ private function parseDefinition(\DOMElement $service, $file)
148194

149195
if ($parent =$service->getAttribute('parent')) {
150196
$definition =newChildDefinition($parent);
197+
$defaults =array();
151198
}else {
152199
$definition =newDefinition();
153200
}
154201

155-
foreach (array('class','shared','public','synthetic','lazy','abstract')as$key) {
202+
if ($publicAttr =$service->getAttribute('public')) {
203+
$definition->setPublic(XmlUtils::phpize($publicAttr));
204+
}elseif (isset($defaults['public'])) {
205+
$definition->setPublic($defaults['public']);
206+
}
207+
208+
foreach (array('class','shared','synthetic','lazy','abstract')as$key) {
156209
if ($value =$service->getAttribute($key)) {
157210
$method ='set'.$key;
158211
$definition->$method(XmlUtils::phpize($value));
@@ -216,7 +269,12 @@ private function parseDefinition(\DOMElement $service, $file)
216269
$definition->addMethodCall($call->getAttribute('method'),$this->getArgumentsAsPhp($call,'argument'));
217270
}
218271

219-
foreach ($this->getChildren($service,'tag')as$tag) {
272+
$tags =$this->getChildren($service,'tag');
273+
if (!$tags && !empty($defaults['tags'])) {
274+
$tags =$defaults['tags'];
275+
}
276+
277+
foreach ($tagsas$tag) {
220278
$parameters =array();
221279
foreach ($tag->attributesas$name =>$node) {
222280
if ('name' ===$name) {
@@ -252,6 +310,8 @@ private function parseDefinition(\DOMElement $service, $file)
252310
}
253311

254312
$definition->setAutowiredMethods($autowireTags);
313+
}elseif (!$service->hasAttribute('autowire') && !empty($defaults['autowire'])) {
314+
$definition->setAutowiredMethods($defaults['autowire']);
255315
}
256316

257317
if ($value =$service->getAttribute('decorates')) {

‎src/Symfony/Component/DependencyInjection/Loader/schema/dic/services/services-1.0.xsd‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@
5252
Enclosing element for the definition of all services
5353
]]></xsd:documentation>
5454
</xsd:annotation>
55-
<xsd:choiceminOccurs="1"maxOccurs="unbounded">
56-
<xsd:elementname="service"type="service" />
55+
<xsd:choicemaxOccurs="unbounded">
56+
<xsd:elementname="service"type="service"minOccurs="1" />
57+
<xsd:elementname="defaults"type="defaults"minOccurs="0"maxOccurs="1" />
5758
</xsd:choice>
5859
</xsd:complexType>
5960

@@ -89,6 +90,20 @@
8990
<xsd:attributename="function"type="xsd:string" />
9091
</xsd:complexType>
9192

93+
<xsd:complexTypename="defaults">
94+
<xsd:annotation>
95+
<xsd:documentation><![CDATA[
96+
Enclosing element for the service definitions' defaults for the current file
97+
]]></xsd:documentation>
98+
</xsd:annotation>
99+
<xsd:choicemaxOccurs="unbounded">
100+
<xsd:elementname="tag"type="tag"minOccurs="0"maxOccurs="unbounded" />
101+
<xsd:elementname="autowire"type="xsd:string"minOccurs="0"maxOccurs="unbounded" />
102+
</xsd:choice>
103+
<xsd:attributename="public"type="boolean" />
104+
<xsd:attributename="autowire"type="boolean" />
105+
</xsd:complexType>
106+
92107
<xsd:complexTypename="service">
93108
<xsd:choicemaxOccurs="unbounded">
94109
<xsd:elementname="file"type="xsd:string"minOccurs="0"maxOccurs="1" />
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<containerxmlns="http://symfony.com/schema/dic/services"xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
3+
<services>
4+
<defaultspublic="false"autowire="true">
5+
<tagname="foo" />
6+
</defaults>
7+
8+
<serviceid="with_defaults"class="Foo" />
9+
<serviceid="no_defaults"class="Foo"public="true"autowire="false">
10+
<tagname="bar" />
11+
</service>
12+
<serviceid="no_defaults_child"class="Foo"parent="no_defaults">
13+
<tagname="bar" />
14+
</service>
15+
<serviceid="with_defaults_child"class="Foo"parent="with_defaults" />
16+
</services>
17+
</container>
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<containerxmlns="http://symfony.com/schema/dic/services"xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
3+
<services>
4+
<defaultspublic="false">
5+
<autowire>__construct</autowire>
6+
</defaults>
7+
8+
<serviceid="with_defaults"class="Foo" />
9+
<serviceid="no_defaults"class="Foo"public="true">
10+
<autowire>setFoo</autowire>
11+
</service>
12+
<serviceid="no_defaults_child"class="Foo"parent="no_defaults">
13+
<autowire>setFoo</autowire>
14+
</service>
15+
<serviceid="with_defaults_child"class="Foo"parent="with_defaults" />
16+
</services>
17+
</container>

‎src/Symfony/Component/DependencyInjection/Tests/Loader/XmlFileLoaderTest.php‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -617,4 +617,38 @@ public function testArgumentWithKeyOutsideCollection()
617617

618618
$this->assertSame(array('type' =>'foo','bar'),$container->getDefinition('foo')->getArguments());
619619
}
620+
621+
publicfunctiontestDefaults()
622+
{
623+
$container =newContainerBuilder();
624+
$loader =newXmlFileLoader($container,newFileLocator(self::$fixturesPath.'/xml'));
625+
$loader->load('services29.xml');
626+
627+
$this->assertFalse($container->getDefinition('with_defaults')->isPublic());
628+
$this->assertTrue($container->getDefinition('no_defaults')->isPublic());
629+
$this->assertTrue($container->getDefinition('no_defaults_child')->isPublic());
630+
$this->assertArrayNotHasKey('public',$container->getDefinition('no_defaults_child')->getChanges());
631+
632+
$this->assertSame(array('foo' =>array(array())),$container->getDefinition('with_defaults')->getTags());
633+
$this->assertSame(array('bar' =>array(array())),$container->getDefinition('no_defaults')->getTags());
634+
$this->assertSame(array('bar' =>array(array())),$container->getDefinition('no_defaults_child')->getTags());
635+
$this->assertSame(array(),$container->getDefinition('with_defaults_child')->getTags());
636+
637+
$this->assertTrue($container->getDefinition('with_defaults')->isAutowired());
638+
$this->assertFalse($container->getDefinition('no_defaults')->isAutowired());
639+
$this->assertFalse($container->getDefinition('no_defaults_child')->isAutowired());
640+
$this->assertArrayNotHasKey('autowire',$container->getDefinition('no_defaults_child')->getChanges());
641+
}
642+
643+
publicfunctiontestDefaultsWithAutowiredMethods()
644+
{
645+
$container =newContainerBuilder();
646+
$loader =newXmlFileLoader($container,newFileLocator(self::$fixturesPath.'/xml'));
647+
$loader->load('services30.xml');
648+
649+
$this->assertSame(array('__construct'),$container->getDefinition('with_defaults')->getAutowiredMethods());
650+
$this->assertSame(array('setFoo'),$container->getDefinition('no_defaults')->getAutowiredMethods());
651+
$this->assertSame(array('setFoo'),$container->getDefinition('no_defaults_child')->getAutowiredMethods());
652+
$this->assertSame(array(),$container->getDefinition('with_defaults_child')->getAutowiredMethods());
653+
}
620654
}

0 commit comments

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