From eac6585a2e4b41db7383623f376a4b95c4f2355e Mon Sep 17 00:00:00 2001 From: Nuno Maduro Date: Tue, 25 Jun 2024 21:09:10 +0100 Subject: [PATCH] refactor: logger --- overrides/Logging/JUnit/JunitXmlLogger.php | 1 - src/Expectations/OppositeExpectation.php | 8 ++------ .../TestMarkedIncompleteSubscriber.php | 19 ------------------- src/Logging/TeamCity/TeamCityLogger.php | 5 +---- src/Support/Exporter.php | 2 -- tests/Features/After.php | 6 +++--- 6 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 src/Logging/TeamCity/Subscriber/TestMarkedIncompleteSubscriber.php diff --git a/overrides/Logging/JUnit/JunitXmlLogger.php b/overrides/Logging/JUnit/JunitXmlLogger.php index a1ca5ff5..1a899ea3 100644 --- a/overrides/Logging/JUnit/JunitXmlLogger.php +++ b/overrides/Logging/JUnit/JunitXmlLogger.php @@ -308,7 +308,6 @@ final class JunitXmlLogger new TestFinishedSubscriber($this), new TestErroredSubscriber($this), new TestFailedSubscriber($this), - new TestMarkedIncompleteSubscriber($this), new TestSkippedSubscriber($this), new TestRunnerExecutionFinishedSubscriber($this), ); diff --git a/src/Expectations/OppositeExpectation.php b/src/Expectations/OppositeExpectation.php index 902419b2..b46f987b 100644 --- a/src/Expectations/OppositeExpectation.php +++ b/src/Expectations/OppositeExpectation.php @@ -292,10 +292,8 @@ final class OppositeExpectation /** * Not supported. - * - * @param array|string $interfaces */ - public function toOnlyImplement(array|string $interfaces): never + public function toOnlyImplement(): never { throw InvalidExpectation::fromMethods(['not', 'toOnlyImplement']); } @@ -328,10 +326,8 @@ final class OppositeExpectation /** * Not supported. - * - * @param array|string $targets */ - public function toOnlyUse(array|string $targets): never + public function toOnlyUse(): never { throw InvalidExpectation::fromMethods(['not', 'toOnlyUse']); } diff --git a/src/Logging/TeamCity/Subscriber/TestMarkedIncompleteSubscriber.php b/src/Logging/TeamCity/Subscriber/TestMarkedIncompleteSubscriber.php deleted file mode 100644 index b9c4aa66..00000000 --- a/src/Logging/TeamCity/Subscriber/TestMarkedIncompleteSubscriber.php +++ /dev/null @@ -1,19 +0,0 @@ -logger()->testMarkedIncomplete($event); - } -} diff --git a/src/Logging/TeamCity/TeamCityLogger.php b/src/Logging/TeamCity/TeamCityLogger.php index 072bd608..5b3044b7 100644 --- a/src/Logging/TeamCity/TeamCityLogger.php +++ b/src/Logging/TeamCity/TeamCityLogger.php @@ -12,7 +12,6 @@ use Pest\Logging\TeamCity\Subscriber\TestErroredSubscriber; use Pest\Logging\TeamCity\Subscriber\TestExecutionFinishedSubscriber; use Pest\Logging\TeamCity\Subscriber\TestFailedSubscriber; use Pest\Logging\TeamCity\Subscriber\TestFinishedSubscriber; -use Pest\Logging\TeamCity\Subscriber\TestMarkedIncompleteSubscriber; use Pest\Logging\TeamCity\Subscriber\TestPreparedSubscriber; use Pest\Logging\TeamCity\Subscriber\TestSkippedSubscriber; use Pest\Logging\TeamCity\Subscriber\TestSuiteFinishedSubscriber; @@ -28,7 +27,6 @@ use PHPUnit\Event\Test\ConsideredRisky; use PHPUnit\Event\Test\Errored; use PHPUnit\Event\Test\Failed; use PHPUnit\Event\Test\Finished; -use PHPUnit\Event\Test\MarkedIncomplete; use PHPUnit\Event\Test\Prepared; use PHPUnit\Event\Test\Skipped; use PHPUnit\Event\TestRunner\ExecutionFinished; @@ -108,7 +106,7 @@ final class TeamCityLogger $this->time = $event->telemetryInfo()->time(); } - public function testMarkedIncomplete(MarkedIncomplete $event): never + public function testMarkedIncomplete(): never { throw ShouldNotHappen::fromMessage('testMarkedIncomplete not implemented.'); } @@ -262,7 +260,6 @@ final class TeamCityLogger new TestFinishedSubscriber($this), new TestErroredSubscriber($this), new TestFailedSubscriber($this), - new TestMarkedIncompleteSubscriber($this), new TestSkippedSubscriber($this), new TestConsideredRiskySubscriber($this), new TestExecutionFinishedSubscriber($this), diff --git a/src/Support/Exporter.php b/src/Support/Exporter.php index d653fc02..ea02ce61 100644 --- a/src/Support/Exporter.php +++ b/src/Support/Exporter.php @@ -64,8 +64,6 @@ final class Exporter continue; } - assert(is_array($data)); - $result[] = $context->contains($data[$key]) !== false ? '*RECURSION*' : sprintf('[%s]', $this->shortenedRecursiveExport($data[$key], $context)); diff --git a/tests/Features/After.php b/tests/Features/After.php index 2f2c270f..bab46c25 100644 --- a/tests/Features/After.php +++ b/tests/Features/After.php @@ -14,7 +14,7 @@ afterEach(function () { '__pest_evaluable__something_2__→_it_can_run_after_test' => expect($this->count)->toBe(1), '__pest_evaluable_high_order_test' => expect($this->count)->toBe(1), '__pest_evaluable_high_order_test_with_skip' => expect($this->count)->toBe(0), - '__pest_evaluable_post__foo__→_defer_Closure_→_expect_Closure_→_toBe_1' => expect($this->count)->toBe(1), + '__pest_evaluable_post__foo__→_defer_Closure_Object____→_expect_Closure_Object____→_toBe_1' => expect($this->count)->toBe(1), default => $this->fail('Unexpected test name: '.$this->name()), }; @@ -61,7 +61,7 @@ afterEach(function () { '__pest_evaluable__something_2__→_it_can_run_after_test' => expect($this->count)->toBe(2), '__pest_evaluable_high_order_test' => expect($this->count)->toBe(2), '__pest_evaluable_high_order_test_with_skip' => expect($this->count)->toBe(1), - '__pest_evaluable_post__foo__→_defer_Closure_→_expect_Closure_→_toBe_1' => expect($this->count)->toBe(2), + '__pest_evaluable_post__foo__→_defer_Closure_Object____→_expect_Closure_Object____→_toBe_1' => expect($this->count)->toBe(2), default => $this->fail('Unexpected test name: '.$this->name()), @@ -80,7 +80,7 @@ afterEach(function () { '__pest_evaluable__something_2__→_it_can_run_after_test' => expect($this->count)->toBe(3), '__pest_evaluable_high_order_test' => expect($this->count)->toBe(3), '__pest_evaluable_high_order_test_with_skip' => expect($this->count)->toBe(2), - '__pest_evaluable_post__foo__→_defer_Closure_→_expect_Closure_→_toBe_1' => expect($this->count)->toBe(3), + '__pest_evaluable_post__foo__→_defer_Closure_Object____→_expect_Closure_Object____→_toBe_1' => expect($this->count)->toBe(3), default => $this->fail('Unexpected test name: '.$this->name()), };