Revert "Simplify"

This reverts commit 7b0ef67.

src/Framework/Error/Deprecation.php

@@ -0,0 +1,17 @@
+<?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\Framework\Error;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class Deprecation extends Error
+{
+}

src/Framework/Error/Notice.php

@@ -0,0 +1,17 @@
+<?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\Framework\Error;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class Notice extends Error
+{
+}

src/Framework/Error/Warning.php

@@ -0,0 +1,17 @@
+<?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\Framework\Error;
+
+/**
+ * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ */
+final class Warning extends Error
+{
+}

src/Util/ErrorHandler.php

@@ -9,7 +9,10 @@
  */
 namespace PHPUnit\Util;
 
+use PHPUnit\Framework\Error\Deprecation;
 use PHPUnit\Framework\Error\Error;
+use PHPUnit\Framework\Error\Notice;
+use PHPUnit\Framework\Error\Warning;
 
 final class ErrorHandler
 {
@@ -84,33 +87,31 @@ public function __invoke(int $errorNumber, string $errorString, string $errorFil
                     return false;
                 }
 
-                break;
+                throw new Notice($errorString, $errorNumber, $errorFile, $errorLine);
 
             case \E_WARNING:
             case \E_USER_WARNING:
                 if (!$this->convertWarningsToExceptions) {
                     return false;
                 }
 
-                break;
+                throw new Warning($errorString, $errorNumber, $errorFile, $errorLine);
 
             case \E_DEPRECATED:
             case \E_USER_DEPRECATED:
                 if (!$this->convertDeprecationsToExceptions) {
                     return false;
                 }
 
-                break;
+                throw new Deprecation($errorString, $errorNumber, $errorFile, $errorLine);
 
             default:
                 if (!$this->convertErrorsToExceptions) {
                     return false;
                 }
 
-                break;
+                throw new Error($errorString, $errorNumber, $errorFile, $errorLine);
         }
-
-        throw new Error($errorString, $errorNumber, $errorFile, $errorLine);
     }
 
     public function register(): void