Support PHPUnit 12 by W0rma · Pull Request #6826 · Codeception/Codeception · GitHub
Skip to content

Support PHPUnit 12 #6826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TavoNiievez merged 1 commit into from
Feb 16, 2025
Merged

Support PHPUnit 12 #6826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions composer.json
View file
Open in desktop
11 changes: 11 additions & 0 deletions src/Codeception/Test/Cest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use PHPUnit\Runner\Version as PHPUnitVersion;
use PHPUnit\Util\Test as TestUtil;
use ReflectionMethod;
use SebastianBergmann\CodeCoverage\Version as CodeCoverageVersion;

use function array_slice;
use function file;
Expand Down Expand Up @@ -258,6 +259,11 @@ public function getLinesToBeCovered(): array|bool
if (PHPUnitVersion::series() < 10) {
return TestUtil::getLinesToBeCovered($this->testClass, $this->testMethod);
}

if (version_compare(CodeCoverageVersion::id(), '12', '>=')) {
return (new CodeCoverage())->coversTargets($this->testClass, $this->testMethod)->asArray();
}

return (new CodeCoverage())->linesToBeCovered($this->testClass, $this->testMethod);
}

Expand All @@ -266,6 +272,11 @@ public function getLinesToBeUsed(): array
if (PHPUnitVersion::series() < 10) {
return TestUtil::getLinesToBeUsed($this->testClass, $this->testMethod);
}

if (version_compare(CodeCoverageVersion::id(), '12', '>=')) {
return (new CodeCoverage())->usesTargets($this->testClass, $this->testMethod)->asArray();
}

return (new CodeCoverage())->linesToBeUsed($this->testClass, $this->testMethod);
}
}
8 changes: 8 additions & 0 deletions src/Codeception/Test/Feature/CodeCoverage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
use Codeception\Test\Test as CodeceptTest;
use PHPUnit\Runner\Version as PHPUnitVersion;
use SebastianBergmann\CodeCoverage\Exception as CodeCoverageException;
use SebastianBergmann\CodeCoverage\Test\Target\TargetCollection;
use SebastianBergmann\CodeCoverage\Test\TestStatus\TestStatus;
use SebastianBergmann\CodeCoverage\Version as CodeCoverageVersion;

trait CodeCoverage
{
Expand Down Expand Up @@ -46,6 +48,12 @@ public function codeCoverageEnd(string $status, float $time): void
Test::STATUS_FAIL, Test::STATUS_ERROR => TestStatus::failure(),
default => TestStatus::unknown(),
};
if (version_compare(CodeCoverageVersion::id(), '12', '>=')) {
if (is_array($linesToBeCovered)) {
$linesToBeCovered = TargetCollection::fromArray($linesToBeCovered);
}
$linesToBeUsed = TargetCollection::fromArray($linesToBeUsed);
}
$codeCoverage->stop(true, $status, $linesToBeCovered, $linesToBeUsed);
}
} catch (CodeCoverageException $exception) {
Expand Down
11 changes: 11 additions & 0 deletions src/Codeception/Test/TestCaseWrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
use PHPUnit\Runner\Version as PHPUnitVersion;
use PHPUnit\Util\Test as TestUtil;
use ReflectionClass;
use SebastianBergmann\CodeCoverage\Version as CodeCoverageVersion;

/**
* Wrapper for TestCase tests behaving like native Codeception test format
Expand Down Expand Up @@ -120,6 +121,11 @@ public function getLinesToBeCovered(): array|bool
if (PHPUnitVersion::series() < 10) {
return TestUtil::getLinesToBeCovered($class, $method);
}

if (version_compare(CodeCoverageVersion::id(), '12', '>=')) {
return (new CodeCoverage())->coversTargets($class, $method)->asArray();
}

return (new CodeCoverage())->linesToBeCovered($class, $method);
}

Expand All @@ -131,6 +137,11 @@ public function getLinesToBeUsed(): array
if (PHPUnitVersion::series() < 10) {
return TestUtil::getLinesToBeUsed($class, $method);
}

if (version_compare(CodeCoverageVersion::id(), '12', '>=')) {
return (new CodeCoverage())->usesTargets($class, $method)->asArray();
}

return (new CodeCoverage())->linesToBeUsed($class, $method);
}

Expand Down
4 changes: 4 additions & 0 deletions tests/data/claypit/tests/order/CodeTest.php
View file
Open in desktop