unit test error handler

Author: soyuka

src/Runner/ErrorHandler.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /*
  * This file is part of PHPUnit.
  *
@@ -209,6 +211,11 @@ public function deprecationHandler(int $errorNumber, string $errorString, string
  return true;
  }
 
+ public function registerDeprecationHandler(): void
+ {
+ set_error_handler([self::$instance, 'deprecationHandler'], E_USER_DEPRECATED);
+ }
+
  public function restoreDeprecationHandler(): void
  {
  restore_error_handler();
@@ -262,14 +269,6 @@ public function useDeprecationTriggers(array $deprecationTriggers): void
  $this->deprecationTriggers = $deprecationTriggers;
  }
 
- /**
- * @param list<array{int, string, string, int}> $deprecations
- */
- public function collectGlobalDeprecations(array $deprecations): void
- {
- $this->globalDeprecations = $deprecations;
- }
-
  /**
  * @param non-empty-string $file
  * @param positive-int $line
@@ -305,9 +304,11 @@ private function trigger(TestMethod $test, bool $filterTrigger): IssueTrigger
  }
  }
 
- if (isset($trace[1]['file']) &&
+ if (
+ isset($trace[1]['file']) &&
  ($trace[1]['file'] === $test->file() ||
- SourceFilter::instance()->includes($trace[1]['file']))) {
+ SourceFilter::instance()->includes($trace[1]['file']))
+ ) {
  $triggerCalledFromFirstPartyCode = true;
  }
 

src/TextUI/Application.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 /*
  * This file is part of PHPUnit.
  *
@@ -9,7 +11,6 @@
  */
 namespace PHPUnit\TextUI;
 
-use const E_USER_DEPRECATED;
 use const PHP_EOL;
 use const PHP_VERSION;
 use function assert;
@@ -21,7 +22,6 @@
 use function method_exists;
 use function printf;
 use function realpath;
-use function set_error_handler;
 use function sprintf;
 use function str_contains;
 use function trim;
@@ -180,7 +180,7 @@ public function run(array $argv): int
 
  EventFacade::instance()->seal();
 
- set_error_handler([ErrorHandler::instance(), 'deprecationHandler'], E_USER_DEPRECATED);
+ ErrorHandler::instance()->registerDeprecationHandler();
 
  $testSuite = $this->buildTestSuite($configuration);
 
@@ -227,8 +227,10 @@ public function run(array $argv): int
  $testDoxResult = $testDoxResultCollector->testMethodsGroupedByClass();
  }
 
- if ($testDoxResult !== null &&
- $configuration->hasLogfileTestdoxHtml()) {
+ if (
+ $testDoxResult !== null &&
+ $configuration->hasLogfileTestdoxHtml()
+ ) {
  try {
  OutputFacade::printerFor($configuration->logfileTestdoxHtml())->print(
  (new TestDoxHtmlRenderer)->render($testDoxResult),
@@ -244,8 +246,10 @@ public function run(array $argv): int
  }
  }
 
- if ($testDoxResult !== null &&
- $configuration->hasLogfileTestdoxText()) {
+ if (
+ $testDoxResult !== null &&
+ $configuration->hasLogfileTestdoxText()
+ ) {
  try {
  OutputFacade::printerFor($configuration->logfileTestdoxText())->print(
  (new TestDoxTextRenderer)->render($testDoxResult),
@@ -684,9 +688,11 @@ private function registerLogfileWriters(Configuration $configuration): void
  */
  private function testDoxResultCollector(Configuration $configuration): ?TestDoxResultCollector
  {
- if ($configuration->hasLogfileTestdoxHtml() ||
+ if (
+ $configuration->hasLogfileTestdoxHtml() ||
  $configuration->hasLogfileTestdoxText() ||
- $configuration->outputIsTestDox()) {
+ $configuration->outputIsTestDox()
+ ) {
  return new TestDoxResultCollector(
  EventFacade::instance(),
  new IssueFilter($configuration->source()),

tests/unit/Runner/ErrorHandlerTest.php

@@ -0,0 +1,37 @@
+<?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 const E_USER_DEPRECATED;
+use function trigger_error;
+use PHPUnit\Framework\Attributes\CoversClass;
+use PHPUnit\Framework\Attributes\Small;
+use PHPUnit\Framework\TestCase;
+use ReflectionClass;
+
+#[CoversClass(ErrorHandler::class)]
+#[Small]
+final class ErrorHandlerTest extends TestCase
+{
+ public function testThrowsExceptionWhenUsingInvalidOrderOption(): void
+ {
+ $errorHandler = ErrorHandler::instance();
+ $errorHandler->registerDeprecationHandler();
+ trigger_error('deprecation', E_USER_DEPRECATED);
+ $errorHandler->restoreDeprecationHandler();
+ $refl = new ReflectionClass($errorHandler);
+ $globalDeprecations = $refl->getProperty('globalDeprecations');
+ $registeredDeprecations = $globalDeprecations->getValue($errorHandler);
+ $this->assertCount(1, $registeredDeprecations);
+ $this->assertSame('deprecation', $registeredDeprecations[0][1]);
+ }
+}