Fix Error when the trace has Twig file/line information instead of the original PHP info

Author: fabpot

src/Error/Error.php

@@ -41,6 +41,8 @@ class Error extends \Exception
     private $lineno;
     private $rawMessage;
     private ?Source $source;
+    private string $phpFile;
+    private int $phpLine;
 
     /**
      * Constructor.
@@ -55,6 +57,8 @@ public function __construct(string $message, int $lineno = -1, ?Source $source =
     {
         parent::__construct('', 0, $previous);
 
+        $this->phpFile = $this->getFile();
+        $this->phpLine = $this->getLine();
         $this->lineno = $lineno;
         $this->source = $source;
         $this->rawMessage = $message;
@@ -111,6 +115,8 @@ private function updateRepr(): void
             $this->file = $this->source->getPath();
             if ($this->lineno > 0) {
                 $this->line = $this->lineno;
+            } else {
+                $this->line = -1;
             }
         }
 
@@ -134,6 +140,7 @@ private function guessTemplateInfo(): void
     {
         // $this->source is never null here (see guess() usage in Template)
 
+        $this->lineno = 0;
         $template = null;
         $templateClass = null;
         $backtrace = debug_backtrace(\DEBUG_BACKTRACE_IGNORE_ARGS | \DEBUG_BACKTRACE_PROVIDE_OBJECT);
@@ -144,6 +151,8 @@ private function guessTemplateInfo(): void
                 if ($this->source->getName() === $trace['object']->getTemplateName() && !$isEmbedContainer) {
                     $template = $trace['object'];
                     $templateClass = \get_class($trace['object']);
+
+                    break;
                 }
             }
         }
@@ -158,8 +167,7 @@ private function guessTemplateInfo(): void
 
         while ($e = array_pop($exceptions)) {
             $traces = $e->getTrace();
-            array_unshift($traces, ['file' => $e->getFile(), 'line' => $e->getLine()]);
-
+            array_unshift($traces, ['file' => $e instanceof Error ? $e->phpFile : $e->getFile(), 'line' => $e instanceof Error ? $e->phpLine : $e->getLine()]);
             while ($trace = array_shift($traces)) {
                 if (!isset($trace['file']) || !isset($trace['line']) || $file != $trace['file']) {
                     continue;

tests/ErrorTest.php

@@ -12,13 +12,19 @@
  */
 
 use PHPUnit\Framework\TestCase;
+use Twig\Attribute\YieldReady;
+use Twig\Compiler;
 use Twig\Environment;
 use Twig\Error\Error;
 use Twig\Error\RuntimeError;
 use Twig\Error\SyntaxError;
 use Twig\Loader\ArrayLoader;
 use Twig\Loader\FilesystemLoader;
+use Twig\Loader\LoaderInterface;
+use Twig\Node\Node;
 use Twig\Source;
+use Twig\Token;
+use Twig\TokenParser\AbstractTokenParser;
 
 class ErrorTest extends TestCase
 {
@@ -253,6 +259,91 @@ public function testTwigExceptionUpdateFileAndLineTogether()
         }
     }
 
+    /**
+     * @dataProvider getErrorWithoutLineAndContextData
+     */
+    public function testErrorWithoutLineAndContext(LoaderInterface $loader, bool $debug, bool $addDebugInfo)
+    {
+        $twig = new Environment($loader, ['debug' => $debug, 'cache' => false]);
+        $twig->removeCache('no_line_and_context_exception.twig');
+        $twig->removeCache('no_line_and_context_exception_include.twig');
+        $twig->addTokenParser(new class($addDebugInfo) extends AbstractTokenParser {
+            public function __construct(private bool $addDebugInfo)
+            {
+            }
+
+            public function parse(Token $token)
+            {
+                $this->parser->getStream()->expect(Token::BLOCK_END_TYPE);
+
+                return new #[YieldReady]class($this->addDebugInfo) extends Node
+                {
+                    public function __construct(private bool $addDebugInfo)
+                    {
+                        parent::__construct([], [], 2);
+                    }
+
+                    public function compile(Compiler $compiler): void
+                    {
+                        if ($this->addDebugInfo) {
+                            $compiler->addDebugInfo($this);
+                        }
+                        $compiler->write('throw new \Twig\Error\RuntimeError("Runtime error.");');
+                    }
+                };
+            }
+
+            public function getTag()
+            {
+                return 'foo';
+            }
+        });
+
+        try {
+            $twig->render('no_line_and_context_exception.twig');
+            $this->fail();
+        } catch (RuntimeError $e) {
+            if ($addDebugInfo) {
+                $this->assertSame('Runtime error in "no_line_and_context_exception_include.twig" at line 2.', $e->getMessage());
+                $this->assertSame(2, $e->getTemplateLine());
+            } else {
+                $this->assertSame('Runtime error in "no_line_and_context_exception_include.twig".', $e->getMessage());
+                $this->assertSame(0, $e->getTemplateLine());
+            }
+
+            if ($loader instanceof FilesystemLoader) {
+                $this->assertStringContainsString('errors/no_line_and_context_exception_include.twig', $e->getFile());
+                if ($addDebugInfo) {
+                    $this->assertSame(2, $e->getLine());
+                } else {
+                    $this->assertSame(-1, $e->getLine());
+                }
+            } else {
+                $this->assertStringContainsString('Environment.php', $e->getFile());
+                $this->assertNotSame(2, $e->getLine());
+            }
+        }
+    }
+
+    public static function getErrorWithoutLineAndContextData(): iterable
+    {
+        $arrayLoader = new ArrayLoader([
+            'no_line_and_context_exception.twig' => '{{ include("no_line_and_context_exception_include.twig") }}',
+            'no_line_and_context_exception_include.twig' => '{% foo %}',
+        ]);
+
+        yield [$arrayLoader, false, false];
+        yield [$arrayLoader, false, true];
+        yield [$arrayLoader, true, false];
+        yield [$arrayLoader, true, true];
+
+        $filesystemLoader = new FilesystemLoader(__DIR__.'/Fixtures/errors');
+        yield [$filesystemLoader, false, false];
+        yield [$filesystemLoader, false, true];
+        yield [$filesystemLoader, true, false];
+        yield [$filesystemLoader, true, true];
+    }
+
     public static function getErroredTemplates()
     {
         return [

tests/Fixtures/errors/no_line_and_context_exception.twig

@@ -0,0 +1 @@
+{{ include('no_line_and_context_exception_include.twig') }}

tests/Fixtures/errors/no_line_and_context_exception_include.twig

@@ -0,0 +1 @@
+{% foo %}