Fix CI: coding standard violations and PHPStan self-analysis error

- Use early exit (continue) instead of nested if blocks in ResultCacheManager
- Add missing `use function count` in WorkerCommand
- Remove same-namespace import in AnalyserTest
- Fix mergeExternalFileDependencies: strip hashes from cached data in
  restore() before passing to ResultCache, matching the pattern used
  by regular dependencies

Co-Authored-By: Claude Code

Author: janedbal

src/Analyser/ResultCache/ResultCacheManager.php

@@ -358,18 +358,24 @@ public function restore(array $allAnalysedFiles, bool $debug, bool $onlyFiles, ?
 		$invertedUsedTraitDependenciesToReturn = [];
 
 		// Check external file dependencies for incremental re-analysis
+		/** @var array<string, array{fileHash: string, dependentFiles: list<string>}> $cachedExternalDependencies */
 		$cachedExternalDependencies = $data['externalDependencies'] ?? [];
-		$externalDependenciesToReturn = $cachedExternalDependencies;
+		$externalDependenciesToReturn = [];
 		foreach ($cachedExternalDependencies as $externalFile => $externalData) {
-			if (!is_file($externalFile) || $this->getFileHash($externalFile) !== $externalData['fileHash']) {
-				if ($output->isVeryVerbose()) {
-					$output->writeLineFormatted(sprintf('External file %s changed, re-analysing dependent files.', $externalFile));
-				}
-				foreach ($externalData['dependentFiles'] as $dependentFile) {
-					if (is_file($dependentFile)) {
-						$filesToAnalyse[] = $dependentFile;
-					}
+			$externalDependenciesToReturn[$externalFile] = $externalData['dependentFiles'];
+			if (is_file($externalFile) && $this->getFileHash($externalFile) === $externalData['fileHash']) {
+				continue;
+			}
+
+			if ($output->isVeryVerbose()) {
+				$output->writeLineFormatted(sprintf('External file %s changed, re-analysing dependent files.', $externalFile));
+			}
+			foreach ($externalData['dependentFiles'] as $dependentFile) {
+				if (!is_file($dependentFile)) {
+					continue;
 				}
+
+				$filesToAnalyse[] = $dependentFile;
 			}
 		}
 		$errors = $data['errorsCallback']();
@@ -983,8 +989,7 @@ private function mergeExternalFileDependencies(
 
 		// Un-invert cached external dependencies: external file => [dependents] → dependent => [external files]
 		$cachedPerFile = [];
-		foreach ($cachedExternalDependencies as $externalFile => $externalData) {
-			$dependentFiles = $externalData['dependentFiles'] ?? $externalData;
+		foreach ($cachedExternalDependencies as $externalFile => $dependentFiles) {
 			foreach ($dependentFiles as $dependentFile) {
 				$cachedPerFile[$dependentFile][] = $externalFile;
 			}
@@ -994,9 +999,11 @@ private function mergeExternalFileDependencies(
 		$merged = $cachedPerFile;
 		foreach ($filesToAnalyse as $file) {
 			unset($merged[$file]);
-			if (array_key_exists($file, $freshExternalDependencies)) {
-				$merged[$file] = $freshExternalDependencies[$file];
+			if (!array_key_exists($file, $freshExternalDependencies)) {
+				continue;
 			}
+
+			$merged[$file] = $freshExternalDependencies[$file];
 		}
 
 		return $merged;

src/Command/WorkerCommand.php

@@ -29,6 +29,7 @@
 use function array_merge;
 use function array_unshift;
 use function array_values;
+use function count;
 use function defined;
 use function is_array;
 use function is_bool;

tests/PHPStan/Analyser/AnalyserTest.php

@@ -6,7 +6,6 @@
 use PhpParser\Lexer;
 use PhpParser\NodeVisitor\NameResolver;
 use PhpParser\Parser\Php7;
-use PHPStan\Analyser\ExternalFileDependencyRegistrar;
 use PHPStan\Analyser\Ignore\IgnoredErrorHelper;
 use PHPStan\Analyser\Ignore\IgnoreLexer;
 use PHPStan\Collectors\Registry as CollectorRegistry;