symfony
diff --git a/‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+9-2Lines changed: 9 additions & 2 deletions b/‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
+9-2Lines changed: 9 additions & 2 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services21.yml
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services21.yml
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions
diff --git a/‎src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+12Lines changed: 12 additions & 0 deletions b/‎src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
+12Lines changed: 12 additions & 0 deletions
@@ -237,8 +237,15 @@ private function parseDefinition($id, $service, $file)
             }
 
             foreach ($service['calls'] as $call) {
-                $args = isset($call[1]) ? $this->resolveServices($call[1]) : array();
-                $definition->addMethodCall($call[0], $args);
+                if (isset($call['method'])) {
+                    $method = $call['method'];
+                    $args = isset($call['arguments']) ? $this->resolveServices($call['arguments']) : array();
+                } else {
+                    $method = $call[0];
+                    $args = isset($call[1]) ? $this->resolveServices($call[1]) : array();
+                }
+
+                $definition->addMethodCall($method, $args);
             }
         }
 
 
@@ -0,0 +1,15 @@
+services:
+    manager:
+        class: UserManager
+        arguments:
+          - true
+        calls:
+          - method: setLogger
+            arguments:
+              - @logger
+          - method: setClass
+            arguments:
+              - User
+        tags:
+          - name: manager
+            alias: user
@@ -270,4 +270,16 @@ public function testTagWithAttributeArrayThrowsException()
             $this->assertStringStartsWith('A "tags" attribute must be of a scalar-type for service "foo_service", tag "foo", attribute "bar"', $e->getMessage(), '->load() throws an InvalidArgumentException if a tag-attribute is not a scalar');
         }
     }
+
+    public function testLoadYamlOnlyWithKeys()
+    {
+        $container = new ContainerBuilder();
+        $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));
+        $loader->load('services21.yml');
+
+        $definition = $container->getDefinition('manager');
+        $this->assertEquals(array(array('setLogger', array(new Reference('logger'))), array('setClass', array('User'))), $definition->getMethodCalls());
+        $this->assertEquals(array(true), $definition->getArguments());
+        $this->assertEquals(array('manager' => array(array('alias' => 'user'))), $definition->getTags());
+    }
 }
Original file line number	Diff line number	Diff line change
`@@ -237,8 +237,15 @@ private function parseDefinition($id, $service, $file)`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`foreach ($service['calls'] as $call) {`
`240`		`- $args = isset($call[1]) ? $this->resolveServices($call[1]) : array();`
`241`		`- $definition->addMethodCall($call[0], $args);`
	`240`	`+ if (isset($call['method'])) {`
	`241`	`+ $method = $call['method'];`
	`242`	`+ $args = isset($call['arguments']) ? $this->resolveServices($call['arguments']) : array();`
	`243`	`+ } else {`
	`244`	`+ $method = $call[0];`
	`245`	`+ $args = isset($call[1]) ? $this->resolveServices($call[1]) : array();`
	`246`	`+ }`
	`247`	`+`
	`248`	`+ $definition->addMethodCall($method, $args);`
`242`	`249`	`}`
`243`	`250`	`}`
`244`	`251`
Original file line number	Diff line number	Diff line change
`@@ -270,4 +270,16 @@ public function testTagWithAttributeArrayThrowsException()`
`270`	`270`	`$this->assertStringStartsWith('A "tags" attribute must be of a scalar-type for service "foo_service", tag "foo", attribute "bar"', $e->getMessage(), '->load() throws an InvalidArgumentException if a tag-attribute is not a scalar');`
`271`	`271`	`}`
`272`	`272`	`}`
	`273`	`+`
	`274`	`+ public function testLoadYamlOnlyWithKeys()`
	`275`	`+ {`
	`276`	`+ $container = new ContainerBuilder();`
	`277`	`+ $loader = new YamlFileLoader($container, new FileLocator(self::$fixturesPath.'/yaml'));`
	`278`	`+ $loader->load('services21.yml');`
	`279`	`+`
	`280`	`+ $definition = $container->getDefinition('manager');`
	`281`	`+ $this->assertEquals(array(array('setLogger', array(new Reference('logger'))), array('setClass', array('User'))), $definition->getMethodCalls());`
	`282`	`+ $this->assertEquals(array(true), $definition->getArguments());`
	`283`	`+ $this->assertEquals(array('manager' => array(array('alias' => 'user'))), $definition->getTags());`
	`284`	`+ }`
`273`	`285`	`}`