Add support for the short syntax

dunglas · dunglas · commit b8c0e7cff898 · 2017-01-24T00:16:24.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -226,6 +226,22 @@ private function parseDefaults(array &$content, $file)
         return $defaults;
     }
 
+    /**
+     * @param array $service
+     *
+     * @return bool
+     */
+    private function isUsingShortSyntax(array $service)
+    {
+        foreach (static::$keywords as $keyword) {
+            if (array_key_exists($keyword, $service)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
     /**
      * Parses a definition.
      *
@@ -245,7 +261,7 @@ private function parseDefinition($id, $service, $file, array $defaults)
             return;
         }
 
-        if (is_array($service) && array_values($service) === $service) {
+        if (is_array($service) && $this->isUsingShortSyntax($service)) {
             $service = array('arguments' => $service);
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services33.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services33.yml
@@ -1,3 +1,7 @@
 services:
-    Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy:
-        arguments: { apiKey: ABCD }
+    Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy: { apiKey: ABCD }
+
+    another_one:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\NamedArgumentsDummy
+        arguments:
+            apiKey: ABCD
