Permalink
Browse files

Merge branch '2.1'

* 2.1:
  [Yaml] fixed wrong merge (indentation default is 4 as of 2.1)
  Fixed missing class argument when throwing exception
  • Loading branch information...
fabpot committed Jan 27, 2013
2 parents f5337ce + 882b70f commit b293027f4030998a752a1ac06e80ae9e6bf6a763
Showing with 1 addition and 1 deletion.
  1. +1 −1 Yaml.php
View
@@ -149,7 +149,7 @@ public static function parse($input, $exceptionOnInvalidType = false, $objectSup
*
* @api
*/
- public static function dump($array, $inline = 2, $indent = 2, $exceptionOnInvalidType = false, $objectSupport = false)
+ public static function dump($array, $inline = 2, $indent = 4, $exceptionOnInvalidType = false, $objectSupport = false)
{
$yaml = new Dumper();
$yaml->setIndentation($indent);

0 comments on commit b293027

Please sign in to comment.