Merge branch '8.5' into 9.4

Author: sebastianbergmann

.psalm/baseline.xml

@@ -465,9 +465,6 @@
     <PossiblyUnusedMethod occurrences="1">
       <code>getMessage</code>
     </PossiblyUnusedMethod>
-    <PossiblyUnusedProperty occurrences="1">
-      <code>$useErrorHandler</code>
-    </PossiblyUnusedProperty>
   </file>
   <file src="src/Framework/MockObject/Builder/Identity.php">
     <MissingReturnType occurrences="1">
@@ -799,9 +796,6 @@
     <PossiblyUnusedMethod occurrences="1">
       <code>getMessage</code>
     </PossiblyUnusedMethod>
-    <PossiblyUnusedProperty occurrences="1">
-      <code>$useErrorHandler</code>
-    </PossiblyUnusedProperty>
   </file>
   <file src="src/Framework/Test.php">
     <PossiblyUnusedMethod occurrences="1">
@@ -1127,11 +1121,6 @@
       <code>getChildren</code>
     </PossiblyUnusedMethod>
   </file>
-  <file src="src/Framework/WarningTestCase.php">
-    <PossiblyUnusedProperty occurrences="1">
-      <code>$useErrorHandler</code>
-    </PossiblyUnusedProperty>
-  </file>
   <file src="src/Runner/BaseTestRunner.php">
     <DeprecatedClass occurrences="2">
       <code>TestSuiteLoader</code>

src/Framework/IncompleteTestCase.php

@@ -29,11 +29,6 @@ final class IncompleteTestCase extends TestCase
      */
     protected $runTestInSeparateProcess = false;
 
-    /**
-     * @var bool
-     */
-    protected $useErrorHandler = false;
-
     /**
      * @var string
      */

src/Framework/SkippedTestCase.php

@@ -29,11 +29,6 @@ final class SkippedTestCase extends TestCase
      */
     protected $runTestInSeparateProcess = false;
 
-    /**
-     * @var bool
-     */
-    protected $useErrorHandler = false;
-
     /**
      * @var string
      */

src/Framework/WarningTestCase.php

@@ -29,11 +29,6 @@ final class WarningTestCase extends TestCase
      */
     protected $runTestInSeparateProcess = false;
 
-    /**
-     * @var bool
-     */
-    protected $useErrorHandler = false;
-
     /**
      * @var string
      */
@@ -45,6 +40,7 @@ final class WarningTestCase extends TestCase
     public function __construct($message = '')
     {
         $this->message = $message;
+
         parent::__construct('Warning');
     }