Merge branch '3.0' into 3.1

nicolas-grekas · nicolas-grekas · commit 8f6bb6e09804 · 2016-07-17T16:02:08.000+02:00
* 3.0:
  [VarDumper] Fix dumping jsons casted as arrays
  PassConfig::getMergePass is not an array
  Revert "bug #19114 [HttpKernel] Dont close the reponse stream in debug (nicolas-grekas)"
  Fix the retrieval of the last username when using forwarding
  [Yaml] Fix PHPDoc of the Yaml class
  [HttpFoundation] Add OPTIONS and TRACE to the list of safe methods
  Update getAbsoluteUri() for query string uris

Conflicts:
	src/Symfony/Component/Yaml/Yaml.php
diff --git a/Compiler/PassConfig.php b/Compiler/PassConfig.php
@@ -153,9 +153,9 @@ public function getRemovingPasses()
     }
 
     /**
-     * Gets all passes for the Merge pass.
+     * Gets the Merge pass.
      *
-     * @return array An array of passes
+     * @return CompilerPassInterface The merge pass
      */
     public function getMergePass()
     {

Original file line number	Diff line number	Diff line change
`@@ -153,9 +153,9 @@ public function getRemovingPasses()`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`/**`
`156`		`- * Gets all passes for the Merge pass.`
	`156`	`+ * Gets the Merge pass.`
`157`	`157`	`*`
`158`		`- * @return array An array of passes`
	`158`	`+ * @return CompilerPassInterface The merge pass`
`159`	`159`	`*/`
`160`	`160`	`public function getMergePass()`
`161`	`161`	`{`