symfony
diff --git a/‎src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
+11-7Lines changed: 11 additions & 7 deletions b/‎src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Caster/ExceptionCaster.php
+11-7Lines changed: 11 additions & 7 deletions
diff --git a/‎src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
+9-14Lines changed: 9 additions & 14 deletions b/‎src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Tests/CliDumperTest.php
+9-14Lines changed: 9 additions & 14 deletions
diff --git a/‎src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
+3-6Lines changed: 3 additions & 6 deletions b/‎src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
+3-6Lines changed: 3 additions & 6 deletions
@@ -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 {
 
@@ -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: {
 
@@ -26,14 +26,11 @@ public function getTemplateName()
 
     public function getDebugInfo()
     {
-        return array (19 => 2);
+        return array(19 => 2);
     }
 
-    public function getSource()
+    public function getSourceContext()
     {
-        return "   foo bar
-     twig source
-
-";
+        return new Twig_Source("   foo bar\n     twig source\n\n", 'foo.twig', 'foo.twig');
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,11 @@ public function getTemplateName()`
`26`	`26`
`27`	`27`	`public function getDebugInfo()`
`28`	`28`	`{`
`29`		`- return array (19 => 2);`
	`29`	`+ return array(19 => 2);`
`30`	`30`	`}`
`31`	`31`
`32`		`- public function getSource()`
	`32`	`+ public function getSourceContext()`
`33`	`33`	`{`
`34`		`- return " foo bar`
`35`		`- twig source`
`36`		`-`
`37`		`-";`
	`34`	`+ return new Twig_Source(" foo bar\n twig source\n\n", 'foo.twig', 'foo.twig');`
`38`	`35`	`}`
`39`	`36`	`}`