[VarDumper] Fix source links with latests Twig versions

nicolas-grekas · nicolas-grekas · commit cdaa6dcc5240 · 2016-10-18T11:56:39.000+02:00
diff --git a/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php b/src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
@@ -150,15 +150,19 @@ public static function castFrameStub(FrameStub $frame, array $a, Stub $stub, $is
 
                 if (!empty($f['class']) && is_subclass_of($f['class'], 'Twig_Template') && method_exists($f['class'], 'getDebugInfo')) {
                     $template = isset($f['object']) ? $f['object'] : new $f['class'](new \Twig_Environment(new \Twig_Loader_Filesystem()));
-
-                    try {
-                        $templateName = $template->getTemplateName();
-                        $templateSrc = explode("\n", method_exists($template, 'getSource') ? $template->getSource() : $template->getEnvironment()->getLoader()->getSource($templateName));
-                        $templateInfo = $template->getDebugInfo();
-                        if (isset($templateInfo[$f['line']])) {
+                    $templateName = $template->getTemplateName();
+                    $templateSrc = method_exists($template, 'getSourceContext') ? $template->getSourceContext()->getCode() : (method_exists($template, 'getSource') ? $template->getSource() : false);
+                    $templateInfo = $template->getDebugInfo();
+                    if (isset($templateInfo[$f['line']])) {
+                        if (method_exists($template, 'getSourceContext')) {
+                            $templateName = $template->getSourceContext()->getPath();
+                        }
+                        if ($templateSrc) {
+                            $templateSrc = explode("\n", $templateSrc);
                             $src[$templateName.':'.$templateInfo[$f['line']]] = self::extractSource($templateSrc, $templateInfo[$f['line']], self::$srcContext);
+                        } else {
+                            $src[$templateName] = $templateInfo[$f['line']];
                         }
-                    } catch (\Twig_Error_Loader $e) {
                     }
                 }
             } else {
diff --git a/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
@@ -201,6 +201,9 @@ public function testClosedResource()
         );
     }
 
+    /**
+     * @requires function Twig_Template::getSourceContext
+     */
     public function testThrowingCaster()
     {
         $out = fopen('php://memory', 'r+b');
@@ -235,19 +238,6 @@ public function testThrowingCaster()
         rewind($out);
         $out = stream_get_contents($out);
 
-        if (method_exists($twig, 'getSource')) {
-            $twig = <<<EOTXT
-          foo.twig:2: """
-            foo bar\\n
-              twig source\\n
-            \\n
-            """
-
-EOTXT;
-        } else {
-            $twig = '';
-        }
-
         $r = defined('HHVM_VERSION') ? '' : '#%d';
         $this->assertStringMatchesFormat(
             <<<EOTXT
@@ -269,7 +259,12 @@ public function testThrowingCaster()
                 throw new \Exception('Foobar');\\n
             }\\n
             """
-{$twig}        }
+          foo.twig:2: """
+            foo bar\\n
+              twig source\\n
+            \\n
+            """
+        }
       }
       %d. Twig_Template->displayWithErrorHandling() ==> __TwigTemplate_VarDumperFixture_u75a09->doDisplay(): {
         src: {
diff --git a/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php b/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
@@ -29,11 +29,11 @@ public function getDebugInfo()
         return array (19 => 2);
     }
 
-    public function getSource()
+    public function getSourceContext()
     {
-        return "   foo bar
+        return new Twig_Source("   foo bar
      twig source
 
-";
+", 'foo.twig', 'foo.twig');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -29,11 +29,11 @@ public function getDebugInfo()`
`29`	`29`	`return array (19 => 2);`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function getSource()`
	`32`	`+ public function getSourceContext()`
`33`	`33`	`{`
`34`		`- return " foo bar`
	`34`	`+ return new Twig_Source(" foo bar`
`35`	`35`	`twig source`
`36`	`36`
`37`		`-";`
	`37`	`+", 'foo.twig', 'foo.twig');`
`38`	`38`	`}`
`39`	`39`	`}`