minor #21515 [FrameworkBundle][Console] JsonDescriptor: Respect original output (ogizanagi)

This PR was merged into the 2.8 branch. Discussion ---------- [FrameworkBundle][Console] JsonDescriptor: Respect original output | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | no | Fixed tickets | N/A | License | MIT | Doc PR | N/A Follows up #21501. This one fixes the keys order (preserved from the order those keys are added from the `JsonDescriptor`), as for the previous mentioned PR, in order to slightly improve the situation when updating the descriptors fixtures. @nicolas-grekas : Thanks for taking care of the previous one. There are two other PRs required to me in order to fix everything on every branches, but I wonder if it wouldn't be easier (and reduce noise) to apply the following patches while merging this in upper branches instead: - 3.2: 51a0a1c25d - master: b35a244249 WDYT? Commits ------- bf71776 [FrameworkBundle][Console] JsonDescriptor: Respect original output
2017-02-03 13:07:20 +01:00 · 2017-02-03 13:07:20 +01:00 · a43e1832bf
commit a43e1832bf
parent 0a6d3c6d00 bf71776e20
8 changed files with 70 additions and 70 deletions
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_public.json
@ -9,12 +9,12 @@
            "shared": true,
            "synchronized": false,
            "abstract": true,
+            "autowire": false,
+            "autowiring_types": [],
            "file": null,
            "factory_class": "Full\\Qualified\\FactoryClass",
            "factory_method": "get",
-            "tags": [],
-            "autowire": false,
-            "autowiring_types": []
+            "tags": []
        }
    },
    "aliases": {
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_services.json
@ -9,12 +9,12 @@
            "shared": true,
            "synchronized": false,
            "abstract": true,
+            "autowire": false,
+            "autowiring_types": [],
            "file": null,
            "factory_class": "Full\\Qualified\\FactoryClass",
            "factory_method": "get",
-            "tags": [],
-            "autowire": false,
-            "autowiring_types": []
+            "tags": []
        },
        "definition_2": {
            "class": "Full\\Qualified\\Class2",
@ -25,6 +25,8 @@
            "shared": true,
            "synchronized": false,
            "abstract": false,
+            "autowire": false,
+            "autowiring_types": [],
            "file": "\/path\/to\/file",
            "factory_service": "factory.service",
            "factory_method": "get",
@ -46,9 +48,7 @@
                    "name": "tag2",
                    "parameters": []
                }
-            ],
-            "autowire": false,
-            "autowiring_types": []
+            ]
        }
    },
    "aliases": {
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tag1.json
@ -9,6 +9,8 @@
            "shared": true,
            "synchronized": false,
            "abstract": false,
+            "autowire": false,
+            "autowiring_types": [],
            "file": "\/path\/to\/file",
            "factory_service": "factory.service",
            "factory_method": "get",
@ -30,9 +32,7 @@
                    "name": "tag2",
                    "parameters": []
                }
-            ],
-            "autowire": false,
-            "autowiring_types": []
+            ]
        }
    },
    "aliases": [],
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/builder_1_tags.json
@ -9,11 +9,11 @@
            "shared": true,
            "synchronized": false,
            "abstract": false,
+            "autowire": false,
+            "autowiring_types": [],
            "file": "\/path\/to\/file",
            "factory_service": "factory.service",
-            "factory_method": "get",
-            "autowire": false,
-            "autowiring_types": []
+            "factory_method": "get"
        }
    ],
    "tag2": [
@ -26,11 +26,11 @@
            "shared": true,
            "synchronized": false,
            "abstract": false,
+            "autowire": false,
+            "autowiring_types": [],
            "file": "\/path\/to\/file",
            "factory_service": "factory.service",
-            "factory_method": "get",
-            "autowire": false,
-            "autowiring_types": []
+            "factory_method": "get"
        }
    ]
 }
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_1.json
@ -7,10 +7,10 @@
    "shared": true,
    "synchronized": false,
    "abstract": true,
+    "autowire": false,
+    "autowiring_types": [],
    "file": null,
    "factory_class": "Full\\Qualified\\FactoryClass",
    "factory_method": "get",
-    "tags": [],
-    "autowire": false,
-    "autowiring_types": []
+    "tags": []
 }
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/definition_2.json
@ -7,6 +7,8 @@
    "shared": true,
    "synchronized": false,
    "abstract": false,
+    "autowire": false,
+    "autowiring_types": [],
    "file": "\/path\/to\/file",
    "factory_service": "factory.service",
    "factory_method": "get",
@ -28,7 +30,5 @@
            "name": "tag2",
            "parameters": []
        }
-    ],
-    "autowire": false,
-    "autowiring_types": []
+    ]
 }
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json
@ -1,16 +1,16 @@
 {
-  "class": "Full\\Qualified\\Class1",
-  "scope": "container",
-  "public": true,
-  "synthetic": false,
-  "lazy": true,
-  "shared": true,
-  "synchronized": true,
-  "abstract": true,
-  "file": null,
-  "factory_class": "Full\\Qualified\\FactoryClass",
-  "factory_method": "get",
-  "tags": [],
-  "autowire": false,
-  "autowiring_types": []
+    "class": "Full\\Qualified\\Class1",
+    "scope": "container",
+    "public": true,
+    "synthetic": false,
+    "lazy": true,
+    "shared": true,
+    "synchronized": true,
+    "abstract": true,
+    "autowire": false,
+    "autowiring_types": [],
+    "file": null,
+    "factory_class": "Full\\Qualified\\FactoryClass",
+    "factory_method": "get",
+    "tags": []
 }
--- a/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json
+++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json
@ -1,34 +1,34 @@
 {
-  "class": "Full\\Qualified\\Class2",
-  "scope": "container",
-  "public": false,
-  "synthetic": true,
-  "lazy": false,
-  "shared": true,
-  "synchronized": false,
-  "abstract": false,
-  "file": "\/path\/to\/file",
-  "factory_service": "factory.service",
-  "factory_method": "get",
-  "tags": [
-    {
-      "name": "tag1",
-      "parameters": {
-        "attr1": "val1",
-        "attr2": "val2"
-      }
-    },
-    {
-      "name": "tag1",
-      "parameters": {
-        "attr3": "val3"
-      }
-    },
-    {
-      "name": "tag2",
-      "parameters": []
-    }
-  ],
-  "autowire": false,
-  "autowiring_types": []
+    "class": "Full\\Qualified\\Class2",
+    "scope": "container",
+    "public": false,
+    "synthetic": true,
+    "lazy": false,
+    "shared": true,
+    "synchronized": false,
+    "abstract": false,
+    "autowire": false,
+    "autowiring_types": [],
+    "file": "\/path\/to\/file",
+    "factory_service": "factory.service",
+    "factory_method": "get",
+    "tags": [
+        {
+            "name": "tag1",
+            "parameters": {
+                "attr1": "val1",
+                "attr2": "val2"
+            }
+        },
+        {
+            "name": "tag1",
+            "parameters": {
+                "attr3": "val3"
+            }
+        },
+        {
+            "name": "tag2",
+            "parameters": []
+        }
+    ]
 }