Simplify ShutdownHandler

Author: staabm

src/Framework/TestRunner/TestRunner.php

@@ -24,7 +24,6 @@
 use PHPUnit\Runner\CodeCoverage;
 use PHPUnit\Runner\ErrorHandler;
 use PHPUnit\Runner\Exception;
-use PHPUnit\Runner\ShutdownHandler;
 use PHPUnit\TextUI\Configuration\Configuration;
 use PHPUnit\TextUI\Configuration\Registry as ConfigurationRegistry;
 use SebastianBergmann\CodeCoverage\Exception as CodeCoverageException;
@@ -84,7 +83,6 @@ public function run(TestCase $test): void
         if ($this->shouldErrorHandlerBeUsed($test)) {
             ErrorHandler::instance()->enable();
         }
-        ShutdownHandler::register();
 
         $collectCodeCoverage = CodeCoverage::instance()->isActive() &&
                                $shouldCodeCoverageBeCollected;

src/Runner/ShutdownHandler.php

@@ -23,6 +23,8 @@ final class ShutdownHandler
 
     public static function setMessage(string $message): void
     {
+        self::register();
+
         self::$message = $message;
     }
 
@@ -31,7 +33,7 @@ public static function resetMessage(): void
         self::$message = '';
     }
 
-    public static function register(): void
+    private static function register(): void
     {
         if (self::$registered) {
             return;