Merge branch '3.x' into 4.x

* 3.x:
  Improve error reporting

Author: fabpot

src/Error/Error.php

@@ -106,41 +106,26 @@ public function appendMessage($rawMessage): void
 
     private function updateRepr(): void
     {
-        $this->message = $this->rawMessage;
-
-        if ($this->source && $this->source->getPath() && $this->lineno > 0) {
-            $this->file = $this->source->getPath();
+        if ($this->lineno > 0) {
             $this->line = $this->lineno;
-
-            return;
         }
-
-        $dot = false;
-        if (str_ends_with($this->message, '.')) {
-            $this->message = substr($this->message, 0, -1);
-            $dot = true;
+        if ($this->source && $this->source->getPath()) {
+            $this->file = $this->source->getPath();
         }
 
-        $questionMark = false;
-        if (str_ends_with($this->message, '?')) {
+        $this->message = $this->rawMessage;
+        $last = substr($this->message, -1);
+        if ($punctuation = '.' === $last || '?' === $last ? $last : '') {
             $this->message = substr($this->message, 0, -1);
-            $questionMark = true;
         }
-
         if ($this->source && $this->source->getName()) {
             $this->message .= \sprintf(' in "%s"', $this->source->getName());
         }
-
         if ($this->lineno > 0) {
             $this->message .= \sprintf(' at line %d', $this->lineno);
         }
-
-        if ($dot) {
-            $this->message .= '.';
-        }
-
-        if ($questionMark) {
-            $this->message .= '?';
+        if ($punctuation) {
+            $this->message .= $punctuation;
         }
     }
 

tests/ErrorTest.php

@@ -98,7 +98,7 @@ public function testTwigExceptionGuessWithMissingVarAndFilesystemLoader()
 
             $this->fail();
         } catch (RuntimeError $e) {
-            $this->assertEquals('Variable "foo" does not exist.', $e->getMessage());
+            $this->assertEquals('Variable "foo" does not exist in "index.html" at line 3.', $e->getMessage());
             $this->assertEquals(3, $e->getTemplateLine());
             $this->assertEquals('index.html', $e->getSourceContext()->getName());
             $this->assertEquals(3, $e->getLine());
@@ -117,7 +117,7 @@ public function testTwigExceptionGuessWithExceptionAndFilesystemLoader()
 
             $this->fail();
         } catch (RuntimeError $e) {
-            $this->assertEquals('An exception has been thrown during the rendering of a template ("Runtime error...").', $e->getMessage());
+            $this->assertEquals('An exception has been thrown during the rendering of a template ("Runtime error...") in "index.html" at line 3.', $e->getMessage());
             $this->assertEquals(3, $e->getTemplateLine());
             $this->assertEquals('index.html', $e->getSourceContext()->getName());
             $this->assertEquals(3, $e->getLine());