Skip to content

Lazy initialization of AnalyserResult::$errors #2400

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
merged 1 commit into from
Jul 1, 2023
Merged

Lazy initialization of AnalyserResult::$errors #2400

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

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions src/Analyser/AnalyserResult.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
class AnalyserResult
{

/** @var list<Error> */
private array $unorderedErrors;
/** @var list<Error>|null */
private ?array $errors = null;

/**
* @param list<Error> $errors
* @param list<Error> $unorderedErrors
* @param list<CollectedData> $collectedData
* @param list<string> $internalErrors
* @param array<string, array<string>>|null $dependencies
* @param array<string, array<RootExportedNode>> $exportedNodes
*/
public function __construct(
private array $errors,
private array $unorderedErrors,
private array $internalErrors,
private array $collectedData,
private ?array $dependencies,
Expand All @@ -29,20 +29,6 @@ public function __construct(
private int $peakMemoryUsageBytes,
)
{
$this->unorderedErrors = $errors;

usort(
$this->errors,
static fn (Error $a, Error $b): int => [
$a->getFile(),
$a->getLine(),
$a->getMessage(),
] <=> [
$b->getFile(),
$b->getLine(),
$b->getMessage(),
],
);
}

/**
Expand All @@ -58,6 +44,22 @@ public function getUnorderedErrors(): array
*/
public function getErrors(): array
{
if (!isset($this->errors)) {
$this->errors = $this->unorderedErrors;
usort(
$this->errors,
static fn (Error $a, Error $b): int => [
$a->getFile(),
$a->getLine(),
$a->getMessage(),
] <=> [
$b->getFile(),
$b->getLine(),
$b->getMessage(),
],
);
}

return $this->errors;
}

Expand Down
2 changes: 1 addition & 1 deletion src/Command/AnalyseApplication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public function analyse(
if ($resultCache->isFullAnalysis() && count($projectStubFiles) !== 0) {
$stubErrors = $this->stubValidator->validate($projectStubFiles, $debug);
$intermediateAnalyserResult = new AnalyserResult(
array_merge($intermediateAnalyserResult->getErrors(), $stubErrors),
array_merge($intermediateAnalyserResult->getUnorderedErrors(), $stubErrors),
$intermediateAnalyserResult->getInternalErrors(),
$intermediateAnalyserResult->getCollectedData(),
$intermediateAnalyserResult->getDependencies(),
Expand Down