Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit d9f1727b1c7a · 2017-02-02T14:38:20.000+01:00
* 2.7:
  Add HEADER_FORWARDED to setTrustedHeaderName docs
  Fix phpDoc typo
  [FrameworkBundle][Console] JsonDescriptor: Respect original output
  Enable dump() in autoload-dev
diff --git a/Tests/Fixtures/Descriptor/builder_1_public.json b/Tests/Fixtures/Descriptor/builder_1_public.json
@@ -12,9 +12,7 @@
             "file": null,
             "factory_class": "Full\\Qualified\\FactoryClass",
             "factory_method": "get",
-            "tags": [
-
-            ],
+            "tags": [],
             "autowire": false,
             "autowiring_types": []
         }
diff --git a/Tests/Fixtures/Descriptor/builder_1_services.json b/Tests/Fixtures/Descriptor/builder_1_services.json
@@ -12,9 +12,7 @@
             "file": null,
             "factory_class": "Full\\Qualified\\FactoryClass",
             "factory_method": "get",
-            "tags": [
-
-            ],
+            "tags": [],
             "autowire": false,
             "autowiring_types": []
         },
@@ -46,9 +44,7 @@
                 },
                 {
                     "name": "tag2",
-                    "parameters": [
-
-                    ]
+                    "parameters": []
                 }
             ],
             "autowire": false,
diff --git a/Tests/Fixtures/Descriptor/builder_1_tag1.json b/Tests/Fixtures/Descriptor/builder_1_tag1.json
@@ -28,19 +28,13 @@
                 },
                 {
                     "name": "tag2",
-                    "parameters": [
-
-                    ]
+                    "parameters": []
                 }
             ],
             "autowire": false,
             "autowiring_types": []
         }
     },
-    "aliases": [
-
-    ],
-    "services": [
-
-    ]
+    "aliases": [],
+    "services": []
 }
diff --git a/Tests/Fixtures/Descriptor/definition_1.json b/Tests/Fixtures/Descriptor/definition_1.json
@@ -10,9 +10,7 @@
     "file": null,
     "factory_class": "Full\\Qualified\\FactoryClass",
     "factory_method": "get",
-    "tags": [
-
-    ],
+    "tags": [],
     "autowire": false,
     "autowiring_types": []
 }
diff --git a/Tests/Fixtures/Descriptor/definition_2.json b/Tests/Fixtures/Descriptor/definition_2.json
@@ -26,9 +26,7 @@
         },
         {
             "name": "tag2",
-            "parameters": [
-
-            ]
+            "parameters": []
         }
     ],
     "autowire": false,
diff --git a/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json b/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_1.json
@@ -10,9 +10,7 @@
   "file": null,
   "factory_class": "Full\\Qualified\\FactoryClass",
   "factory_method": "get",
-  "tags": [
-
-  ],
+  "tags": [],
   "autowire": false,
   "autowiring_types": []
 }
diff --git a/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json b/Tests/Fixtures/Descriptor/legacy_synchronized_service_definition_2.json
@@ -26,9 +26,7 @@
     },
     {
       "name": "tag2",
-      "parameters": [
-
-      ]
+      "parameters": []
     }
   ],
   "autowire": false,
diff --git a/Tests/Fixtures/Descriptor/route_2.json b/Tests/Fixtures/Descriptor/route_2.json
@@ -6,9 +6,7 @@
     "scheme": "http|https",
     "method": "PUT|POST",
     "class": "Symfony\\Component\\Routing\\Route",
-    "defaults": [
-
-    ],
+    "defaults": [],
     "requirements": "NO CUSTOM",
     "options": {
         "compiler_class": "Symfony\\Component\\Routing\\RouteCompiler",
diff --git a/Tests/Fixtures/Descriptor/route_collection_1.json b/Tests/Fixtures/Descriptor/route_collection_1.json
@@ -27,9 +27,7 @@
         "scheme": "http|https",
         "method": "PUT|POST",
         "class": "Symfony\\Component\\Routing\\Route",
-        "defaults": [
-
-        ],
+        "defaults": [],
         "requirements": "NO CUSTOM",
         "options": {
             "compiler_class": "Symfony\\Component\\Routing\\RouteCompiler",

Original file line number	Diff line number	Diff line change
`@@ -28,19 +28,13 @@`
`28`	`28`	`},`
`29`	`29`	`{`
`30`	`30`	`"name": "tag2",`
`31`		`- "parameters": [`
`32`		`-`
`33`		`- ]`
	`31`	`+ "parameters": []`
`34`	`32`	`}`
`35`	`33`	`],`
`36`	`34`	`"autowire": false,`
`37`	`35`	`"autowiring_types": []`
`38`	`36`	`}`
`39`	`37`	`},`
`40`		`- "aliases": [`
`41`		`-`
`42`		`- ],`
`43`		`- "services": [`
`44`		`-`
`45`		`- ]`
	`38`	`+ "aliases": [],`
	`39`	`+ "services": []`
`46`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,7 @@`
`26`	`26`	`},`
`27`	`27`	`{`
`28`	`28`	`"name": "tag2",`
`29`		`- "parameters": [`
`30`		`-`
`31`		`- ]`
	`29`	`+ "parameters": []`
`32`	`30`	`}`
`33`	`31`	`],`
`34`	`32`	`"autowire": false,`