Merge branch '10.5'

sebastianbergmann · Dec 18, 2023 · 3a95483 · 3a95483
2 parents ef80a8d + c1cf480
commit 3a95483
Show file tree

Hide file tree

Showing 20 changed files with 239 additions and 54 deletions.
diff --git a/src/Framework/TestRunner.php b/src/Framework/TestRunner.php
@@ -13,6 +13,7 @@
 use function assert;
 use function class_exists;
 use function defined;
+use function error_clear_last;
 use function extension_loaded;
 use function get_include_path;
 use function hrtime;
@@ -78,6 +79,8 @@ public function run(TestCase $test): void
         $risky      = false;
         $skipped    = false;
 
+        error_clear_last();
+
         if ($this->shouldErrorHandlerBeUsed($test)) {
             ErrorHandler::instance()->enable();
         }

diff --git a/src/Runner/ErrorHandler.php b/src/Runner/ErrorHandler.php
@@ -9,10 +9,18 @@
  */
 namespace PHPUnit\Runner;
 
+use const E_COMPILE_ERROR;
+use const E_COMPILE_WARNING;
+use const E_CORE_ERROR;
+use const E_CORE_WARNING;
 use const E_DEPRECATED;
+use const E_ERROR;
 use const E_NOTICE;
+use const E_PARSE;
+use const E_RECOVERABLE_ERROR;
 use const E_STRICT;
 use const E_USER_DEPRECATED;
+use const E_USER_ERROR;
 use const E_USER_NOTICE;
 use const E_USER_WARNING;
 use const E_WARNING;
@@ -30,9 +38,12 @@
  */
 final class ErrorHandler
 {
-    private static ?self $instance = null;
-    private ?Baseline $baseline    = null;
-    private bool $enabled          = false;
+    private const UNHANDLEABLE_LEVELS         = E_ERROR | E_PARSE | E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_COMPILE_WARNING;
+    private const INSUPPRESSIBLE_LEVELS       = E_ERROR | E_PARSE | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR;
+    private static ?self $instance            = null;
+    private ?Baseline $baseline               = null;
+    private bool $enabled                     = false;
+    private ?int $originalErrorReportingLevel = null;
 
     public static function instance(): self
     {
@@ -44,7 +55,7 @@ public static function instance(): self
      */
     public function __invoke(int $errorNumber, string $errorString, string $errorFile, int $errorLine): bool
     {
-        $suppressed = !($errorNumber & error_reporting());
+        $suppressed = (error_reporting() & ~self::INSUPPRESSIBLE_LEVELS) === 0;
 
         if ($suppressed && (new ExcludeList)->isExcluded($errorFile)) {
             return false;
@@ -140,13 +151,13 @@ public function __invoke(int $errorNumber, string $errorString, string $errorFil
                     $suppressed,
                 );
 
-                break;
+                throw new ErrorException('E_USER_ERROR was triggered');
 
             default:
                 return false;
         }
 
-        return true;
+        return false;
     }
 
     public function enable(): void
@@ -155,15 +166,12 @@ public function enable(): void
             return;
         }
 
-        $oldErrorHandler = set_error_handler($this);
+        set_error_handler($this);
 
-        if ($oldErrorHandler !== null) {
-            restore_error_handler();
+        $this->enabled                     = true;
+        $this->originalErrorReportingLevel = error_reporting();
 
-            return;
-        }
-
-        $this->enabled = true;
+        error_reporting($this->originalErrorReportingLevel & self::UNHANDLEABLE_LEVELS);
     }
 
     public function disable(): void
@@ -174,7 +182,10 @@ public function disable(): void
 
         restore_error_handler();
 
-        $this->enabled = false;
+        error_reporting(error_reporting() | $this->originalErrorReportingLevel);
+
+        $this->enabled                     = false;
+        $this->originalErrorReportingLevel = null;
     }
 
     public function use(Baseline $baseline): void

diff --git a/src/Runner/Exception/ErrorException.php b/src/Runner/Exception/ErrorException.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+namespace PHPUnit\Runner;
+
+use Error;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class ErrorException extends Error implements Exception
+{
+}
diff --git a/tests/end-to-end/event/_files/DeprecatedFeatureTest.php b/tests/end-to-end/event/_files/DeprecatedFeatureTest.php
@@ -10,6 +10,7 @@
 namespace PHPUnit\TestFixture\Event;
 
 use const E_USER_DEPRECATED;
+use function error_get_last;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 
@@ -22,4 +23,11 @@ public function testDeprecatedFeature(): void
 
         $this->assertTrue(true);
     }
