Merge branch '11.5' into 12.5

* 11.5:
  Fix
  Make PHPUnit\Framework\MockObject exceptions subtypes of PHPUnit\Exception

Author: sebastianbergmann

src/Event/Emitter/Emitter.php

@@ -22,7 +22,7 @@
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  *
- * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ * @internal This interface is not covered by the backward compatibility promise for PHPUnit
  */
 interface Emitter
 {

src/Framework/Exception/Incomplete/IncompleteTest.php

@@ -14,7 +14,7 @@
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  *
- * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ * @internal This interface is not covered by the backward compatibility promise for PHPUnit
  */
 interface IncompleteTest extends Throwable
 {

src/Framework/Exception/Skipped/SkippedTest.php

@@ -14,7 +14,7 @@
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  *
- * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ * @internal This interface is not covered by the backward compatibility promise for PHPUnit
  */
 interface SkippedTest extends Throwable
 {

src/Framework/MockObject/Exception/Exception.php

@@ -9,13 +9,11 @@
  */
 namespace PHPUnit\Framework\MockObject;
 
-use Throwable;
-
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  *
- * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ * @internal This interface is not covered by the backward compatibility promise for PHPUnit
  */
-interface Exception extends Throwable
+interface Exception extends \PHPUnit\Exception
 {
 }

src/Framework/MockObject/Runtime/Stub/Stub.php

@@ -14,7 +14,7 @@
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  *
- * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ * @internal This interface is not covered by the backward compatibility promise for PHPUnit
  */
 interface Stub
 {

src/Framework/Reorderable.php

@@ -12,7 +12,7 @@
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  *
- * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ * @internal This interface is not covered by the backward compatibility promise for PHPUnit
  */
 interface Reorderable
 {

src/Metadata/Parser/Parser.php

@@ -14,7 +14,7 @@
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  *
- * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ * @internal This interface is not covered by the backward compatibility promise for PHPUnit
  */
 interface Parser
 {

src/Runner/Exception/Exception.php

@@ -12,7 +12,7 @@
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  *
- * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ * @internal This interface is not covered by the backward compatibility promise for PHPUnit
  */
 interface Exception extends \PHPUnit\Exception
 {

src/Runner/ResultCache/ResultCache.php

@@ -14,7 +14,7 @@
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  *
- * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ * @internal This interface is not covered by the backward compatibility promise for PHPUnit
  */
 interface ResultCache
 {

src/TextUI/Command/Command.php

@@ -12,7 +12,7 @@
 /**
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
  *
- * @internal This class is not covered by the backward compatibility promise for PHPUnit
+ * @internal This interface is not covered by the backward compatibility promise for PHPUnit
  */
 interface Command
 {