Browse files

Merge branch '3.1'

* 3.1:
  [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)"
  [Serializer] Include the format in the cache key
  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/DependencyInjection/Compiler/PassConfig.php
	src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
  • Loading branch information...
2 parents b696489 + 1819adf commit cd3288cd749886aa1ff43038f17db6494e883262 @nicolas-grekas nicolas-grekas committed Jul 17, 2016
Showing with 5 additions and 5 deletions.
  1. +5 −5 Yaml.php
View
10 Yaml.php
@@ -80,19 +80,19 @@ public static function parse($input, $flags = 0)
}
/**
- * Dumps a PHP array to a YAML string.
+ * Dumps a PHP value to a YAML string.
*
* The dump method, when supplied with an array, will do its best
* to convert the array into friendly YAML.
*
- * @param array $array PHP array
+ * @param mixed $input The PHP value
* @param int $inline The level where you switch to inline YAML
* @param int $indent The amount of spaces to use for indentation of nested nodes
* @param int $flags A bit field of DUMP_* constants to customize the dumped YAML string
*
- * @return string A YAML string representing the original PHP array
+ * @return string A YAML string representing the original PHP value
*/
- public static function dump($array, $inline = 2, $indent = 4, $flags = 0)
+ public static function dump($input, $inline = 2, $indent = 4, $flags = 0)
{
if (is_bool($flags)) {
@trigger_error('Passing a boolean flag to toggle exception handling is deprecated since version 3.1 and will be removed in 4.0. Use the DUMP_EXCEPTION_ON_INVALID_TYPE flag instead.', E_USER_DEPRECATED);
@@ -114,6 +114,6 @@ public static function dump($array, $inline = 2, $indent = 4, $flags = 0)
$yaml = new Dumper($indent);
- return $yaml->dump($array, $inline, 0, $flags);
+ return $yaml->dump($input, $inline, 0, $flags);
}
}

0 comments on commit cd3288c

Please sign in to comment.