[VarDumper] Fix indentation trimming in ExceptionCaster

nicolas-grekas · nicolas-grekas · commit 70321912506f · 2016-07-05T10:23:15.000+02:00
diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -253,19 +253,24 @@ private static function extractSource(array $srcArray, $line, $srcContext)
         }
 
         $ltrim = 0;
-        while (' ' === $src[0][$ltrim] || "\t" === $src[0][$ltrim]) {
-            $i = $srcContext << 1;
-            while ($i > 0 && $src[0][$ltrim] === $src[$i][$ltrim]) {
-                --$i;
-            }
-            if ($i) {
-                break;
+        do {
+            $pad = null;
+            for ($i = $srcContext << 1; $i >= 0; --$i) {
+                if (isset($src[$i][$ltrim]) && "\r" !== ($c = $src[$i][$ltrim]) && "\n" !== $c) {
+                    if (null === $pad) {
+                        $pad = $c;
+                    }
+                    if ((' ' !== $c && "\t" !== $c) || $pad !== $c) {
+                        break;
+                    }
+                }
             }
             ++$ltrim;
-        }
-        if ($ltrim) {
+        } while (0 > $i && null !== $pad);
+
+        if (--$ltrim) {
             foreach ($src as $i => $line) {
-                $src[$i] = substr($line, $ltrim);
+                $src[$i] = isset($line[$ltrim]) && "\r" !== $line[$ltrim] ? substr($line, $ltrim) : ltrim($line, " \t");
             }
         }
 
diff --git a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
@@ -200,7 +200,7 @@ public function testThrowingCaster()
             $twig = <<<EOTXT
           foo.twig:2: """
             foo bar\\n
-                twig source\\n
+              twig source\\n
             \\n
             """
 
diff --git a/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php b/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
@@ -29,6 +29,6 @@ public function getDebugInfo()
         return array (19 => 2);
     }
 }
-/* foo bar*/
+/*   foo bar*/
 /*     twig source*/
 /* */

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ public function getDebugInfo()`
`29`	`29`	`return array (19 => 2);`
`30`	`30`	`}`
`31`	`31`	`}`
`32`		`-/* foo bar*/`
	`32`	`+/* foo bar*/`
`33`	`33`	`/* twig source*/`
`34`	`34`	`/* */`