Merge branch '3.2'

nicolas-grekas · nicolas-grekas · commit 4e6379cded5f · 2017-02-02T14:49:58.000+01:00
* 3.2:
  Add HEADER_FORWARDED to setTrustedHeaderName docs
  Fix phpDoc typo
  [FrameworkBundle][Console] JsonDescriptor: Respect original output
  Remove dead code
  Enable dump() in autoload-dev
  add missing functional Serializer test case
diff --git a/Tests/Fixtures/Descriptor/builder_1_public.json b/Tests/Fixtures/Descriptor/builder_1_public.json
@@ -10,9 +10,7 @@
             "file": null,
             "factory_class": "Full\\Qualified\\FactoryClass",
             "factory_method": "get",
-            "tags": [
-
-            ],
+            "tags": [],
             "autowire": false
         }
     },
diff --git a/Tests/Fixtures/Descriptor/builder_1_services.json b/Tests/Fixtures/Descriptor/builder_1_services.json
@@ -10,9 +10,7 @@
             "file": null,
             "factory_class": "Full\\Qualified\\FactoryClass",
             "factory_method": "get",
-            "tags": [
-
-            ],
+            "tags": [],
             "autowire": false
         },
         "definition_2": {
@@ -41,9 +39,7 @@
                 },
                 {
                     "name": "tag2",
-                    "parameters": [
-
-                    ]
+                    "parameters": []
                 }
             ],
             "calls": [
diff --git a/Tests/Fixtures/Descriptor/builder_1_tag1.json b/Tests/Fixtures/Descriptor/builder_1_tag1.json
@@ -26,9 +26,7 @@
                 },
                 {
                     "name": "tag2",
-                    "parameters": [
-
-                    ]
+                    "parameters": []
                 }
             ],
             "calls": [
@@ -37,10 +35,6 @@
             "autowire": false
         }
     },
-    "aliases": [
-
-    ],
-    "services": [
-
-    ]
+    "aliases": [],
+    "services": []
 }
diff --git a/Tests/Fixtures/Descriptor/definition_1.json b/Tests/Fixtures/Descriptor/definition_1.json
@@ -8,8 +8,6 @@
     "file": null,
     "factory_class": "Full\\Qualified\\FactoryClass",
     "factory_method": "get",
-    "tags": [
-
-    ],
+    "tags": [],
     "autowire": false
 }
diff --git a/Tests/Fixtures/Descriptor/definition_2.json b/Tests/Fixtures/Descriptor/definition_2.json
@@ -24,9 +24,7 @@
         },
         {
             "name": "tag2",
-            "parameters": [
-
-            ]
+            "parameters": []
         }
     ],
     "calls": [
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",
diff --git a/Tests/Functional/PropertyInfoTest.php b/Tests/Functional/PropertyInfoTest.php
@@ -20,7 +20,7 @@ public function testPhpDocPriority()
         static::bootKernel(array('test_case' => 'Serializer'));
         $container = static::$kernel->getContainer();
 
-        $this->assertEquals(array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_INT))), $container->get('property_info')->getTypes(Dummy::class, 'codes'));
+        $this->assertEquals(array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_INT))), $container->get('property_info')->getTypes('Symfony\Bundle\FrameworkBundle\Tests\Functional\Dummy', 'codes'));
     }
 }
 

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`	`"calls": [`
`@@ -37,10 +35,6 @@`
`37`	`35`	`"autowire": false`
`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
`@@ -24,9 +24,7 @@`
`24`	`24`	`},`
`25`	`25`	`{`
`26`	`26`	`"name": "tag2",`
`27`		`- "parameters": [`
`28`		`-`
`29`		`- ]`
	`27`	`+ "parameters": []`
`30`	`28`	`}`
`31`	`29`	`],`
`32`	`30`	`"calls": [`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public function testPhpDocPriority()`
`20`	`20`	`static::bootKernel(array('test_case' => 'Serializer'));`
`21`	`21`	`$container = static::$kernel->getContainer();`
`22`	`22`
`23`		`- $this->assertEquals(array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_INT))), $container->get('property_info')->getTypes(Dummy::class, 'codes'));`
	`23`	`+ $this->assertEquals(array(new Type(Type::BUILTIN_TYPE_ARRAY, false, null, true, new Type(Type::BUILTIN_TYPE_INT), new Type(Type::BUILTIN_TYPE_INT))), $container->get('property_info')->getTypes('Symfony\Bundle\FrameworkBundle\Tests\Functional\Dummy', 'codes'));`
`24`	`24`	`}`
`25`	`25`	`}`
`26`	`26`