Merge branch '4.2'

* 4.2:
  fix test after revert of bugfix

src/Symfony/Component/DependencyInjection/Tests/Fixtures/config/prototype_array.expected.yml

@@ -4,6 +4,15 @@ services:
         class: Symfony\Component\DependencyInjection\ContainerInterface
         public: true
         synthetic: true
+    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
+        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
+        public: true
+        tags:
+            - { name: foo }
+            - { name: baz }
+        deprecated: '%service_id%'
+        arguments: [1]
+        factory: f
     Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar:
         class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Sub\Bar
         public: true
@@ -14,12 +23,3 @@ services:
         lazy: true
         arguments: [1]
         factory: f
-    Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo:
-        class: Symfony\Component\DependencyInjection\Tests\Fixtures\Prototype\Foo
-        public: true
-        tags:
-            - { name: foo }
-            - { name: baz }
-        deprecated: '%service_id%'
-        arguments: [1]
-        factory: f