Skip to content

ISSUE-19: PHPUnit 12 support #20

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
robiningelbrecht merged 2 commits into from
Mar 15, 2025
Merged

ISSUE-19: PHPUnit 12 support #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5341051
ISSUE-19: PHPUnit 12 support
robiningelbrecht Mar 15, 2025
47a0f40
ISSUE-19: Fix tests
robiningelbrecht Mar 15, 2025
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"php": "^8.1",
"ext-simplexml": "*",
"ext-xmlreader": "*",
"phpunit/phpunit": "^10.3||^11.0",
"phpunit/phpunit": "^10.3||^11.0||^12.0",
"symfony/console": "^5.4||^6.2||^7.0"
},
"autoload": {
Expand Down
2,210 changes: 1,327 additions & 883 deletions composer.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: '3.8'

services:
php-cli:
build: ./docker/php-cli
container_name: phpunit-coverage-tools-php-cli
environment:
- PHP_CS_FIXER_IGNORE_ENV=true
volumes:
- ./:/var/www/
working_dir: /var/www
Expand Down
9 changes: 2 additions & 7 deletions docker/php-cli/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
FROM php:8.2-cli
FROM php:8.4-cli

RUN apt-get update && apt-get install -y zip unzip git curl
RUN docker-php-ext-install mysqli pdo pdo_mysql

RUN pecl install xdebug \
&& docker-php-ext-enable xdebug

COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer

COPY ./xdebug.ini "${PHP_INI_DIR}/conf.d"
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
10 changes: 5 additions & 5 deletions src/ConsoleOutput.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static function create(): self
}

/**
* @param \RobinIngelbrecht\PHPUnitCoverageTools\MinCoverage\MinCoverageResult[] $results
* @param MinCoverageResult[] $results
*/
public function print(array $results, Duration $duration): void
{
Expand Down Expand Up @@ -93,7 +93,7 @@ public function print(array $results, Duration $duration): void
]),
]
),
$result->exitOnLowCoverage() ? 'Yes' : 'No',
$result->exitOnLowCoverage() ? 'Yes' : 'No',
], $results),
new TableSeparator(),
[
Expand All @@ -102,9 +102,9 @@ public function print(array $results, Duration $duration): void
[
'colspan' => 5,
'style' => new TableCellStyle([
'align' => 'center',
'cellFormat' => '<'.$finalStatus->value.'>%s</'.$finalStatus->value.'>',
]
'align' => 'center',
'cellFormat' => '<'.$finalStatus->value.'>%s</'.$finalStatus->value.'>',
]
),
]
),
Expand Down
6 changes: 3 additions & 3 deletions src/MinCoverage/MinCoverageResult.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ private function __construct(
private readonly float $actualMinCoverage,
private readonly int $numberOfTrackedLines,
private readonly int $numberOfCoveredLines,
private readonly bool $exitOnLowCoverage
private readonly bool $exitOnLowCoverage,
) {
}

Expand Down Expand Up @@ -54,9 +54,9 @@ public function exitOnLowCoverage(): bool
}

