Merge branch '11.5'

Author: sebastianbergmann

src/Event/Events/Test/Issue/DeprecationTriggered.php

@@ -156,8 +156,10 @@ public function asString(): string
         }
 
         return sprintf(
-            'Test Triggered Deprecation (%s)%s',
+            'Test Triggered Deprecation (%s) in %s:%d%s',
             implode(', ', $details),
+            $this->file,
+            $this->line,
             $message,
         );
     }

src/Event/Events/Test/Issue/ErrorTriggered.php

@@ -111,8 +111,10 @@ public function asString(): string
         }
 
         return sprintf(
-            'Test Triggered Error (%s)%s',
+            'Test Triggered Error (%s) in %s:%d%s',
             implode(', ', $details),
+            $this->file,
+            $this->line,
             $message,
         );
     }

src/Event/Events/Test/Issue/NoticeTriggered.php

@@ -122,8 +122,10 @@ public function asString(): string
         }
 
         return sprintf(
-            'Test Triggered Notice (%s)%s',
+            'Test Triggered Notice (%s) in %s:%d%s',
             implode(', ', $details),
+            $this->file,
+            $this->line,
             $message,
         );
     }

src/Event/Events/Test/Issue/PhpDeprecationTriggered.php

@@ -141,8 +141,10 @@ public function asString(): string
         }
 
         return sprintf(
-            'Test Triggered PHP Deprecation (%s)%s',
+            'Test Triggered PHP Deprecation (%s) in %s:%d%s',
             implode(', ', $details),
+            $this->file,
+            $this->line,
             $message,
         );
     }

src/Event/Events/Test/Issue/PhpNoticeTriggered.php

@@ -122,8 +122,10 @@ public function asString(): string
         }
 
         return sprintf(
-            'Test Triggered PHP Notice (%s)%s',
+            'Test Triggered PHP Notice (%s) in %s:%d%s',
             implode(', ', $details),
+            $this->file,
+            $this->line,
             $message,
         );
     }

src/Event/Events/Test/Issue/PhpWarningTriggered.php

@@ -122,8 +122,10 @@ public function asString(): string
         }
 
         return sprintf(
-            'Test Triggered PHP Warning (%s)%s',
+            'Test Triggered PHP Warning (%s) in %s:%d%s',
             implode(', ', $details),
+            $this->file,
+            $this->line,
             $message,
         );
     }

src/Event/Events/Test/Issue/WarningTriggered.php

@@ -122,8 +122,10 @@ public function asString(): string
         }
 
         return sprintf(
-            'Test Triggered Warning (%s)%s',
+            'Test Triggered Warning (%s) in %s:%d%s',
             implode(', ', $details),
+            $this->file,
+            $this->line,
             $message,
         );
     }

tests/end-to-end/cli/fail-on/fail-on-deprecation.phpt

@@ -22,7 +22,7 @@ Test Runner Execution Started (3 tests)
 Test Suite Started (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest, 3 tests)
 Test Preparation Started (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest::testOne)
 Test Prepared (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest::testOne)
-Test Triggered Deprecation (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest::testOne, unknown if issue was triggered in first-party code or third-party code)
+Test Triggered Deprecation (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest::testOne, unknown if issue was triggered in first-party code or third-party code) in %s:%d
 message
 Test Passed (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest::testOne)
 Test Finished (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest::testOne)

tests/end-to-end/cli/fail-on/fail-on-notice.phpt

@@ -22,7 +22,7 @@ Test Runner Execution Started (2 tests)
 Test Suite Started (PHPUnit\TestFixture\TestRunnerStopping\NoticeTest, 2 tests)
 Test Preparation Started (PHPUnit\TestFixture\TestRunnerStopping\NoticeTest::testOne)
 Test Prepared (PHPUnit\TestFixture\TestRunnerStopping\NoticeTest::testOne)
-Test Triggered Notice (PHPUnit\TestFixture\TestRunnerStopping\NoticeTest::testOne)
+Test Triggered Notice (PHPUnit\TestFixture\TestRunnerStopping\NoticeTest::testOne) in %s:%d
 message
 Test Passed (PHPUnit\TestFixture\TestRunnerStopping\NoticeTest::testOne)
 Test Finished (PHPUnit\TestFixture\TestRunnerStopping\NoticeTest::testOne)

tests/end-to-end/cli/fail-on/fail-on-phpunit-deprecation.phpt

@@ -22,7 +22,7 @@ Test Runner Execution Started (3 tests)
 Test Suite Started (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest, 3 tests)
 Test Preparation Started (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest::testOne)
 Test Prepared (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest::testOne)
-Test Triggered Deprecation (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest::testOne, unknown if issue was triggered in first-party code or third-party code)
+Test Triggered Deprecation (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest::testOne, unknown if issue was triggered in first-party code or third-party code) in %s:%d
 message
 Test Passed (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest::testOne)
 Test Finished (PHPUnit\TestFixture\TestRunnerStopping\DeprecationTest::testOne)