Merge branch '8.5' into 9.5

sebastianbergmann · Jan 15, 2022 · b090825 · b090825
2 parents a814b03 + 9b5a2e5
commit b090825
Show file tree

Hide file tree

Showing 14 changed files with 85 additions and 47 deletions.
diff --git a/src/Framework/TestListener.php b/src/Framework/TestListener.php
@@ -12,74 +12,34 @@
 use Throwable;
 
 /**
- * @deprecated Use the `TestHook` interfaces instead
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @deprecated
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface TestListener
 {
-    /**
-     * An error occurred.
-     *
-     * @deprecated Use `AfterTestErrorHook::executeAfterTestError` instead
-     */
     public function addError(Test $test, Throwable $t, float $time): void;
 
-    /**
-     * A warning occurred.
-     *
-     * @deprecated Use `AfterTestWarningHook::executeAfterTestWarning` instead
-     */
     public function addWarning(Test $test, Warning $e, float $time): void;
 
-    /**
-     * A failure occurred.
-     *
-     * @deprecated Use `AfterTestFailureHook::executeAfterTestFailure` instead
-     */
     public function addFailure(Test $test, AssertionFailedError $e, float $time): void;
 
-    /**
-     * Incomplete test.
-     *
-     * @deprecated Use `AfterIncompleteTestHook::executeAfterIncompleteTest` instead
-     */
     public function addIncompleteTest(Test $test, Throwable $t, float $time): void;
 
-    /**
-     * Risky test.
-     *
-     * @deprecated Use `AfterRiskyTestHook::executeAfterRiskyTest` instead
-     */
     public function addRiskyTest(Test $test, Throwable $t, float $time): void;
 
-    /**
-     * Skipped test.
-     *
-     * @deprecated Use `AfterSkippedTestHook::executeAfterSkippedTest` instead
-     */
     public function addSkippedTest(Test $test, Throwable $t, float $time): void;
 
-    /**
-     * A test suite started.
-     */
     public function startTestSuite(TestSuite $suite): void;
 
-    /**
-     * A test suite ended.
-     */
     public function endTestSuite(TestSuite $suite): void;
 
-    /**
-     * A test started.
-     *
-     * @deprecated Use `BeforeTestHook::executeBeforeTest` instead
-     */
     public function startTest(Test $test): void;
 
-    /**
-     * A test ended.
-     *
-     * @deprecated Use `AfterTestHook::executeAfterTest` instead
-     */
     public function endTest(Test $test, float $time): void;
 }
diff --git a/src/Runner/Hook/AfterIncompleteTestHook.php b/src/Runner/Hook/AfterIncompleteTestHook.php
@@ -10,7 +10,13 @@
 namespace PHPUnit\Runner;
 
 /**
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface AfterIncompleteTestHook extends TestHook
 {

diff --git a/src/Runner/Hook/AfterLastTestHook.php b/src/Runner/Hook/AfterLastTestHook.php
@@ -10,7 +10,13 @@
 namespace PHPUnit\Runner;
 
 /**
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface AfterLastTestHook extends Hook
 {

diff --git a/src/Runner/Hook/AfterRiskyTestHook.php b/src/Runner/Hook/AfterRiskyTestHook.php
@@ -10,7 +10,13 @@
 namespace PHPUnit\Runner;
 
 /**
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface AfterRiskyTestHook extends TestHook
 {

diff --git a/src/Runner/Hook/AfterSkippedTestHook.php b/src/Runner/Hook/AfterSkippedTestHook.php
@@ -10,7 +10,13 @@
 namespace PHPUnit\Runner;
 
 /**
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface AfterSkippedTestHook extends TestHook
 {

diff --git a/src/Runner/Hook/AfterSuccessfulTestHook.php b/src/Runner/Hook/AfterSuccessfulTestHook.php
@@ -10,7 +10,13 @@
 namespace PHPUnit\Runner;
 
 /**
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface AfterSuccessfulTestHook extends TestHook
 {

diff --git a/src/Runner/Hook/AfterTestErrorHook.php b/src/Runner/Hook/AfterTestErrorHook.php
@@ -10,7 +10,13 @@
 namespace PHPUnit\Runner;
 
 /**
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface AfterTestErrorHook extends TestHook
 {

diff --git a/src/Runner/Hook/AfterTestFailureHook.php b/src/Runner/Hook/AfterTestFailureHook.php
@@ -10,7 +10,13 @@
 namespace PHPUnit\Runner;
 
 /**
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface AfterTestFailureHook extends TestHook
 {

diff --git a/src/Runner/Hook/AfterTestHook.php b/src/Runner/Hook/AfterTestHook.php
@@ -10,7 +10,13 @@
 namespace PHPUnit\Runner;
 
 /**
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface AfterTestHook extends TestHook
 {

diff --git a/src/Runner/Hook/AfterTestWarningHook.php b/src/Runner/Hook/AfterTestWarningHook.php
@@ -10,7 +10,13 @@
 namespace PHPUnit\Runner;
 
 /**
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface AfterTestWarningHook extends TestHook
 {

diff --git a/src/Runner/Hook/BeforeFirstTestHook.php b/src/Runner/Hook/BeforeFirstTestHook.php
@@ -10,7 +10,13 @@
 namespace PHPUnit\Runner;
 
 /**
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface BeforeFirstTestHook extends Hook
 {

diff --git a/src/Runner/Hook/BeforeTestHook.php b/src/Runner/Hook/BeforeTestHook.php
@@ -10,7 +10,13 @@
 namespace PHPUnit\Runner;
 
 /**
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface BeforeTestHook extends TestHook
 {

diff --git a/src/Runner/Hook/Hook.php b/src/Runner/Hook/Hook.php
@@ -10,7 +10,13 @@
 namespace PHPUnit\Runner;
 
 /**
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface Hook
 {

diff --git a/src/Runner/Hook/TestHook.php b/src/Runner/Hook/TestHook.php
@@ -10,7 +10,13 @@
 namespace PHPUnit\Runner;
 
 /**
+ * This interface, as well as the associated mechanism for extending PHPUnit,
+ * will be removed in PHPUnit 10. There is no alternative available in this
+ * version of PHPUnit.
+ *
  * @no-named-arguments Parameter names are not covered by the backward compatibility promise for PHPUnit
+ *
+ * @see https://github.com/sebastianbergmann/phpunit/issues/4676
  */
 interface TestHook extends Hook
 {