Skip to content

Commit 65a5ef9

Browse files
staabmstaabm
committed
use AnalysedFilesResolver more
1 parent 1db5a62 commit 65a5ef9

File tree

5 files changed

+26
-30
lines changed

5 files changed

+26
-30
lines changed

‎src/Analyser/Analyser.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use PHPStan\Collectors\Registry as CollectorRegistry;
88
use PHPStan\Rules\Registry as RuleRegistry;
99
use Throwable;
10-
use function array_fill_keys;
1110
use function array_merge;
1211
use function count;
1312
use function memory_get_peak_usage;
@@ -47,7 +46,8 @@ public function analyse(
4746
}
4847

4948
$this->nodeScopeResolver->setAnalysedFiles($allAnalysedFiles);
50-
$allAnalysedFiles = array_fill_keys($allAnalysedFiles, true);
49+
$analyzedFilesResolver = new AnalysedFilesResolver();
50+
$analyzedFilesResolver->setAnalysedFiles($allAnalysedFiles);
5151

5252
/** @var list<Error> $errors */
5353
$errors = [];
@@ -77,7 +77,7 @@ public function analyse(
7777
try {
7878
$fileAnalyserResult = $this->fileAnalyser->analyseFile(
7979
$file,
80-
$allAnalysedFiles,
80+
$analyzedFilesResolver,
8181
$this->ruleRegistry,
8282
$this->collectorRegistry,
8383
null,

‎src/Analyser/FileAnalyser.php‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,11 @@ public function __construct(
6262
}
6363

6464
/**
65-
* @param array<string, true> $analysedFiles
6665
* @param callable(Node $node, Scope $scope): void|null $outerNodeCallback
6766
*/
6867
public function analyseFile(
6968
string $file,
70-
array $analysedFiles,
69+
AnalysedFilesResolver $analysedFilesResolver,
7170
RuleRegistry $ruleRegistry,
7271
CollectorRegistry $collectorRegistry,
7372
?callable $outerNodeCallback,
@@ -86,13 +85,14 @@ public function analyseFile(
8685
$exportedNodes = [];
8786
$linesToIgnore = [];
8887
$unmatchedLineIgnores = [];
88+
8989
if (is_file($file)) {
9090
try {
91-
$this->collectErrors($analysedFiles);
91+
$this->collectErrors($analysedFilesResolver);
9292
$parserNodes = $this->parser->parseFile($file);
9393
$linesToIgnore = $unmatchedLineIgnores = [$file => $this->getLinesToIgnoreFromTokens($parserNodes)];
9494
$temporaryFileErrors = [];
95-
$nodeCallback = function (Node $node, Scope $scope) use (&$fileErrors, &$fileCollectedData, &$fileDependencies, &$exportedNodes, $file, $ruleRegistry, $collectorRegistry, $outerNodeCallback, $analysedFiles, &$linesToIgnore, &$unmatchedLineIgnores, &$temporaryFileErrors): void {
95+
$nodeCallback = function (Node $node, Scope $scope) use (&$fileErrors, &$fileCollectedData, &$fileDependencies, &$exportedNodes, $file, $ruleRegistry, $collectorRegistry, $outerNodeCallback, $analysedFilesResolver, &$linesToIgnore, &$unmatchedLineIgnores, &$temporaryFileErrors): void {
9696
if ($node instanceof Node\Stmt\Trait_) {
9797
foreach (array_keys($linesToIgnore[$file] ?? []) as $lineToIgnore) {
9898
if ($lineToIgnore < $node->getStartLine() || $lineToIgnore > $node->getEndLine()) {
@@ -203,7 +203,7 @@ public function analyseFile(
203203

204204
try {
205205
$dependencies = $this->dependencyResolver->resolveDependencies($node, $scope);
206-
foreach ($dependencies->getFileDependencies($scope->getFile(), $analysedFiles) as $dependentFile) {
206+
foreach ($dependencies->getFileDependencies($scope->getFile(), $analysedFilesResolver) as $dependentFile) {
207207
$fileDependencies[] = $dependentFile;
208208
}
209209
if ($dependencies->getExportedNode() !== null) {
@@ -318,14 +318,11 @@ private function getLinesToIgnoreFromTokens(array $nodes): array
318318
return $nodes[0]->getAttribute('linesToIgnore', []);
319319
}
320320

321-
/**
322-
* @param array<string, true> $analysedFiles
323-
*/
324-
private function collectErrors(array $analysedFiles): void
321+
private function collectErrors(AnalysedFilesResolver $analyzedFilesResolver): void
325322
{
326323
$this->filteredPhpErrors = [];
327324
$this->allPhpErrors = [];
328-
set_error_handler(function (int $errno, string $errstr, string $errfile, int $errline) use ($analysedFiles): bool {
325+
set_error_handler(function (int $errno, string $errstr, string $errfile, int $errline) use ($analyzedFilesResolver): bool {
329326
if ((error_reporting() & $errno) === 0) {
330327
// silence @ operator
331328
return true;
@@ -339,7 +336,7 @@ private function collectErrors(array $analysedFiles): void
339336
return true;
340337
}
341338

342-
if (!isset($analysedFiles[$errfile])) {
339+
if (!$analyzedFilesResolver->isInAnalyzedFiles($errfile)) {
343340
return true;
344341
}
345342

‎src/Command/WorkerCommand.php‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
use Clue\React\NDJson\Decoder;
66
use Clue\React\NDJson\Encoder;
7+
use PHPStan\Analyser\AnalysedFilesResolver;
78
use PHPStan\Analyser\FileAnalyser;
89
use PHPStan\Analyser\InternalError;
910
use PHPStan\Analyser\NodeScopeResolver;
@@ -23,7 +24,6 @@
2324
use Symfony\Component\Console\Input\InputOption;
2425
use Symfony\Component\Console\Output\OutputInterface;
2526
use Throwable;
26-
use function array_fill_keys;
2727
use function array_merge;
2828
use function defined;
2929
use function is_array;
@@ -124,17 +124,18 @@ protected function execute(InputInterface $input, OutputInterface $output): int
124124
$nodeScopeResolver = $container->getByType(NodeScopeResolver::class);
125125
$nodeScopeResolver->setAnalysedFiles($analysedFiles);
126126

127-
$analysedFiles = array_fill_keys($analysedFiles, true);
127+
$analyzedFilesResolver = new AnalysedFilesResolver();
128+
$analyzedFilesResolver->setAnalysedFiles($analysedFiles);
128129

129130
$tcpConnector = new TcpConnector($loop);
130-
$tcpConnector->connect(sprintf('127.0.0.1:%d', $port))->then(function (ConnectionInterface $connection) use ($container, $identifier, $output, $analysedFiles): void {
131+
$tcpConnector->connect(sprintf('127.0.0.1:%d', $port))->then(function (ConnectionInterface $connection) use ($container, $identifier, $output, $analyzedFilesResolver): void {
131132
// phpcs:disable SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly
132133
$jsonInvalidUtf8Ignore = defined('JSON_INVALID_UTF8_IGNORE') ? JSON_INVALID_UTF8_IGNORE : 0;
133134
// phpcs:enable
134135
$out = new Encoder($connection, $jsonInvalidUtf8Ignore);
135136
$in = new Decoder($connection, true, 512, $jsonInvalidUtf8Ignore, $container->getParameter('parallel')['buffer']);
136137
$out->write(['action' => 'hello', 'identifier' => $identifier]);
137-
$this->runWorker($container, $out, $in, $output, $analysedFiles);
138+
$this->runWorker($container, $out, $in, $output, $analyzedFilesResolver);
138139
});
139140

140141
$loop->run();
@@ -146,15 +147,12 @@ protected function execute(InputInterface $input, OutputInterface $output): int
146147
return 0;
147148
}
148149

149-
/**
150-
* @param array<string, true> $analysedFiles
151-
*/
152150
private function runWorker(
153151
Container $container,
154152
WritableStreamInterface $out,
155153
ReadableStreamInterface $in,
156154
OutputInterface $output,
157-
array $analysedFiles,
155+
AnalysedFilesResolver $analysedFilesResolver,
158156
): void
159157
{
160158
$handleError = function (Throwable $error) use ($out, $output): void {
@@ -192,7 +190,7 @@ private function runWorker(
192190
$fileAnalyser = $container->getByType(FileAnalyser::class);
193191
$ruleRegistry = $container->getByType(RuleRegistry::class);
194192
$collectorRegistry = $container->getByType(CollectorRegistry::class);
195-
$in->on('data', static function (array $json) use ($fileAnalyser, $ruleRegistry, $collectorRegistry, $out, $analysedFiles): void {
193+
$in->on('data', static function (array $json) use ($fileAnalyser, $ruleRegistry, $collectorRegistry, $out, $analysedFilesResolver): void {
196194
$action = $json['action'];
197195
if ($action !== 'analyse') {
198196
return;
@@ -212,7 +210,7 @@ private function runWorker(
212210
$exportedNodes = [];
213211
foreach ($files as $file) {
214212
try {
215-
$fileAnalyserResult = $fileAnalyser->analyseFile($file, $analysedFiles, $ruleRegistry, $collectorRegistry, null);
213+
$fileAnalyserResult = $fileAnalyser->analyseFile($file, $analysedFilesResolver, $ruleRegistry, $collectorRegistry, null);
216214
$fileErrors = $fileAnalyserResult->getErrors();
217215
$filteredPhpErrors = array_merge($filteredPhpErrors, $fileAnalyserResult->getFilteredPhpErrors());
218216
$allPhpErrors = array_merge($allPhpErrors, $fileAnalyserResult->getAllPhpErrors());

‎src/Dependency/NodeDependencies.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace PHPStan\Dependency;
44

5+
use PHPStan\Analyser\AnalysedFilesResolver;
56
use PHPStan\File\FileHelper;
67
use PHPStan\Reflection\ClassReflection;
78
use PHPStan\Reflection\FunctionReflection;
@@ -22,10 +23,9 @@ public function __construct(
2223
}
2324

2425
/**
25-
* @param array<string, true> $analysedFiles
2626
* @return string[]
2727
*/
28-
public function getFileDependencies(string $currentFile, array $analysedFiles): array
28+
public function getFileDependencies(string $currentFile, AnalysedFilesResolver $analyzedFilesResolver): array
2929
{
3030
$dependencies = [];
3131

@@ -40,7 +40,7 @@ public function getFileDependencies(string $currentFile, array $analysedFiles):
4040
continue;
4141
}
4242

43-
if (!isset($analysedFiles[$dependencyFile])) {
43+
if (!$analyzedFilesResolver->isInAnalyzedFiles($dependencyFile)) {
4444
continue;
4545
}
4646

‎src/PhpDoc/StubValidator.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace PHPStan\PhpDoc;
44

5+
use PHPStan\Analyser\AnalysedFilesResolver;
56
use PHPStan\Analyser\Error;
67
use PHPStan\Analyser\FileAnalyser;
78
use PHPStan\Analyser\InternalError;
@@ -97,7 +98,6 @@
9798
use PHPStan\Type\FileTypeMapper;
9899
use PHPStan\Type\ObjectType;
99100
use Throwable;
100-
use function array_fill_keys;
101101
use function count;
102102
use function sprintf;
103103

@@ -137,14 +137,15 @@ public function validate(array $stubFiles, bool $debug): array
137137
$pathRoutingParser = $container->getService('pathRoutingParser');
138138
$pathRoutingParser->setAnalysedFiles($stubFiles);
139139

140-
$analysedFiles = array_fill_keys($stubFiles, true);
140+
$analyzedFilesResolver = new AnalysedFilesResolver();
141+
$analyzedFilesResolver->setAnalysedFiles($stubFiles);
141142

142143
$errors = [];
143144
foreach ($stubFiles as $stubFile) {
144145
try {
145146
$tmpErrors = $fileAnalyser->analyseFile(
146147
$stubFile,
147-
$analysedFiles,
148+
$analyzedFilesResolver,
148149
$ruleRegistry,
149150
$collectorRegistry,
150151
static function (): void {

0 commit comments

Comments
 (0)