diff --git a/overrides/Runner/TestSuiteLoader.php b/overrides/Runner/TestSuiteLoader.php index 0719288b..6e9df439 100644 --- a/overrides/Runner/TestSuiteLoader.php +++ b/overrides/Runner/TestSuiteLoader.php @@ -98,14 +98,14 @@ final class TestSuiteLoader self::$loadedClasses = array_merge($loadedClasses, self::$loadedClasses); - if (empty(self::$loadedClasses)) { + if (empty($loadedClasses)) { return $this->exceptionFor($suiteClassName, $suiteClassFile); } $testCaseFound = false; - foreach (self::$loadedClasses as $loadedClass) { - if (is_subclass_of($loadedClass, HasPrintableTestCaseName::class)) { + foreach (array_reverse($loadedClasses) as $loadedClass) { + if (is_subclass_of($loadedClass, HasPrintableTestCaseName::class) || is_subclass_of($loadedClass, TestCase::class)) { $suiteClassName = $loadedClass; $testCaseFound = true; @@ -115,13 +115,7 @@ final class TestSuiteLoader } if (! $testCaseFound) { - foreach (self::$loadedClasses as $loadedClass) { - if (is_subclass_of($loadedClass, TestCase::class)) { - $suiteClassName = $loadedClass; - - break; - } - } + return $this->exceptionFor($suiteClassName, $suiteClassFile); } if (! class_exists($suiteClassName, false)) { diff --git a/src/Concerns/Retrievable.php b/src/Concerns/Retrievable.php index a2716887..a95031b1 100644 --- a/src/Concerns/Retrievable.php +++ b/src/Concerns/Retrievable.php @@ -13,7 +13,6 @@ trait Retrievable * @template TRetrievableValue * * Safely retrieve the value at the given key from an object or array. - * * @template TRetrievableValue * * @param array|object $value diff --git a/tests/.snapshots/success.txt b/tests/.snapshots/success.txt index 3c3a11d6..4df70c77 100644 --- a/tests/.snapshots/success.txt +++ b/tests/.snapshots/success.txt @@ -779,6 +779,9 @@ PASS Tests\PHPUnit\CustomAffixes\snakecasespec ✓ it runs file names like `snake_case_spec.php` + PASS Tests\CustomTestCase\ExecutedTest + ✓ that gets executed + PASS Tests\PHPUnit\CustomTestCase\UsesPerDirectory ✓ closure was bound to CustomTestCase @@ -894,4 +897,4 @@ PASS Tests\Visual\Version ✓ visual snapshot of help command output - Tests: 4 incomplete, 2 todos, 18 skipped, 621 passed (1533 assertions) \ No newline at end of file + Tests: 4 incomplete, 2 todos, 18 skipped, 622 passed (1509 assertions) \ No newline at end of file