Skip to content

Commit 3432a97

Browse files
committed
Rename parameter
1 parent deda4bd commit 3432a97

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

src/Analyser/Analyser.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
namespace PHPStan\Analyser;
44

55
use Closure;
6-
use PHPStan\Rules\Registry;
6+
use PHPStan\Rules\Registry as RuleRegistry;
77
use Throwable;
88
use function array_fill_keys;
99
use function array_merge;
@@ -15,7 +15,7 @@ class Analyser
1515

1616
public function __construct(
1717
private FileAnalyser $fileAnalyser,
18-
private Registry $registry,
18+
private RuleRegistry $ruleRegistry,
1919
private NodeScopeResolver $nodeScopeResolver,
2020
private int $internalErrorsCountLimit,
2121
)
@@ -57,7 +57,7 @@ public function analyse(
5757
$fileAnalyserResult = $this->fileAnalyser->analyseFile(
5858
$file,
5959
$allAnalysedFiles,
60-
$this->registry,
60+
$this->ruleRegistry,
6161
null,
6262
);
6363
$errors = array_merge($errors, $fileAnalyserResult->getErrors());

src/Analyser/FileAnalyser.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use PHPStan\Rules\LineRuleError;
1919
use PHPStan\Rules\MetadataRuleError;
2020
use PHPStan\Rules\NonIgnorableRuleError;
21-
use PHPStan\Rules\Registry;
21+
use PHPStan\Rules\Registry as RuleRegistry;
2222
use PHPStan\Rules\TipRuleError;
2323
use function array_key_exists;
2424
use function array_keys;
@@ -59,7 +59,7 @@ public function __construct(
5959
public function analyseFile(
6060
string $file,
6161
array $analysedFiles,
62-
Registry $registry,
62+
RuleRegistry $ruleRegistry,
6363
?callable $outerNodeCallback,
6464
): FileAnalyserResult
6565
{
@@ -72,7 +72,7 @@ public function analyseFile(
7272
$parserNodes = $this->parser->parseFile($file);
7373
$linesToIgnore = $this->getLinesToIgnoreFromTokens($file, $parserNodes);
7474
$temporaryFileErrors = [];
75-
$nodeCallback = function (Node $node, Scope $scope) use (&$fileErrors, &$fileDependencies, &$exportedNodes, $file, $registry, $outerNodeCallback, $analysedFiles, &$linesToIgnore, &$temporaryFileErrors): void {
75+
$nodeCallback = function (Node $node, Scope $scope) use (&$fileErrors, &$fileDependencies, &$exportedNodes, $file, $ruleRegistry, $outerNodeCallback, $analysedFiles, &$linesToIgnore, &$temporaryFileErrors): void {
7676
if ($node instanceof Node\Stmt\Trait_) {
7777
foreach (array_keys($linesToIgnore[$file] ?? []) as $lineToIgnore) {
7878
if ($lineToIgnore < $node->getStartLine() || $lineToIgnore > $node->getEndLine()) {
@@ -87,7 +87,7 @@ public function analyseFile(
8787
}
8888
$uniquedAnalysedCodeExceptionMessages = [];
8989
$nodeType = get_class($node);
90-
foreach ($registry->getRules($nodeType) as $rule) {
90+
foreach ($ruleRegistry->getRules($nodeType) as $rule) {
9191
try {
9292
$ruleErrors = $rule->processNode($node, $scope);
9393
} catch (AnalysedCodeException $e) {

src/Command/WorkerCommand.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use PHPStan\Analyser\NodeScopeResolver;
99
use PHPStan\DependencyInjection\Container;
1010
use PHPStan\File\PathNotFoundException;
11-
use PHPStan\Rules\Registry;
11+
use PHPStan\Rules\Registry as RuleRegistry;
1212
use PHPStan\ShouldNotHappenException;
1313
use React\EventLoop\StreamSelectLoop;
1414
use React\Socket\ConnectionInterface;
@@ -189,9 +189,9 @@ private function runWorker(
189189
$out->on('error', $handleError);
190190
/** @var FileAnalyser $fileAnalyser */
191191
$fileAnalyser = $container->getByType(FileAnalyser::class);
192-
/** @var Registry $registry */
193-
$registry = $container->getByType(Registry::class);
194-
$in->on('data', function (array $json) use ($fileAnalyser, $registry, $out, $analysedFiles, $tmpFile, $insteadOfFile, $output): void {
192+
/** @var RuleRegistry $ruleRegistry */
193+
$ruleRegistry = $container->getByType(RuleRegistry::class);
194+
$in->on('data', function (array $json) use ($fileAnalyser, $ruleRegistry, $out, $analysedFiles, $tmpFile, $insteadOfFile, $output): void {
195195
$action = $json['action'];
196196
if ($action !== 'analyse') {
197197
return;
@@ -207,7 +207,7 @@ private function runWorker(
207207
if ($file === $insteadOfFile) {
208208
$file = $tmpFile;
209209
}
210-
$fileAnalyserResult = $fileAnalyser->analyseFile($file, $analysedFiles, $registry, null);
210+
$fileAnalyserResult = $fileAnalyser->analyseFile($file, $analysedFiles, $ruleRegistry, null);
211211
$fileErrors = $fileAnalyserResult->getErrors();
212212
$dependencies[$file] = $fileAnalyserResult->getDependencies();
213213
$exportedNodes[$file] = $fileAnalyserResult->getExportedNodes();

0 commit comments

Comments
 (0)