[VarDumper] Add line in trace indexes

nicolas-grekas · nicolas-grekas · commit 4f6f6eaf6104 · 2016-08-18T12:57:42.000+02:00
diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -158,13 +158,13 @@ public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, $is
                         $templateSrc = explode("\n", method_exists($template, 'getSource') ? $template->getSource() : $template->getEnvironment()->getLoader()->getSource($templateName));
                         $templateInfo = $template->getDebugInfo();
                         if (isset($templateInfo[$f['line']])) {
-                            $src[$templateName] = self::extractSource($templateSrc, $templateInfo[$f['line']], self::$srcContext);
+                            $src[$templateName.' +'.$templateInfo[$f['line']]] = self::extractSource($templateSrc, $templateInfo[$f['line']], self::$srcContext);
                         }
                     } catch (\Twig_Error_Loader $e) {
                     }
                 }
                 if (!$src) {
-                    $src[$f['file']] = self::extractSource(explode("\n", file_get_contents($f['file'])), $f['line'], self::$srcContext);
+                    $src[$f['file'].' +'.$f['line']] = self::extractSource(explode("\n", file_get_contents($f['file'])), $f['line'], self::$srcContext);
                 }
             } else {
                 $src[$f['file']] = $f['line'];
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ExceptionCasterTest.php
@@ -40,12 +40,12 @@ public function testDefaultSettings()
   #file: "%sExceptionCasterTest.php"
   #line: 23
   -trace: {
-    %d. %sExceptionCasterTest.php: {
+    %d. %sExceptionCasterTest.php +23: {
       22: {
       23:     return new \Exception('foo');
       24: }
     }
-    %d. %sExceptionCasterTest.php: {
+    %d. %sExceptionCasterTest.php +%d: {
       %d: {
       %d:     $e = $this->getTestException(1);
       %d: 
@@ -71,12 +71,12 @@ public function testNoArgs()
   #file: "%sExceptionCasterTest.php"
   #line: 23
   -trace: {
-    %d. %sExceptionCasterTest.php: {
+    %d. %sExceptionCasterTest.php +23: {
       22: {
       23:     return new \Exception('foo');
       24: }
     }
-    %d. %sExceptionCasterTest.php: {
+    %d. %sExceptionCasterTest.php +%d: {
       %d: {
       %d:     $e = $this->getTestException(1);
       %d:     ExceptionCaster::$traceArgs = false;
diff --git a/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php b/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php
@@ -156,7 +156,7 @@ public function testGenerator()
   this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
   executing: {
     Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo->baz(): {
-      %sGeneratorDemo.php: {
+      %sGeneratorDemo.php +14: {
         13: {
         14:     yield from bar();
         15: }
@@ -177,17 +177,17 @@ public function testGenerator()
   0 => ReflectionGenerator {
     this: Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo { …}
     trace: {
-      3. %sGeneratorDemo.php: {
+      3. %sGeneratorDemo.php +9: {
          8: {
          9:     yield 1;
         10: }
       }
-      2. %sGeneratorDemo.php: {
+      2. %sGeneratorDemo.php +20: {
         19: {
         20:     yield from GeneratorDemo::foo();
         21: }
       }
-      1. %sGeneratorDemo.php: {
+      1. %sGeneratorDemo.php +14: {
         13: {
         14:     yield from bar();
         15: }
@@ -197,7 +197,7 @@ public function testGenerator()
   1 => Generator {
     executing: {
       Symfony\Component\VarDumper\Tests\Fixtures\GeneratorDemo::foo(): {
-        %sGeneratorDemo.php: {
+        %sGeneratorDemo.php +10: {
            9:     yield 1;
           10: }
           11: 
diff --git a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
@@ -264,7 +264,7 @@ public function testThrowingCaster()
 
         if (method_exists($twig, 'getSource')) {
             $twig = <<<EOTXT
-foo.twig: {
+foo.twig +%d: {
         1: foo bar
         2:   twig source
         3: 
@@ -289,22 +289,22 @@ public function testThrowingCaster()
     #message: "Unexpected Exception thrown from a caster: Foobar"
     -trace: {
       %d. {$twig}
-      %d. %sTemplate.php: {
+      %d. %sTemplate.php +%d: {
         %d: try {
         %d:     \$this->doDisplay(\$context, \$blocks);
         %d: } catch (Twig_Error \$e) {
       }
-      %d. %sTemplate.php: {
+      %d. %sTemplate.php +%d: {
         %d: {
         %d:     \$this->displayWithErrorHandling(\$this->env->mergeGlobals(\$context), array_merge(\$this->blocks, \$blocks));
         %d: }
       }
-      %d. %sTemplate.php: {
+      %d. %sTemplate.php +%d: {
         %d: try {
         %d:     \$this->display(\$context);
         %d: } catch (Exception \$e) {
       }
-      %d. %sCliDumperTest.php: {
+      %d. %sCliDumperTest.php +{$line}: {
         %d:         }
         {$line}:     };'),
         %d: ));

Original file line number	Diff line number	Diff line change
`@@ -158,13 +158,13 @@ public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, $is`
`158`	`158`	`$templateSrc = explode("\n", method_exists($template, 'getSource') ? $template->getSource() : $template->getEnvironment()->getLoader()->getSource($templateName));`
`159`	`159`	`$templateInfo = $template->getDebugInfo();`
`160`	`160`	`if (isset($templateInfo[$f['line']])) {`
`161`		`- $src[$templateName] = self::extractSource($templateSrc, $templateInfo[$f['line']], self::$srcContext);`
	`161`	`+ $src[$templateName.' +'.$templateInfo[$f['line']]] = self::extractSource($templateSrc, $templateInfo[$f['line']], self::$srcContext);`
`162`	`162`	`}`
`163`	`163`	`} catch (\Twig_Error_Loader $e) {`
`164`	`164`	`}`
`165`	`165`	`}`
`166`	`166`	`if (!$src) {`
`167`		`- $src[$f['file']] = self::extractSource(explode("\n", file_get_contents($f['file'])), $f['line'], self::$srcContext);`
	`167`	`+ $src[$f['file'].' +'.$f['line']] = self::extractSource(explode("\n", file_get_contents($f['file'])), $f['line'], self::$srcContext);`
`168`	`168`	`}`
`169`	`169`	`} else {`
`170`	`170`	`$src[$f['file']] = $f['line'];`