Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 11 additions & 5 deletions src/Application/EasyCodingStandardApplication.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public function __construct(
}

/**
* @return array{coding_standard_errors?: CodingStandardError[], file_diffs?: FileDiff[], system_errors?: SystemError[]|string[], system_errors_count?: int}
* @return array{coding_standard_errors?: CodingStandardError[], file_diffs?: FileDiff[], system_errors?: SystemError[]|string[], system_errors_count?: int, files_count?: int}
*/
public function run(Configuration $configuration): array
{
Expand All @@ -66,7 +66,9 @@ public function run(Configuration $configuration): array
$filesCount = count($filePaths);

if ($filesCount === 0) {
return [];
return [
Bridge::FILES_COUNT => 0,
];
}

if ($configuration->isParallel()) {
Expand Down Expand Up @@ -105,17 +107,21 @@ public function run(Configuration $configuration): array
}

// mimics see https://github.com/phpstan/phpstan-src/commit/9124c66dcc55a222e21b1717ba5f60771f7dda92#diff-387b8f04e0db7a06678eb52ce0c0d0aff73e0d7d8fc5df834d0a5fbec198e5daR139
return $this->parallelFileProcessor->check(
$errorsAndDiffs = $this->parallelFileProcessor->check(
$schedule,
$mainScript,
$postFileCallback,
$configuration->getConfig(),
$configuration
);
} else {
// process found files by each processors
$errorsAndDiffs = $this->processFoundFiles($filePaths, $configuration);
}

// process found files by each processors
return $this->processFoundFiles($filePaths, $configuration);
$errorsAndDiffs[Bridge::FILES_COUNT] = $filesCount;

return $errorsAndDiffs;
}

/**
Expand Down
23 changes: 22 additions & 1 deletion src/Console/Command/CheckCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
use Symplify\EasyCodingStandard\Configuration\ConfigurationFactory;
use Symplify\EasyCodingStandard\Console\ExitCode;
use Symplify\EasyCodingStandard\Console\Output\ConsoleOutputFormatter;
use Symplify\EasyCodingStandard\Console\Style\EasyCodingStandardStyle;
use Symplify\EasyCodingStandard\MemoryLimitter;
use Symplify\EasyCodingStandard\Parallel\ValueObject\Bridge;
use Symplify\EasyCodingStandard\Reporter\ProcessedFileReporter;

final readonly class CheckCommand implements CommandInterface, DefaultCommandInterface
Expand All @@ -26,6 +28,7 @@ public function __construct(
private ConfigurationFactory $configurationFactory,
private BlinkRunner $blinkRunner,
private BlinkConfigDumper $blinkConfigDumper,
private EasyCodingStandardStyle $easyCodingStandardStyle,
) {
}

Expand Down Expand Up @@ -106,7 +109,25 @@ public function run(

$this->memoryLimitter->adjust($configuration);

$startTime = microtime(true);
$errorsAndDiffs = $this->easyCodingStandardApplication->run($configuration);
return $this->processedFileReporter->report($errorsAndDiffs, $configuration);
$exitCode = $this->processedFileReporter->report($errorsAndDiffs, $configuration);

if ($configuration->getOutputFormat() === ConsoleOutputFormatter::NAME) {
$this->printRunFooter($errorsAndDiffs[Bridge::FILES_COUNT] ?? 0, $startTime);
}

return $exitCode;
}

private function printRunFooter(int $filesCount, float $startTime): void
{
$elapsedMilliseconds = (int) round((microtime(true) - $startTime) * 1000);
$peakMemoryMegabytes = (int) round(memory_get_peak_usage(true) / 1024 / 1024);

$this->easyCodingStandardStyle->newLine();
$this->easyCodingStandardStyle->writeln(
sprintf(' // %d files · %dms · %d MB', $filesCount, $elapsedMilliseconds, $peakMemoryMegabytes)
);
}
}
2 changes: 1 addition & 1 deletion src/Reporter/ProcessedFileReporter.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public function __construct(
}

/**
* @param array{system_errors?: SystemError[]|string[], file_diffs?: FileDiff[], coding_standard_errors?: CodingStandardError[], system_errors_count?: int} $errorsAndDiffs
* @param array{system_errors?: SystemError[]|string[], file_diffs?: FileDiff[], coding_standard_errors?: CodingStandardError[], system_errors_count?: int, files_count?: int} $errorsAndDiffs
* @return ExitCode::*
*/
public function report(array $errorsAndDiffs, Configuration $configuration): int
Expand Down
Loading