Merge branch '2.8' into 3.2

* 2.8:
  [FrameworkBundle][Console] JsonDescriptor: Respect original output
  [Process] Non ASCII characters disappearing during the escapeshellarg

Author: nicolas-grekas

Tests/Fixtures/Descriptor/builder_1_public.json

@@ -7,12 +7,12 @@
             "lazy": true,
             "shared": true,
             "abstract": true,
+            "autowire": false,
+            "autowiring_types": [],
             "file": null,
             "factory_class": "Full\\Qualified\\FactoryClass",
             "factory_method": "get",
-            "tags": [],
-            "autowire": false,
-            "autowiring_types": []
+            "tags": []
         }
     },
     "aliases": {

Tests/Fixtures/Descriptor/builder_1_services.json

@@ -7,12 +7,12 @@
             "lazy": true,
             "shared": true,
             "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",
@@ -21,9 +21,14 @@
             "lazy": false,
             "shared": true,
             "abstract": false,
+            "autowire": false,
+            "autowiring_types": [],
             "file": "\/path\/to\/file",
             "factory_service": "factory.service",
             "factory_method": "get",
+            "calls": [
+                "setMailer"
+            ],
             "tags": [
                 {
                     "name": "tag1",
@@ -42,12 +47,7 @@
                     "name": "tag2",
                     "parameters": []
                 }
-            ],
-            "calls": [
-                "setMailer"
-            ],
-            "autowire": false,
-            "autowiring_types": []
+            ]
         }
     },
     "aliases": {

Tests/Fixtures/Descriptor/builder_1_tag1.json

@@ -7,9 +7,14 @@
             "lazy": false,
             "shared": true,
             "abstract": false,
+            "autowire": false,
+            "autowiring_types": [],
             "file": "\/path\/to\/file",
             "factory_service": "factory.service",
             "factory_method": "get",
+            "calls": [
+                "setMailer"
+            ],
             "tags": [
                 {
                     "name": "tag1",
@@ -28,12 +33,7 @@
                     "name": "tag2",
                     "parameters": []
                 }
-            ],
-            "calls": [
-                "setMailer"
-            ],
-            "autowire": false,
-            "autowiring_types": []
+            ]
         }
     },
     "aliases": [],

Tests/Fixtures/Descriptor/builder_1_tags.json

@@ -7,14 +7,14 @@
             "lazy": false,
             "shared": true,
             "abstract": false,
+            "autowire": false,
+            "autowiring_types": [],
             "file": "\/path\/to\/file",
-            "calls": [
-                "setMailer"
-            ],
             "factory_service": "factory.service",
             "factory_method": "get",
-            "autowire": false,
-            "autowiring_types": []
+            "calls": [
+                "setMailer"
+            ]
         }
     ],
     "tag2": [
@@ -25,14 +25,14 @@
             "lazy": false,
             "shared": true,
             "abstract": false,
+            "autowire": false,
+            "autowiring_types": [],
             "file": "\/path\/to\/file",
-            "calls": [
-                "setMailer"
-            ],
             "factory_service": "factory.service",
             "factory_method": "get",
-            "autowire": false,
-            "autowiring_types": []
+            "calls": [
+                "setMailer"
+            ]
         }
     ]
 }

Tests/Fixtures/Descriptor/definition_1.json

@@ -5,10 +5,10 @@
     "lazy": true,
     "shared": true,
     "abstract": true,
+    "autowire": false,
+    "autowiring_types": [],
     "file": null,
     "factory_class": "Full\\Qualified\\FactoryClass",
     "factory_method": "get",
-    "tags": [],
-    "autowire": false,
-    "autowiring_types": []
+    "tags": []
 }

Tests/Fixtures/Descriptor/definition_2.json

@@ -5,9 +5,14 @@
     "lazy": false,
     "shared": true,
     "abstract": false,
+    "autowire": false,
+    "autowiring_types": [],
     "file": "\/path\/to\/file",
     "factory_service": "factory.service",
     "factory_method": "get",
+    "calls": [
+        "setMailer"
+    ],
     "tags": [
         {
             "name": "tag1",
@@ -26,10 +31,5 @@
             "name": "tag2",
             "parameters": []
         }
-    ],
-    "calls": [
-        "setMailer"
-    ],
-    "autowire": false,
-    "autowiring_types": []
+    ]
 }