+
+    public function testDeprecatedSuppressedErrorGetLast(): void
+    {
+        $this->assertNull(error_get_last());
+        @trigger_error('message', E_USER_DEPRECATED);
+        $this->assertIsArray(error_get_last());
+    }
 }
diff --git a/tests/end-to-end/event/_files/IgnoreDeprecationsTest.php b/tests/end-to-end/event/_files/IgnoreDeprecationsTest.php
@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\Event;
 
+use function error_get_last;
 use function trigger_error;
 use PHPUnit\Framework\Attributes\IgnoreDeprecations;
 use PHPUnit\Framework\TestCase;
@@ -29,4 +30,19 @@ public function testTwo(): void
 
         $this->assertTrue(true);
     }
+
+    #[IgnoreDeprecations]
+    public function testOneErrorGetLast(): void
+    {
+        $this->assertNull(error_get_last());
+        trigger_error('message', E_USER_DEPRECATED);
+        $this->assertIsArray(error_get_last());
+    }
+
+    public function testTwoErrorGetLast(): void
+    {
+        $this->assertNull(error_get_last());
+        trigger_error('message', E_USER_DEPRECATED);
+        $this->assertIsArray(error_get_last());
+    }
 }
diff --git a/tests/end-to-end/event/_files/SuppressedUserNoticeTest.php b/tests/end-to-end/event/_files/SuppressedUserNoticeTest.php
@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\Event;
 
+use function error_get_last;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 
@@ -20,4 +21,11 @@ public function testSuppressedUserNotice(): void
 
         @trigger_error('message', E_USER_NOTICE);
     }
+
+    public function testSuppressedUserNoticeErrorGetLast(): void
+    {
+        $this->assertNull(error_get_last());
+        @trigger_error('message', E_USER_NOTICE);
+        $this->assertIsArray(error_get_last());
+    }
 }
diff --git a/tests/end-to-end/event/_files/SuppressedUserWarningTest.php b/tests/end-to-end/event/_files/SuppressedUserWarningTest.php
@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\Event;
 
+use function error_get_last;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 
@@ -20,4 +21,11 @@ public function testSuppressedUserWarning(): void
 
         @trigger_error('message', E_USER_WARNING);
     }
+
+    public function testSuppressedUserWarningErrorGetLast(): void
+    {
+        $this->assertNull(error_get_last());
+        @trigger_error('message', E_USER_WARNING);
+        $this->assertIsArray(error_get_last());
+    }
 }
diff --git a/tests/end-to-end/event/_files/UserErrorTest.php b/tests/end-to-end/event/_files/UserErrorTest.php
@@ -20,4 +20,10 @@ public function testUserError(): void
 
         trigger_error('message', E_USER_ERROR);
     }
+
+    public function testUserErrorMustAbortExecution(): void
+    {
+        trigger_error('message', E_USER_ERROR);
+        $this->assertTrue(false);
+    }
 }
diff --git a/tests/end-to-end/event/_files/UserNoticeTest.php b/tests/end-to-end/event/_files/UserNoticeTest.php
@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\Event;
 
+use function error_get_last;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 
@@ -20,4 +21,11 @@ public function testUserNotice(): void
 
         trigger_error('message', E_USER_NOTICE);
     }
+
+    public function testUserNoticeErrorGetLast(): void
+    {
+        $this->assertNull(error_get_last());
+        trigger_error('message', E_USER_NOTICE);
+        $this->assertIsArray(error_get_last());
+    }
 }
diff --git a/tests/end-to-end/event/_files/UserWarningTest.php b/tests/end-to-end/event/_files/UserWarningTest.php
@@ -9,6 +9,7 @@
  */
 namespace PHPUnit\TestFixture\Event;
 
+use function error_get_last;
 use function trigger_error;
 use PHPUnit\Framework\TestCase;
 
@@ -20,4 +21,11 @@ public function testUserWarning(): void
 
         trigger_error('message', E_USER_WARNING);
     }
+
+    public function testUserWarningErrorGetLast(): void
+    {
+        $this->assertNull(error_get_last());
+        trigger_error('message', E_USER_WARNING);
+        $this->assertIsArray(error_get_last());
+    }
 }
diff --git a/tests/end-to-end/event/_files/error-handler-can-be-disabled/tests/FooTest.php b/tests/end-to-end/event/_files/error-handler-can-be-disabled/tests/FooTest.php
@@ -9,6 +9,8 @@
  */
 namespace PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled;
 
+use function restore_error_handler;
+use function set_error_handler;
 use function sys_get_temp_dir;
 use function tempnam;
 use Exception;
@@ -33,4 +35,26 @@ public function testMethodB(): void
     {
         $this->assertSame('Triggering', (new Foo)->methodB()['message']);
     }
