fixed YAML files missing quotes when a string starts with @

fabpot · fabpot · commit e36fea8a6331 · 2015-10-26T13:58:42.000+01:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Fragment/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Fragment/routing.yml
@@ -1,2 +1,2 @@
 _fragmenttest_bundle:
-    resource: @TestBundle/Resources/config/routing.yml
+    resource: '@TestBundle/Resources/config/routing.yml'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Profiler/routing.yml
@@ -1,2 +1,2 @@
 _sessiontest_bundle:
-    resource: @TestBundle/Resources/config/routing.yml
+    resource: '@TestBundle/Resources/config/routing.yml'
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/routing.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/Session/routing.yml
@@ -1,2 +1,2 @@
 _sessiontest_bundle:
-    resource: @TestBundle/Resources/config/routing.yml
+    resource: '@TestBundle/Resources/config/routing.yml'
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/config.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/config.yml
@@ -6,7 +6,7 @@ services:
         class: Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\CsrfFormLoginBundle\Form\UserLoginFormType
         scope: request
         arguments:
-            - @request
+            - '@request'
         tags:
             - { name: form.type, alias: user_login }
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/routing.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/CsrfFormLogin/routing.yml
@@ -1,2 +1,2 @@
 _csrf_form_login_bundle:
-    resource: @CsrfFormLoginBundle/Resources/config/routing.yml
+    resource: '@CsrfFormLoginBundle/Resources/config/routing.yml'
diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/routing.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/routing.yml
@@ -1,5 +1,5 @@
 _form_login_bundle:
-    resource: @FormLoginBundle/Resources/config/routing.yml
+    resource: '@FormLoginBundle/Resources/config/routing.yml'
 
 _form_login_localized:
-    resource: @FormLoginBundle/Resources/config/localized_routing.yml
+    resource: '@FormLoginBundle/Resources/config/localized_routing.yml'
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/YamlDumper.php
@@ -157,10 +157,10 @@ private function addService($id, $definition)
     private function addServiceAlias($alias, $id)
     {
         if ($id->isPublic()) {
-            return sprintf("    %s: @%s\n", $alias, $id);
-        } else {
-            return sprintf("    %s:\n        alias: %s\n        public: false", $alias, $id);
+            return sprintf("    %s: '@%s'\n", $alias, $id);
         }
+
+        return sprintf("    %s:\n        alias: %s\n        public: false", $alias, $id);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services2.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services2.yml
@@ -6,7 +6,7 @@ parameters:
         - 0
         - 1000.3
     bar: foo
-    escape: @@escapeme
-    foo_bar: @foo_bar
+    escape: '@@escapeme'
+    foo_bar: '@foo_bar'
     MixedCase:
         MixedCaseKey: value
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services6.yml
@@ -6,7 +6,7 @@ services:
     scope.prototype: { class: FooClass, scope: prototype }
     constructor: { class: FooClass, factory_method: getInstance }
     file: { class: FooClass, file: %path%/foo.php }
-    arguments: { class: FooClass, arguments: [foo, @foo, [true, false]] }
+    arguments: { class: FooClass, arguments: [foo, '@foo', [true, false]] }
     configurator1: { class: FooClass, configurator: sc_configure }
     configurator2: { class: FooClass, configurator: [@baz, configure] }
     configurator3: { class: FooClass, configurator: [BazClass, configureStatic] }
@@ -18,8 +18,8 @@ services:
     method_call2:
         class: FooClass
         calls:
-            - [ setBar, [ foo, @foo, [true, false] ] ]
-    alias_for_foo: @foo
+            - [ setBar, [ foo, '@foo', [true, false] ] ]
+    alias_for_foo: '@foo'
     another_alias_for_foo:
         alias: foo
         public: false
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/yaml/services9.yml
@@ -69,5 +69,5 @@ services:
         calls:
             - [setRequest, ['@?request']]
 
-    alias_for_foo: @foo
-    alias_for_alias: @foo
+    alias_for_foo: '@foo'
+    alias_for_alias: '@foo'

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`_fragmenttest_bundle:`
`2`		`- resource: @TestBundle/Resources/config/routing.yml`
	`2`	`+ resource: '@TestBundle/Resources/config/routing.yml'`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`_sessiontest_bundle:`
`2`		`- resource: @TestBundle/Resources/config/routing.yml`
	`2`	`+ resource: '@TestBundle/Resources/config/routing.yml'`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`_csrf_form_login_bundle:`
`2`		`- resource: @CsrfFormLoginBundle/Resources/config/routing.yml`
	`2`	`+ resource: '@CsrfFormLoginBundle/Resources/config/routing.yml'`
Original file line number	Diff line number	Diff line change
`@@ -157,10 +157,10 @@ private function addService($id, $definition)`
`157`	`157`	`private function addServiceAlias($alias, $id)`
`158`	`158`	`{`
`159`	`159`	`if ($id->isPublic()) {`
`160`		`- return sprintf(" %s: @%s\n", $alias, $id);`
`161`		`- } else {`
`162`		`- return sprintf(" %s:\n alias: %s\n public: false", $alias, $id);`
	`160`	`+ return sprintf(" %s: '@%s'\n", $alias, $id);`
`163`	`161`	`}`
	`162`	`+`
	`163`	`+ return sprintf(" %s:\n alias: %s\n public: false", $alias, $id);`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`/**`