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

Commit83b599c

Browse files
committed
[DI] Add Yaml syntax for short services definition
1 parentf8b02ed commit83b599c

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,10 @@ private function parseDefinition($id, $service, $file, array $defaults)
229229
return;
230230
}
231231

232+
if (is_array($service) &&array_values($service) ===$service) {
233+
$service =array('arguments' =>$service);
234+
}
235+
232236
if (null ===$service) {
233237
$service =array();
234238
}

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services28.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,5 @@ services:
3939
alias:with_defaults
4040

4141
with_defaults_aliased_short:'@with_defaults'
42+
43+
with_shortcut_args:[foo]

‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ services:
3939
new_factory1:{ class: FooBarClass, factory: factory}
4040
new_factory2:{ class: FooBarClass, factory: ['@baz', getClass]}
4141
new_factory3:{ class: FooBarClass, factory: [BazClass, getInstance]}
42+
with_shortcut_args:[foo, '@baz']

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ public function testLoadServices()
153153
$this->assertEquals('factory',$services['new_factory1']->getFactory(),'->load() parses the factory tag');
154154
$this->assertEquals(array(newReference('baz'),'getClass'),$services['new_factory2']->getFactory(),'->load() parses the factory tag');
155155
$this->assertEquals(array('BazClass','getInstance'),$services['new_factory3']->getFactory(),'->load() parses the factory tag');
156+
$this->assertEquals(array('foo',newReference('baz')),$services['with_shortcut_args']->getArguments(),'->load() parses short service definition');
156157

157158
$aliases =$container->getAliases();
158159
$this->assertTrue(isset($aliases['alias_for_foo']),'->load() parses aliases');
@@ -383,6 +384,10 @@ public function testDefaults()
383384
$this->assertArrayNotHasKey('public',$container->getDefinition('no_defaults_child')->getChanges());
384385
$this->assertArrayNotHasKey('autowire',$container->getDefinition('no_defaults_child')->getChanges());
385386

387+
$this->assertFalse($container->getDefinition('with_shortcut_args')->isPublic());
388+
$this->assertSame(array('foo' =>array(array())),$container->getDefinition('with_shortcut_args')->getTags());
389+
$this->assertTrue($container->getDefinition('with_shortcut_args')->isAutowired());
390+
386391
$container->compile();
387392

388393
$this->assertTrue($container->getDefinition('with_null')->isPublic());

0 commit comments

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