+
+    public function testErrorHandlerSet(): void
+    {
+        $this->assertIsCallable($this->getErrorHandler());
+    }
+
+    #[WithoutErrorHandler]
+    public function testErrorHandlerIsNotSet(): void
+    {
+        $this->assertNull($this->getErrorHandler());
+    }
+
+    /**
+     * @return null|callable
+     */
+    private function getErrorHandler()
+    {
+        $res = set_error_handler(static fn () => false);
+        restore_error_handler();
+
+        return $res;
+    }
 }
diff --git a/tests/end-to-end/event/deprecations-can-be-ignored-using-attribute.phpt b/tests/end-to-end/event/deprecations-can-be-ignored-using-attribute.phpt
@@ -21,12 +21,12 @@ unlink($traceFile);
 --EXPECTF--
 PHPUnit Started (PHPUnit %s using %s)
 Test Runner Configured
-Test Suite Loaded (2 tests)
+Test Suite Loaded (4 tests)
 Event Facade Sealed
 Test Runner Started
 Test Suite Sorted
-Test Runner Execution Started (2 tests)
-Test Suite Started (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest, 2 tests)
+Test Runner Execution Started (4 tests)
+Test Suite Started (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest, 4 tests)
 Test Preparation Started (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testOne)
 Test Prepared (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testOne)
 Test Triggered Test-Ignored Deprecation (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testOne)
@@ -39,7 +39,19 @@ Test Triggered Deprecation (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::te
 message
 Test Passed (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testTwo)
 Test Finished (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testTwo)
-Test Suite Finished (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest, 2 tests)
+Test Preparation Started (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testOneErrorGetLast)
+Test Prepared (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testOneErrorGetLast)
+Test Triggered Test-Ignored Deprecation (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testOneErrorGetLast)
+message
+Test Passed (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testOneErrorGetLast)
+Test Finished (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testOneErrorGetLast)
+Test Preparation Started (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testTwoErrorGetLast)
+Test Prepared (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testTwoErrorGetLast)
+Test Triggered Deprecation (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testTwoErrorGetLast)
+message
+Test Passed (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testTwoErrorGetLast)
+Test Finished (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest::testTwoErrorGetLast)
+Test Suite Finished (PHPUnit\TestFixture\Event\IgnoreDeprecationsTest, 4 tests)
 Test Runner Execution Finished
 Test Runner Finished
 PHPUnit Finished (Shell Exit Code: 0)
diff --git a/tests/end-to-end/event/error-handler-can-be-disabled.phpt b/tests/end-to-end/event/error-handler-can-be-disabled.phpt
@@ -23,14 +23,14 @@ unlink($traceFile);
 PHPUnit Started (PHPUnit %s using %s)
 Test Runner Configured
 Bootstrap Finished (%s%esrc/Foo.php)
-Test Suite Loaded (2 tests)
+Test Suite Loaded (4 tests)
 Event Facade Sealed
 Test Runner Started
 Test Suite Sorted
-Test Runner Execution Started (2 tests)
-Test Suite Started (%s%ephpunit.xml, 2 tests)
-Test Suite Started (default, 2 tests)
-Test Suite Started (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest, 2 tests)
+Test Runner Execution Started (4 tests)
+Test Suite Started (%s%ephpunit.xml, 4 tests)
+Test Suite Started (default, 4 tests)
+Test Suite Started (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest, 4 tests)
 Test Preparation Started (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testMethodA)
 Test Prepared (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testMethodA)
 Test Passed (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testMethodA)
@@ -39,9 +39,17 @@ Test Preparation Started (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\Fo
 Test Prepared (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testMethodB)
 Test Passed (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testMethodB)
 Test Finished (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testMethodB)
-Test Suite Finished (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest, 2 tests)
-Test Suite Finished (default, 2 tests)
-Test Suite Finished (%s%ephpunit.xml, 2 tests)
+Test Preparation Started (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testErrorHandlerSet)
+Test Prepared (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testErrorHandlerSet)
+Test Passed (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testErrorHandlerSet)
+Test Finished (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testErrorHandlerSet)
+Test Preparation Started (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testErrorHandlerIsNotSet)
+Test Prepared (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testErrorHandlerIsNotSet)
+Test Passed (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testErrorHandlerIsNotSet)
+Test Finished (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testErrorHandlerIsNotSet)
+Test Suite Finished (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest, 4 tests)
+Test Suite Finished (default, 4 tests)
+Test Suite Finished (%s%ephpunit.xml, 4 tests)
 Test Runner Execution Finished
 Test Runner Finished
 PHPUnit Finished (Shell Exit Code: 0)