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

chore: adds support for PhpUnit@10.2.2

Browse Source
This commit is contained in:
Nuno Maduro
2023-06-15 12:02:00 +02:00
parent 2122e57990
commit 0e5470b192
6 changed files with 82 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/Plugins/Parallel/Paratest/ResultPrinter.php
View File

@ -12,20 +12,20 @@ use function fread;
use function fseek;
use function ftell;
use function fwrite;
use NunoMaduro\Collision\Adapters\Phpunit\State;
use ParaTest\Options;
use Pest\Plugins\Parallel\Support\CompactPrinter;
use Pest\Support\StateGenerator;
use PHPUnit\TestRunner\TestResult\TestResult;
use PHPUnit\TextUI\Output\Printer;
use function preg_replace;
use SebastianBergmann\Timer\Duration;
use SplFileInfo;
use function strlen;
use Symfony\Component\Console\Formatter\OutputFormatter;
use Symfony\Component\Console\Output\OutputInterface;
/** @internal */
/**
* @internal
*/
final class ResultPrinter
{
/**
@ -51,7 +51,7 @@ final class ResultPrinter
/** @var resource|null */
private $teamcityLogFileHandle;
/** @var array<string, int> */
/** @var array<non-empty-string, int> */
private array $tailPositions;
public function __construct(
@ -74,6 +74,7 @@ final class ResultPrinter
if (str_starts_with($buffer, 'done [')) {
return;
}
$this->output->write(OutputFormatter::escape($buffer));
}
@ -93,9 +94,12 @@ final class ResultPrinter
$this->teamcityLogFileHandle = $teamcityLogFileHandle;
}
/** @param array<int, SplFileInfo> $teamcityFiles */
public function printFeedback(SplFileInfo $progressFile, array $teamcityFiles): void
{
/** @param list<SplFileInfo> $teamcityFiles */
public function printFeedback(
SplFileInfo $progressFile,
SplFileInfo $outputFile,
array $teamcityFiles
): void {
if ($this->options->needsTeamcity) {
$teamcityProgress = $this->tailMultiple($teamcityFiles);
@ -115,6 +119,16 @@ final class ResultPrinter
return;
}
$unexpectedOutput = $this->tail($outputFile);
if ($unexpectedOutput !== '') {
// if unexpected output only contains the letter "T", like "T", or "TT", or "TTT", etc, then ignore it.
if (preg_match('/^T+$/', $unexpectedOutput) !== false) {
return;
}
$this->output->write($unexpectedOutput);
}
$feedbackItems = $this->tail($progressFile);
if ($feedbackItems === '') {
return;
@ -129,8 +143,8 @@ final class ResultPrinter
}
/**
* @param array<int, SplFileInfo> $teamcityFiles
* @param array<int, SplFileInfo> $testdoxFiles
* @param list<SplFileInfo> $teamcityFiles
* @param list<SplFileInfo> $testdoxFiles
*/
public function printResults(TestResult $testResult, array $teamcityFiles, array $testdoxFiles, Duration $duration): void
{
@ -183,7 +197,7 @@ final class ResultPrinter
$this->compactPrinter->descriptionItem($item);
}
/** @param array<int, SplFileInfo> $files */
/** @param list<SplFileInfo> $files */
private function tailMultiple(array $files): string
{
$content = '';
@ -201,6 +215,7 @@ final class ResultPrinter
private function tail(SplFileInfo $file): string
{
$path = $file->getPathname();
assert($path !== '');
$handle = fopen($path, 'r');
assert($handle !== false);
$fseek = fseek($handle, $this->tailPositions[$path] ?? 0);