Closes #3777

.psalm/baseline.xml

@@ -1191,7 +1191,7 @@
       <code>$matches</code>
     </MissingClosureParamType>
   </file>
-  <file src="src/Util/ErrorHandler.php">
+  <file src="src/Util/Error/Handler.php">
     <InvalidArgument occurrences="1"/>
     <MissingClosureParamType occurrences="2">
       <code>$errorNumber</code>

ChangeLog-10.0.md

@@ -11,6 +11,7 @@ All notable changes of the PHPUnit 10.0 release series are documented in this fi
 ### Removed
 
 * [#3769](https://github.com/sebastianbergmann/phpunit/issues/3769): Remove `MockBuilder::setMethods()` and `MockBuilder::setMethodsExcept()`
+* [#3777](https://github.com/sebastianbergmann/phpunit/issues/3777): Remove `PHPUnit\Framework\Error\*` classes
 * [#3870](https://github.com/sebastianbergmann/phpunit/issues/3870): Drop support for PHP 7.3
 * [#4063](https://github.com/sebastianbergmann/phpunit/issues/4063): Remove `assertNotIsReadable()`
 * [#4066](https://github.com/sebastianbergmann/phpunit/issues/4066): Remove `assertNotIsWritable()`

src/Framework/TestCase.php

@@ -64,10 +64,6 @@
 use PHPUnit\Framework\Constraint\ExceptionCode;
 use PHPUnit\Framework\Constraint\ExceptionMessage;
 use PHPUnit\Framework\Constraint\ExceptionMessageRegularExpression;
-use PHPUnit\Framework\Error\Deprecated;
-use PHPUnit\Framework\Error\Error;
-use PHPUnit\Framework\Error\Notice;
-use PHPUnit\Framework\Error\Warning as WarningError;
 use PHPUnit\Framework\MockObject\Generator as MockGenerator;
 use PHPUnit\Framework\MockObject\MockBuilder;
 use PHPUnit\Framework\MockObject\MockObject;
@@ -86,6 +82,10 @@
 use PHPUnit\Framework\MockObject\Stub\ReturnValueMap as ReturnValueMapStub;
 use PHPUnit\Runner\BaseTestRunner;
 use PHPUnit\Runner\PhptTestCase;
+use PHPUnit\Util\Error\Deprecation;
+use PHPUnit\Util\Error\Error;
+use PHPUnit\Util\Error\Notice;
+use PHPUnit\Util\Error\Warning as WarningError;
 use PHPUnit\Util\Exception as UtilException;
 use PHPUnit\Util\GlobalState;
 use PHPUnit\Util\PHP\AbstractPhpProcess;
@@ -451,30 +451,6 @@ public function expectOutputString(string $expectedString): void
      */
     public function expectException(string $exception): void
     {
-        // @codeCoverageIgnoreStart
-        switch ($exception) {
-            case Deprecated::class:
-                $this->addWarning('Support for using expectException() with PHPUnit\Framework\Error\Deprecated is deprecated and will be removed in PHPUnit 10. Use expectDeprecation() instead.');
-
-            break;
-
-            case Error::class:
-                $this->addWarning('Support for using expectException() with PHPUnit\Framework\Error\Error is deprecated and will be removed in PHPUnit 10. Use expectError() instead.');
-
-            break;
-
-            case Notice::class:
-                $this->addWarning('Support for using expectException() with PHPUnit\Framework\Error\Notice is deprecated and will be removed in PHPUnit 10. Use expectNotice() instead.');
-
-            break;
-
-            case WarningError::class:
-                $this->addWarning('Support for using expectException() with PHPUnit\Framework\Error\Warning is deprecated and will be removed in PHPUnit 10. Use expectWarning() instead.');
-
-            break;
-        }
-        // @codeCoverageIgnoreEnd
-
         $this->expectedException = $exception;
     }
 
@@ -515,7 +491,7 @@ public function expectNotToPerformAssertions(): void
 
     public function expectDeprecation(): void
     {
-        $this->expectedException = Deprecated::class;
+        $this->expectedException = Deprecation::class;
     }
 
     public function expectDeprecationMessage(string $message): void

src/Framework/TestFailure.php

@@ -12,7 +12,7 @@
 use function get_class;
 use function sprintf;
 use function trim;
-use PHPUnit\Framework\Error\Error;
+use PHPUnit\Util\Error\Error;
 use Throwable;
 
 /**

src/Framework/TestResult.php

@@ -17,7 +17,7 @@
 use AssertionError;
 use Countable;
 use Error;
-use PHPUnit\Util\ErrorHandler;
+use PHPUnit\Util\Error\Handler;
 use PHPUnit\Util\ExcludeList;
 use PHPUnit\Util\Printer;
 use PHPUnit\Util\Test as TestUtil;
@@ -571,7 +571,7 @@ public function run(Test $test): void
         $this->startTest($test);
 
         if ($this->convertDeprecationsToExceptions || $this->convertErrorsToExceptions || $this->convertNoticesToExceptions || $this->convertWarningsToExceptions) {
-            $errorHandler = new ErrorHandler(
+            $errorHandler = new Handler(
                 $this->convertDeprecationsToExceptions,
                 $this->convertErrorsToExceptions,
                 $this->convertNoticesToExceptions,

src/Runner/DefaultTestResultCache.php

@@ -24,7 +24,7 @@
 use function serialize;
 use function sprintf;
 use function unserialize;
-use PHPUnit\Util\ErrorHandler;
+use PHPUnit\Util\Error\Handler;
 use PHPUnit\Util\Filesystem;
 use Serializable;
 
@@ -161,7 +161,7 @@ public function load(): void
         }
         // @codeCoverageIgnoreEnd
 
-        $cache = ErrorHandler::invokeIgnoringWarnings(
+        $cache = Handler::invokeIgnoringWarnings(
             static function () use ($cacheData) {
                 return @unserialize($cacheData, ['allowed_classes' => [self::class]]);
             }

src/Framework/Error/Deprecated.php → src/Util/Error/Deprecation.php

@@ -7,11 +7,11 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace PHPUnit\Framework\Error;
+namespace PHPUnit\Util\Error;
 
 /**
  * @internal
  */
-final class Deprecated extends Error
+final class Deprecation extends Error
 {
 }

src/Framework/Error/Error.php → src/Util/Error/Error.php

@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace PHPUnit\Framework\Error;
+namespace PHPUnit\Util\Error;
 
 use PHPUnit\Framework\Exception;
 

src/Util/ErrorHandler.php → src/Util/Error/Handler.php

@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace PHPUnit\Util;
+namespace PHPUnit\Util\Error;
 
 use const E_DEPRECATED;
 use const E_NOTICE;
@@ -19,15 +19,11 @@
 use function error_reporting;
 use function restore_error_handler;
 use function set_error_handler;
-use PHPUnit\Framework\Error\Deprecated;
-use PHPUnit\Framework\Error\Error;
-use PHPUnit\Framework\Error\Notice;
-use PHPUnit\Framework\Error\Warning;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
  */
-final class ErrorHandler
+final class Handler
 {
     private bool $convertDeprecationsToExceptions;
 
@@ -101,7 +97,7 @@ public function __invoke(int $errorNumber, string $errorString, string $errorFil
                     return false;
                 }
 
-                throw new Deprecated($errorString, $errorNumber, $errorFile, $errorLine);
+                throw new Deprecation($errorString, $errorNumber, $errorFile, $errorLine);
 
             default:
                 if (!$this->convertErrorsToExceptions) {

src/Framework/Error/Notice.php → src/Util/Error/Notice.php

@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace PHPUnit\Framework\Error;
+namespace PHPUnit\Util\Error;
 
 /**
  * @internal

src/Framework/Error/Warning.php → src/Util/Error/Warning.php

@@ -7,7 +7,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
-namespace PHPUnit\Framework\Error;
+namespace PHPUnit\Util\Error;
 
 /**
  * @internal

src/Util/RegularExpression.php

@@ -10,6 +10,7 @@
 namespace PHPUnit\Util;
 
 use function preg_match;
+use PHPUnit\Util\Error\Handler;
 
 /**
  * @internal This class is not covered by the backward compatibility promise for PHPUnit
@@ -21,7 +22,7 @@ final class RegularExpression
      */
     public static function safeMatch(string $pattern, string $subject)
     {
-        return ErrorHandler::invokeIgnoringWarnings(
+        return Handler::invokeIgnoringWarnings(
             static function () use ($pattern, $subject) {
                 return preg_match($pattern, $subject);
             }

tests/unit/Framework/TestFailureTest.php

@@ -9,8 +9,8 @@
  */
 namespace PHPUnit\Framework;
 
-use PHPUnit\Framework\Error\Error;
 use PHPUnit\TestFixture\NotSelfDescribingTest;
+use PHPUnit\Util\Error\Error;
 use SebastianBergmann\Comparator\ComparisonFailure;
 
 /**