/**
* @param \RobinIngelbrecht\PHPUnitCoverageTools\MinCoverage\CoverageMetric[] $metrics
* @param CoverageMetric[] $metrics
*
* @return \RobinIngelbrecht\PHPUnitCoverageTools\MinCoverage\MinCoverageResult[]
* @return MinCoverageResult[]
*/
public static function mapFromRulesAndMetrics(
MinCoverageRules $minCoverageRules,
Expand Down
2 changes: 1 addition & 1 deletion src/MinCoverage/MinCoverageRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ final class MinCoverageRule
public function __construct(
private readonly string $pattern,
private readonly int $minCoverage,
private readonly bool $exitOnLowCoverage
private readonly bool $exitOnLowCoverage,
) {
if ($this->minCoverage < 0 || $this->minCoverage > 100) {
throw new \RuntimeException(sprintf('MinCoverage has to be value between 0 and 100. %s given', $this->minCoverage));
Expand Down
6 changes: 3 additions & 3 deletions src/MinCoverage/MinCoverageRules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ class MinCoverageRules
public const TOTAL = 'Total';

private function __construct(
/** @var \RobinIngelbrecht\PHPUnitCoverageTools\MinCoverage\MinCoverageRule[] */
private readonly array $rules
/** @var MinCoverageRule[] */
private readonly array $rules,
) {
}

/**
* @return \RobinIngelbrecht\PHPUnitCoverageTools\MinCoverage\MinCoverageRule[]
* @return MinCoverageRule[]
*/
public function getRules(): array
{
Expand Down
2 changes: 1 addition & 1 deletion src/Timer/SystemResourceUsageFormatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
final class SystemResourceUsageFormatter implements ResourceUsageFormatter
{
private function __construct(
private readonly PhpUnitResourceUsageFormatter $resourceUsageFormatter
private readonly PhpUnitResourceUsageFormatter $resourceUsageFormatter,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion tests/FixedResourceUsageFormatter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
final class FixedResourceUsageFormatter implements ResourceUsageFormatter
{
private function __construct(
private readonly float $usageInMb
private readonly float $usageInMb,
) {
}

Expand Down
2 changes: 1 addition & 1 deletion tests/PausedTimer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
final class PausedTimer implements Timer
{
private function __construct(
private readonly Duration $duration
private readonly Duration $duration,
) {
}

Expand Down
22 changes: 11 additions & 11 deletions tests/Subscriber/Application/ApplicationFinishedSubscriberTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function testNotifyWithAtLeastOneFailedRule(): void
time: HRTime::fromSecondsAndNanoseconds(1, 0),
memoryUsage: MemoryUsage::fromBytes(100),
peakMemoryUsage: MemoryUsage::fromBytes(100),
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, null, null, null, null, null, null, null, null)
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
),
durationSinceStart: Duration::fromSecondsAndNanoseconds(1, 0),
memorySinceStart: MemoryUsage::fromBytes(100),
Expand Down Expand Up @@ -99,7 +99,7 @@ public function testNotifyWithAWarning(): void
time: HRTime::fromSecondsAndNanoseconds(1, 0),
memoryUsage: MemoryUsage::fromBytes(100),
peakMemoryUsage: MemoryUsage::fromBytes(100),
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, null, null, null, null, null, null, null, null)
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
),
durationSinceStart: Duration::fromSecondsAndNanoseconds(1, 0),
memorySinceStart: MemoryUsage::fromBytes(100),
Expand Down Expand Up @@ -133,7 +133,7 @@ public function testNotifyWhenCoverageIsOk(): void
time: HRTime::fromSecondsAndNanoseconds(1, 0),
memoryUsage: MemoryUsage::fromBytes(100),
peakMemoryUsage: MemoryUsage::fromBytes(100),
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, null, null, null, null, null, null, null, null)
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
),
durationSinceStart: Duration::fromSecondsAndNanoseconds(1, 0),
memorySinceStart: MemoryUsage::fromBytes(100),
Expand Down Expand Up @@ -167,7 +167,7 @@ public function testNotifyWithOnlyTotal(): void
time: HRTime::fromSecondsAndNanoseconds(1, 0),
memoryUsage: MemoryUsage::fromBytes(100),
peakMemoryUsage: MemoryUsage::fromBytes(100),
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, null, null, null, null, null, null, null, null)
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
),
durationSinceStart: Duration::fromSecondsAndNanoseconds(1, 0),
memorySinceStart: MemoryUsage::fromBytes(100),
Expand Down Expand Up @@ -201,7 +201,7 @@ public function testNotifyWithoutTotal(): void
time: HRTime::fromSecondsAndNanoseconds(1, 0),
memoryUsage: MemoryUsage::fromBytes(100),
peakMemoryUsage: MemoryUsage::fromBytes(100),
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, null, null, null, null, null, null, null, null)
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
),
durationSinceStart: Duration::fromSecondsAndNanoseconds(1, 0),
memorySinceStart: MemoryUsage::fromBytes(100),
Expand Down Expand Up @@ -235,7 +235,7 @@ public function testNotifyWithRulesThatDoNotExit(): void
time: HRTime::fromSecondsAndNanoseconds(1, 0),
memoryUsage: MemoryUsage::fromBytes(100),
peakMemoryUsage: MemoryUsage::fromBytes(100),
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, null, null, null, null, null, null, null, null)
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
),
durationSinceStart: Duration::fromSecondsAndNanoseconds(1, 0),
memorySinceStart: MemoryUsage::fromBytes(100),
Expand Down Expand Up @@ -269,7 +269,7 @@ public function testDivideByZero(): void
time: HRTime::fromSecondsAndNanoseconds(1, 0),
memoryUsage: MemoryUsage::fromBytes(100),
peakMemoryUsage: MemoryUsage::fromBytes(100),
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, null, null, null, null, null, null, null, null)
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
),
durationSinceStart: Duration::fromSecondsAndNanoseconds(1, 0),
memorySinceStart: MemoryUsage::fromBytes(100),
Expand Down Expand Up @@ -303,7 +303,7 @@ public function testNotifyWhenNoTrackedLines(): void
time: HRTime::fromSecondsAndNanoseconds(1, 0),
memoryUsage: MemoryUsage::fromBytes(100),
peakMemoryUsage: MemoryUsage::fromBytes(100),
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, null, null, null, null, null, null, null, null)
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
),
durationSinceStart: Duration::fromSecondsAndNanoseconds(1, 0),
memorySinceStart: MemoryUsage::fromBytes(100),
Expand Down Expand Up @@ -337,7 +337,7 @@ public function testNotifyWithNonExistingCloverFile(): void
time: HRTime::fromSecondsAndNanoseconds(1, 0),
memoryUsage: MemoryUsage::fromBytes(100),
peakMemoryUsage: MemoryUsage::fromBytes(100),
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, null, null, null, null, null, null, null, null)
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
),
durationSinceStart: Duration::fromSecondsAndNanoseconds(1, 0),
memorySinceStart: MemoryUsage::fromBytes(100),
Expand Down Expand Up @@ -374,7 +374,7 @@ public function testNotifyWithInvalidCloverFile(): void
time: HRTime::fromSecondsAndNanoseconds(1, 0),
memoryUsage: MemoryUsage::fromBytes(100),
peakMemoryUsage: MemoryUsage::fromBytes(100),
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, null, null, null, null, null, null, null, null)
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
),
durationSinceStart: Duration::fromSecondsAndNanoseconds(1, 0),
memorySinceStart: MemoryUsage::fromBytes(100),
Expand Down Expand Up @@ -408,7 +408,7 @@ public function testNotifyWithCleanUpCloverFile(): void
time: HRTime::fromSecondsAndNanoseconds(1, 0),
memoryUsage: MemoryUsage::fromBytes(100),
peakMemoryUsage: MemoryUsage::fromBytes(100),
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, null, null, null, null, null, null, null, null)
garbageCollectorStatus: new GarbageCollectorStatus(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
),
durationSinceStart: Duration::fromSecondsAndNanoseconds(1, 0),
memorySinceStart: MemoryUsage::fromBytes(100),
Expand Down