Show origin of warning in error message

Fixes #6090
Codeception · Jan 23, 2021 · 2dd425e · 2dd425e
1 parent 3579d06
commit 2dd425e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/Codeception/Subscriber/ErrorHandler.php b/src/Codeception/Subscriber/ErrorHandler.php
@@ -80,7 +80,8 @@ public function errorHandler($errno, $errstr, $errfile, $errline, $context = arr
             return false;
         }
 
-        throw new \PHPUnit\Framework\Exception($errstr, $errno);
+        $relativePath = codecept_relative_path($errfile);
+        throw new \PHPUnit\Framework\Exception("$errstr at $relativePath:$errline", $errno);
     }
 
     public function shutdownHandler()

diff --git a/tests/unit/Codeception/Subscriber/ErrorHandlerTest.php b/tests/unit/Codeception/Subscriber/ErrorHandlerTest.php
@@ -23,4 +23,12 @@ public function testDeprecationMessagesRespectErrorLevelSetting()
 
         $this->assertEquals([], Notification::all(), 'Deprecation message was added to notifications');
     }
+
+    public function testShowsLocationOfWarning()
+    {
+        $this->expectException(\PHPUnit\Framework\Exception::class);
+        $SEP = DIRECTORY_SEPARATOR;
+        $this->expectErrorMessage("Undefined variable: a at tests{$SEP}unit{$SEP}Codeception{$SEP}Subscriber{$SEP}ErrorHandlerTest.php:32");
+        $b = $a + 1;
+    }
 }