Skip to content

Commit 0064f3f

Browse files
committed
chore: phpunit ^10.1 support
1 parent 81cdb7a commit 0064f3f

4 files changed

Lines changed: 28 additions & 9 deletions

File tree

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
"nunomaduro/termwind": "^1.15.1",
2424
"pestphp/pest-plugin": "^2.0.1",
2525
"pestphp/pest-plugin-arch": "^2.1.1",
26-
"phpunit/phpunit": "^10.0.19"
26+
"phpunit/phpunit": "^10.1.0"
2727
},
2828
"conflict": {
2929
"webmozart/assert": "<1.11.0",
30-
"phpunit/phpunit": ">10.0.19"
30+
"phpunit/phpunit": ">10.1.0"
3131
},
3232
"autoload": {
3333
"psr-4": {

phpunit.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
<exclude>./tests/Fixtures/Inheritance</exclude>
2222
</testsuite>
2323
</testsuites>
24-
<coverage>
24+
<source>
2525
<include>
2626
<directory suffix=".php">./src</directory>
2727
</include>
28-
</coverage>
28+
</source>
2929
</phpunit>

src/Logging/TeamCity/TeamCityLogger.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
use PHPUnit\Event\TestSuite\Started as TestSuiteStarted;
3535
use PHPUnit\Event\UnknownSubscriberTypeException;
3636
use PHPUnit\TestRunner\TestResult\Facade as TestResultFacade;
37+
use ReflectionClass;
3738
use Symfony\Component\Console\Output\ConsoleOutput;
3839
use Symfony\Component\Console\Output\OutputInterface;
3940

@@ -207,13 +208,16 @@ public function testExecutionFinished(ExecutionFinished $event): void
207208
$style = new Style($this->output);
208209

209210
$telemetry = $event->telemetryInfo();
211+
210212
if ($this->withoutDuration) {
213+
$reflector = new ReflectionClass($telemetry);
214+
$property = $reflector->getProperty('snapshot');
215+
$property->setAccessible(true);
216+
$snapshot = $property->getValue($telemetry);
217+
assert($snapshot instanceof Snapshot);
218+
211219
$telemetry = new Info(
212-
new Snapshot(
213-
$telemetry->time(),
214-
$telemetry->memoryUsage(),
215-
$telemetry->peakMemoryUsage(),
216-
),
220+
$snapshot,
217221
Duration::fromSecondsAndNanoseconds(1, 0),
218222
$telemetry->memoryUsageSinceStart(),
219223
$telemetry->durationSincePrevious(),

src/Plugins/Parallel/Support/CompactPrinter.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use NunoMaduro\Collision\Adapters\Phpunit\State;
88
use NunoMaduro\Collision\Adapters\Phpunit\Style;
99
use ParaTest\Options;
10+
use PHPUnit\Event\Telemetry\GarbageCollectorStatus;
1011
use PHPUnit\Event\Telemetry\HRTime;
1112
use PHPUnit\Event\Telemetry\Info;
1213
use PHPUnit\Event\Telemetry\MemoryUsage;
@@ -122,11 +123,25 @@ public function recap(State $state, PHPUnitTestResult $testResult, Duration $dur
122123
$snapshotDuration = HRTime::fromSecondsAndNanoseconds((int) $duration->asSeconds(), $nanoseconds);
123124
$telemetryDuration = \PHPUnit\Event\Telemetry\Duration::fromSecondsAndNanoseconds((int) $duration->asSeconds(), $nanoseconds);
124125

126+
$status = gc_status();
127+
128+
$garbageCollectorStatus = new GarbageCollectorStatus(
129+
$status['runs'],
130+
$status['collected'],
131+
$status['threshold'],
132+
$status['roots'],
133+
null,
134+
null,
135+
null,
136+
null,
137+
);
138+
125139
$telemetry = new Info(
126140
new Snapshot(
127141
$snapshotDuration,
128142
MemoryUsage::fromBytes(0),
129143
MemoryUsage::fromBytes(0),
144+
$garbageCollectorStatus,
130145
),
131146
$telemetryDuration,
132147
MemoryUsage::fromBytes(0),

0 commit comments

Comments
 (0)