[Yaml] fixed unneeded BC break

fabpot · fabpot · commit 0138c2d0b360 · 2013-01-17T22:16:19.000+01:00
diff --git a/src/Symfony/Component/Yaml/Dumper.php b/src/Symfony/Component/Yaml/Dumper.php
@@ -40,13 +40,13 @@ public function setIndentation($num)
      *
      * @param mixed   $input                  The PHP value
      * @param integer $inline                 The level where you switch to inline YAML
+     * @param integer $indent                 The level of indentation (used internally)
      * @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise
      * @param Boolean $objectSupport          true if object support is enabled, false otherwise
-     * @param integer $indent                 The level of indentation (used internally)
      *
      * @return string  The YAML representation of the PHP value
      */
-    public function dump($input, $inline = 0, $exceptionOnInvalidType = false, $objectSupport = false, $indent = 0)
+    public function dump($input, $inline = 0, $indent = 0, $exceptionOnInvalidType = false, $objectSupport = false)
     {
         $output = '';
         $prefix = $indent ? str_repeat(' ', $indent) : '';
@@ -63,7 +63,7 @@ public function dump($input, $inline = 0, $exceptionOnInvalidType = false, $obje
                     $prefix,
                     $isAHash ? Inline::dump($key, $exceptionOnInvalidType, $objectSupport).':' : '-',
                     $willBeInlined ? ' ' : "\n",
-                    $this->dump($value, $inline - 1, $exceptionOnInvalidType, $objectSupport, $willBeInlined ? 0 : $indent + $this->indentation)
+                    $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + $this->indentation, $exceptionOnInvalidType, $objectSupport)
                 ).($willBeInlined ? "\n" : '');
             }
         }
diff --git a/src/Symfony/Component/Yaml/Yaml.php b/src/Symfony/Component/Yaml/Yaml.php
@@ -150,6 +150,6 @@ public static function dump($array, $inline = 2, $indent = 2, $exceptionOnInvali
         $yaml = new Dumper();
         $yaml->setIndentation($indent);
 
-        return $yaml->dump($array, $inline, $exceptionOnInvalidType, $objectSupport);
+        return $yaml->dump($array, $inline, 0, $exceptionOnInvalidType, $objectSupport);
     }
 }
diff --git a/tests/Symfony/Tests/Component/Yaml/DumperTest.php b/tests/Symfony/Tests/Component/Yaml/DumperTest.php
@@ -154,7 +154,7 @@ public function testInlineLevel()
 
     public function testObjectSupportEnabled()
     {
-        $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, false, true);
+        $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, false, true);
 
         $this->assertEquals('{ foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\A":1:{s:1:"a";s:3:"foo";}, bar: 1 }', $dump, '->dump() is able to dump objects');
     }
@@ -171,7 +171,7 @@ public function testObjectSupportDisabledButNoExceptions()
      */
     public function testObjectSupportDisabledWithExceptions()
     {
-        $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, true, false);
+        $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, true, false);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -40,13 +40,13 @@ public function setIndentation($num)`
`40`	`40`	`*`
`41`	`41`	`* @param mixed $input The PHP value`
`42`	`42`	`* @param integer $inline The level where you switch to inline YAML`
	`43`	`+ * @param integer $indent The level of indentation (used internally)`
`43`	`44`	`* @param Boolean $exceptionOnInvalidType true if an exception must be thrown on invalid types (a PHP resource or object), false otherwise`
`44`	`45`	`* @param Boolean $objectSupport true if object support is enabled, false otherwise`
`45`		`- * @param integer $indent The level of indentation (used internally)`
`46`	`46`	`*`
`47`	`47`	`* @return string The YAML representation of the PHP value`
`48`	`48`	`*/`
`49`		`- public function dump($input, $inline = 0, $exceptionOnInvalidType = false, $objectSupport = false, $indent = 0)`
	`49`	`+ public function dump($input, $inline = 0, $indent = 0, $exceptionOnInvalidType = false, $objectSupport = false)`
`50`	`50`	`{`
`51`	`51`	`$output = '';`
`52`	`52`	`$prefix = $indent ? str_repeat(' ', $indent) : '';`
`@@ -63,7 +63,7 @@ public function dump($input, $inline = 0, $exceptionOnInvalidType = false, $obje`
`63`	`63`	`$prefix,`
`64`	`64`	`$isAHash ? Inline::dump($key, $exceptionOnInvalidType, $objectSupport).':' : '-',`
`65`	`65`	`$willBeInlined ? ' ' : "\n",`
`66`		`- $this->dump($value, $inline - 1, $exceptionOnInvalidType, $objectSupport, $willBeInlined ? 0 : $indent + $this->indentation)`
	`66`	`+ $this->dump($value, $inline - 1, $willBeInlined ? 0 : $indent + $this->indentation, $exceptionOnInvalidType, $objectSupport)`
`67`	`67`	`).($willBeInlined ? "\n" : '');`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,6 @@ public static function dump($array, $inline = 2, $indent = 2, $exceptionOnInvali`
`150`	`150`	`$yaml = new Dumper();`
`151`	`151`	`$yaml->setIndentation($indent);`
`152`	`152`
`153`		`- return $yaml->dump($array, $inline, $exceptionOnInvalidType, $objectSupport);`
	`153`	`+ return $yaml->dump($array, $inline, 0, $exceptionOnInvalidType, $objectSupport);`
`154`	`154`	`}`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public function testInlineLevel()`
`154`	`154`
`155`	`155`	`public function testObjectSupportEnabled()`
`156`	`156`	`{`
`157`		`- $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, false, true);`
	`157`	`+ $dump = $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, false, true);`
`158`	`158`
`159`	`159`	`$this->assertEquals('{ foo: !!php/object:O:30:"Symfony\Tests\Component\Yaml\A":1:{s:1:"a";s:3:"foo";}, bar: 1 }', $dump, '->dump() is able to dump objects');`
`160`	`160`	`}`
`@@ -171,7 +171,7 @@ public function testObjectSupportDisabledButNoExceptions()`
`171`	`171`	`*/`
`172`	`172`	`public function testObjectSupportDisabledWithExceptions()`
`173`	`173`	`{`
`174`		`- $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, true, false);`
	`174`	`+ $this->dumper->dump(array('foo' => new A(), 'bar' => 1), 0, 0, true, false);`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`