Lazy initialization of AnalyserResult::$errors

phpstan · May 13, 2023 · 732517e · 732517e
1 parent 7bb15fa
commit 732517e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 19 deletions.
diff --git a/src/Analyser/AnalyserResult.php b/src/Analyser/AnalyserResult.php
@@ -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,
@@ -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(),
-			],
-		);
 	}
 
 	/**
@@ -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;
 	}
 

diff --git a/src/Command/AnalyseApplication.php b/src/Command/AnalyseApplication.php
@@ -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(),