From a478798cfed4756a82f52f6e187666e6715d75fc Mon Sep 17 00:00:00 2001 From: Fabio Ivona Date: Tue, 21 Feb 2023 00:02:15 +0100 Subject: [PATCH 1/4] lint --- overrides/Runner/ResultCache/DefaultResultCache.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/overrides/Runner/ResultCache/DefaultResultCache.php b/overrides/Runner/ResultCache/DefaultResultCache.php index f02a06c7..d3cc22ff 100644 --- a/overrides/Runner/ResultCache/DefaultResultCache.php +++ b/overrides/Runner/ResultCache/DefaultResultCache.php @@ -47,7 +47,6 @@ namespace PHPUnit\Runner\ResultCache; use function array_keys; use function assert; -use function Pest\version; use const DIRECTORY_SEPARATOR; use function dirname; use function file_get_contents; @@ -57,6 +56,7 @@ use function is_dir; use function is_file; use function json_decode; use function json_encode; +use function Pest\version; use PHPUnit\Framework\TestStatus\TestStatus; use PHPUnit\Runner\DirectoryCannotBeCreatedException; use PHPUnit\Runner\Exception; @@ -180,6 +180,6 @@ final class DefaultResultCache implements ResultCache */ private function cacheVersion(): string { - return 'pest_' . version(); + return 'pest_'.version(); } } From d6c8149a3a1e7482bba6112f006640aadf8add28 Mon Sep 17 00:00:00 2001 From: Fabio Ivona Date: Mon, 13 Mar 2023 14:20:42 +0100 Subject: [PATCH 2/4] fix phpunit 10.0.16 internal breaking changes --- src/Support/StateGenerator.php | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/src/Support/StateGenerator.php b/src/Support/StateGenerator.php index 23bf025a..ba87b314 100644 --- a/src/Support/StateGenerator.php +++ b/src/Support/StateGenerator.php @@ -8,8 +8,10 @@ use NunoMaduro\Collision\Adapters\Phpunit\State; use NunoMaduro\Collision\Adapters\Phpunit\TestResult; use NunoMaduro\Collision\Exceptions\TestOutcome; use PHPUnit\Event\Code\TestDox; +use PHPUnit\Event\Code\TestDoxBuilder; use PHPUnit\Event\Code\TestMethod; use PHPUnit\Event\Code\Throwable; +use PHPUnit\Event\Code\ThrowableBuilder; use PHPUnit\Event\Test\Errored; use PHPUnit\Event\TestData\TestDataCollection; use PHPUnit\Framework\SkippedWithMessageException; @@ -55,7 +57,8 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $riskyEvent->test(), TestResult::RISKY, - Throwable::from(new TestOutcome($riskyEvent->message())) + /** @phpstan-ignore-next-line */ + method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($riskyEvent->message())) : ThrowableBuilder::from(new TestOutcome($riskyEvent->message())) )); } } @@ -70,7 +73,8 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $testResultEvent->test(), TestResult::SKIPPED, - Throwable::from(new SkippedWithMessageException($testResultEvent->message())) + /** @phpstan-ignore-next-line */ + method_exists(Throwable::class, 'from') ? Throwable::from(new SkippedWithMessageException($testResultEvent->message())) : ThrowableBuilder::from(new SkippedWithMessageException($testResultEvent->message())) )); } @@ -80,7 +84,8 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $testResultEvent->test(), TestResult::DEPRECATED, - Throwable::from(new TestOutcome($testResultEvent->message())) + /** @phpstan-ignore-next-line */ + method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($testResultEvent->message())) : ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) )); } @@ -90,7 +95,8 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $testResultEvent->test(), TestResult::DEPRECATED, - Throwable::from(new TestOutcome($testResultEvent->message())) + /** @phpstan-ignore-next-line */ + method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($testResultEvent->message())) : ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) )); } @@ -100,7 +106,8 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $testResultEvent->test(), TestResult::NOTICE, - Throwable::from(new TestOutcome($testResultEvent->message())) + /** @phpstan-ignore-next-line */ + method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($testResultEvent->message())) : ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) )); } @@ -110,7 +117,8 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $testResultEvent->test(), TestResult::NOTICE, - Throwable::from(new TestOutcome($testResultEvent->message())) + /** @phpstan-ignore-next-line */ + method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($testResultEvent->message())) : ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) )); } @@ -120,7 +128,8 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $testResultEvent->test(), TestResult::WARN, - Throwable::from(new TestOutcome($testResultEvent->message())) + /** @phpstan-ignore-next-line */ + method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($testResultEvent->message())) : ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) )); } @@ -130,7 +139,8 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $testResultEvent->test(), TestResult::WARN, - Throwable::from(new TestOutcome($testResultEvent->message())) + /** @phpstan-ignore-next-line */ + method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($testResultEvent->message())) : ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) )); } @@ -145,7 +155,7 @@ final class StateGenerator '', 1, /** @phpstan-ignore-next-line */ - TestDox::fromClassNameAndMethodName('', ''), + method_exists(TestDox::class, 'fromClassNameAndMethodName') ? TestDox::fromClassNameAndMethodName('', '') : TestDoxBuilder::fromClassNameAndMethodName('', ''), MetadataCollection::fromArray([]), TestDataCollection::fromArray([]) ), From 3d1e0c3f9f906c86ccef0183c106489691e4d3ac Mon Sep 17 00:00:00 2001 From: Fabio Ivona Date: Mon, 13 Mar 2023 17:11:01 +0100 Subject: [PATCH 3/4] bump to phpunit 10.0.16 --- composer.json | 2 +- src/Support/StateGenerator.php | 21 +++++++-------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index e16db7ee..bf850a64 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,7 @@ "nunomaduro/termwind": "^1.15.1", "pestphp/pest-plugin": "^2.0.0", "pestphp/pest-plugin-arch": "^2.0.0", - "phpunit/phpunit": "^10.0.15" + "phpunit/phpunit": "^10.0.16" }, "conflict": { "brianium/paratest": "<7.0.6" diff --git a/src/Support/StateGenerator.php b/src/Support/StateGenerator.php index ba87b314..5e37c7f4 100644 --- a/src/Support/StateGenerator.php +++ b/src/Support/StateGenerator.php @@ -84,8 +84,7 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $testResultEvent->test(), TestResult::DEPRECATED, - /** @phpstan-ignore-next-line */ - method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($testResultEvent->message())) : ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) + ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) )); } @@ -95,8 +94,7 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $testResultEvent->test(), TestResult::DEPRECATED, - /** @phpstan-ignore-next-line */ - method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($testResultEvent->message())) : ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) + ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) )); } @@ -106,8 +104,7 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $testResultEvent->test(), TestResult::NOTICE, - /** @phpstan-ignore-next-line */ - method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($testResultEvent->message())) : ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) + ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) )); } @@ -117,8 +114,7 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $testResultEvent->test(), TestResult::NOTICE, - /** @phpstan-ignore-next-line */ - method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($testResultEvent->message())) : ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) + ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) )); } @@ -128,8 +124,7 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $testResultEvent->test(), TestResult::WARN, - /** @phpstan-ignore-next-line */ - method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($testResultEvent->message())) : ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) + ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) )); } @@ -139,8 +134,7 @@ final class StateGenerator $state->add(TestResult::fromTestCase( $testResultEvent->test(), TestResult::WARN, - /** @phpstan-ignore-next-line */ - method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($testResultEvent->message())) : ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) + ThrowableBuilder::from(new TestOutcome($testResultEvent->message())) )); } @@ -154,8 +148,7 @@ final class StateGenerator '', '', 1, - /** @phpstan-ignore-next-line */ - method_exists(TestDox::class, 'fromClassNameAndMethodName') ? TestDox::fromClassNameAndMethodName('', '') : TestDoxBuilder::fromClassNameAndMethodName('', ''), + TestDoxBuilder::fromClassNameAndMethodName('', ''), MetadataCollection::fromArray([]), TestDataCollection::fromArray([]) ), From 60950c624f39bd44049c6b7482e07959a90bbc84 Mon Sep 17 00:00:00 2001 From: Fabio Ivona Date: Mon, 13 Mar 2023 17:26:27 +0100 Subject: [PATCH 4/4] fix --- src/Support/StateGenerator.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Support/StateGenerator.php b/src/Support/StateGenerator.php index 5e37c7f4..ead493a3 100644 --- a/src/Support/StateGenerator.php +++ b/src/Support/StateGenerator.php @@ -7,10 +7,8 @@ namespace Pest\Support; use NunoMaduro\Collision\Adapters\Phpunit\State; use NunoMaduro\Collision\Adapters\Phpunit\TestResult; use NunoMaduro\Collision\Exceptions\TestOutcome; -use PHPUnit\Event\Code\TestDox; use PHPUnit\Event\Code\TestDoxBuilder; use PHPUnit\Event\Code\TestMethod; -use PHPUnit\Event\Code\Throwable; use PHPUnit\Event\Code\ThrowableBuilder; use PHPUnit\Event\Test\Errored; use PHPUnit\Event\TestData\TestDataCollection; @@ -58,7 +56,7 @@ final class StateGenerator $riskyEvent->test(), TestResult::RISKY, /** @phpstan-ignore-next-line */ - method_exists(Throwable::class, 'from') ? Throwable::from(new TestOutcome($riskyEvent->message())) : ThrowableBuilder::from(new TestOutcome($riskyEvent->message())) + ThrowableBuilder::from(new TestOutcome($riskyEvent->message())) )); } } @@ -74,7 +72,7 @@ final class StateGenerator $testResultEvent->test(), TestResult::SKIPPED, /** @phpstan-ignore-next-line */ - method_exists(Throwable::class, 'from') ? Throwable::from(new SkippedWithMessageException($testResultEvent->message())) : ThrowableBuilder::from(new SkippedWithMessageException($testResultEvent->message())) + ThrowableBuilder::from(new SkippedWithMessageException($testResultEvent->message())) )); } @@ -148,7 +146,7 @@ final class StateGenerator '', '', 1, - TestDoxBuilder::fromClassNameAndMethodName('', ''), + TestDoxBuilder::fromClassNameAndMethodName('', ''), MetadataCollection::fromArray([]), TestDataCollection::fromArray([]) ),