SADM/pest
1
0
Fork 0
mirror of https://github.com/pestphp/pest.git synced 2026-03-12 10:47:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #684 from fabio-ivona/fix-phpunit-changes

Browse Source 
Fix PHPUnit internal breaking changes
This commit is contained in:
Nuno Maduro
2023-03-13 16:26:57 +00:00
committed by GitHub
parent 6316828fbd 60950c624f
commit 88e576c3a3
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -23,7 +23,7 @@
"nunomaduro/termwind": "^1.15.1", "nunomaduro/termwind": "^1.15.1",
"pestphp/pest-plugin": "^2.0.0", "pestphp/pest-plugin": "^2.0.0",
"pestphp/pest-plugin-arch": "^2.0.0", "pestphp/pest-plugin-arch": "^2.0.0",
"phpunit/phpunit": "^10.0.15" "phpunit/phpunit": "^10.0.16"
}, },
"conflict": { "conflict": {
"brianium/paratest": "<7.0.6" "brianium/paratest": "<7.0.6"

25
src/Support/StateGenerator.php
View File

@ -7,9 +7,9 @@ namespace Pest\Support;
use NunoMaduro\Collision\Adapters\Phpunit\State; use NunoMaduro\Collision\Adapters\Phpunit\State;
use NunoMaduro\Collision\Adapters\Phpunit\TestResult; use NunoMaduro\Collision\Adapters\Phpunit\TestResult;
use NunoMaduro\Collision\Exceptions\TestOutcome; use NunoMaduro\Collision\Exceptions\TestOutcome;
use PHPUnit\Event\Code\TestDox; use PHPUnit\Event\Code\TestDoxBuilder;
use PHPUnit\Event\Code\TestMethod; use PHPUnit\Event\Code\TestMethod;
use PHPUnit\Event\Code\Throwable; use PHPUnit\Event\Code\ThrowableBuilder;
use PHPUnit\Event\Test\Errored; use PHPUnit\Event\Test\Errored;
use PHPUnit\Event\TestData\TestDataCollection; use PHPUnit\Event\TestData\TestDataCollection;
use PHPUnit\Framework\SkippedWithMessageException; use PHPUnit\Framework\SkippedWithMessageException;
@ -55,7 +55,8 @@ final class StateGenerator
$state->add(TestResult::fromTestCase( $state->add(TestResult::fromTestCase(
$riskyEvent->test(), $riskyEvent->test(),
TestResult::RISKY, TestResult::RISKY,
Throwable::from(new TestOutcome($riskyEvent->message())) /** @phpstan-ignore-next-line */
ThrowableBuilder::from(new TestOutcome($riskyEvent->message()))
)); ));
} }
} }
@ -70,7 +71,8 @@ final class StateGenerator
$state->add(TestResult::fromTestCase( $state->add(TestResult::fromTestCase(
$testResultEvent->test(), $testResultEvent->test(),
TestResult::SKIPPED, TestResult::SKIPPED,
Throwable::from(new SkippedWithMessageException($testResultEvent->message())) /** @phpstan-ignore-next-line */
ThrowableBuilder::from(new SkippedWithMessageException($testResultEvent->message()))
)); ));
} }
@ -80,7 +82,7 @@ final class StateGenerator
$state->add(TestResult::fromTestCase( $state->add(TestResult::fromTestCase(
$testResultEvent->test(), $testResultEvent->test(),
TestResult::DEPRECATED, TestResult::DEPRECATED,
Throwable::from(new TestOutcome($testResultEvent->message())) ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
)); ));
} }
@ -90,7 +92,7 @@ final class StateGenerator
$state->add(TestResult::fromTestCase( $state->add(TestResult::fromTestCase(
$testResultEvent->test(), $testResultEvent->test(),
TestResult::DEPRECATED, TestResult::DEPRECATED,
Throwable::from(new TestOutcome($testResultEvent->message())) ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
)); ));
} }
@ -100,7 +102,7 @@ final class StateGenerator
$state->add(TestResult::fromTestCase( $state->add(TestResult::fromTestCase(
$testResultEvent->test(), $testResultEvent->test(),
TestResult::NOTICE, TestResult::NOTICE,
Throwable::from(new TestOutcome($testResultEvent->message())) ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
)); ));
} }
@ -110,7 +112,7 @@ final class StateGenerator
$state->add(TestResult::fromTestCase( $state->add(TestResult::fromTestCase(
$testResultEvent->test(), $testResultEvent->test(),
TestResult::NOTICE, TestResult::NOTICE,
Throwable::from(new TestOutcome($testResultEvent->message())) ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
)); ));
} }
@ -120,7 +122,7 @@ final class StateGenerator
$state->add(TestResult::fromTestCase( $state->add(TestResult::fromTestCase(
$testResultEvent->test(), $testResultEvent->test(),
TestResult::WARN, TestResult::WARN,
Throwable::from(new TestOutcome($testResultEvent->message())) ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
)); ));
} }
@ -130,7 +132,7 @@ final class StateGenerator
$state->add(TestResult::fromTestCase( $state->add(TestResult::fromTestCase(
$testResultEvent->test(), $testResultEvent->test(),
TestResult::WARN, TestResult::WARN,
Throwable::from(new TestOutcome($testResultEvent->message())) ThrowableBuilder::from(new TestOutcome($testResultEvent->message()))
)); ));
} }
@ -144,8 +146,7 @@ final class StateGenerator
'', '',
'', '',
1, 1,
/** @phpstan-ignore-next-line */ TestDoxBuilder::fromClassNameAndMethodName('', ''),
TestDox::fromClassNameAndMethodName('', ''),
MetadataCollection::fromArray([]), MetadataCollection::fromArray([]),
TestDataCollection::fromArray([]) TestDataCollection::fromArray([])
), ),