feature #21214 [DI] Allow ~ instead of {} for services in Yaml (wouterj)

fabpot · fabpot · commit 5f4ba3199ca6 · 2017-01-09T06:01:23.000-08:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DI] Allow ~ instead of {} for services in Yaml | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Now we can omit the class name, Yaml config can look like this: ```yaml services: AppBundle\Something: {} ``` While this works, the consistent way in Symfony for such cases is to use `~`. This PR allows to use `~` as well, ending up with: ```yaml services: AppBundle\Something: ~ ``` Commits ------- 28a1b5a Allow setting services as null
diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php
@@ -220,6 +220,10 @@ private function parseDefinition($id, $service, $file, array $defaults)
             return;
         }
 
+        if (null === $service) {
+            $service = array();
+        }
+
         if (!is_array($service)) {
             throw new InvalidArgumentException(sprintf('A service definition must be an array or a string starting with "@" but %s found for service "%s" in %s. Check your YAML syntax.', gettype($service), $id, $file));
         }
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services28.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services28.yml
@@ -5,6 +5,8 @@ services:
         tags:
             - name: foo
 
+    Acme\Foo: ~
+
     with_defaults:
         class: Foo
 

Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,10 @@ private function parseDefinition($id, $service, $file, array $defaults)`
`220`	`220`	`return;`
`221`	`221`	`}`
`222`	`222`
	`223`	`+ if (null === $service) {`
	`224`	`+ $service = array();`
	`225`	`+ }`
	`226`	`+`
`223`	`227`	`if (!is_array($service)) {`
`224`	`228`	`throw new InvalidArgumentException(sprintf('A service definition must be an array or a string starting with "@" but %s found for service "%s" in %s. Check your YAML syntax.', gettype($service), $id, $file));`
`225`	`229`	`}`