Skip to content

Simplify lowercase-string handling #4838

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
ondrejmirtes merged 2 commits into from
Jan 30, 2026
+14 −26
Merged

Simplify lowercase-string handling #4838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b641605
Simplify lowercase-string handling
staabm Jan 30, 2026
93e66bf
property is readonly
staabm Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions src/Reflection/ReflectionProvider/MemoizingReflectionProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,32 +29,17 @@ public function __construct(private ReflectionProvider $provider)

public function hasClass(string $className): bool
{
$lowerClassName = strtolower($className);
if (isset($this->hasClasses[$lowerClassName])) {
return $this->hasClasses[$lowerClassName];
}

return $this->hasClasses[$lowerClassName] = $this->provider->hasClass($className);
return $this->hasClasses[strtolower($className)] ??= $this->provider->hasClass($className);
}

public function getClass(string $className): ClassReflection
{
$lowerClassName = strtolower($className);
if (isset($this->classes[$lowerClassName])) {
return $this->classes[$lowerClassName];
}

return $this->classes[$lowerClassName] = $this->provider->getClass($className);
return $this->classes[strtolower($className)] ??= $this->provider->getClass($className);
}

public function getClassName(string $className): string
{
$lowerClassName = strtolower($className);
if (isset($this->classNames[$lowerClassName])) {
return $this->classNames[$lowerClassName];
}

return $this->classNames[$lowerClassName] = $this->provider->getClassName($className);
return $this->classNames[strtolower($className)] ??= $this->provider->getClassName($className);
}

public function getAnonymousClassReflection(Node\Stmt\Class_ $classNode, Scope $scope): ClassReflection
Expand Down
19 changes: 11 additions & 8 deletions src/Rules/Api/ApiInstanceofTypeRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,18 @@ final class ApiInstanceofTypeRule implements Rule
AccessoryType::class => 'methods on PHPStan\\Type\\Type',
];

/** @var array<lowercase-string, string|null> */
private readonly array $lowerMap;

public function __construct(
private ReflectionProvider $reflectionProvider,
)
{
$lowerMap = [];
foreach (self::MAP as $className => $method) {
$lowerMap[strtolower($className)] = $method;
}
$this->lowerMap = $lowerMap;
}

public function getNodeType(): string
Expand All @@ -117,14 +125,9 @@ public function processNode(Node $node, Scope $scope): array
return [];
}

$lowerMap = [];
foreach (self::MAP as $className => $method) {
$lowerMap[strtolower($className)] = $method;
}

$className = $scope->resolveName($node->class);
$lowerClassName = strtolower($className);
if (!array_key_exists($lowerClassName, $lowerMap)) {
if (!array_key_exists($lowerClassName, $this->lowerMap)) {
return [];
}

Expand All @@ -138,7 +141,7 @@ public function processNode(Node $node, Scope $scope): array
}

$tip = 'Learn more: <fg=cyan>https://phpstan.org/blog/why-is-instanceof-type-wrong-and-getting-deprecated</>';
if ($lowerMap[$lowerClassName] === null) {
if ($this->lowerMap[$lowerClassName] === null) {
return [
RuleErrorBuilder::message(sprintf(
'Doing instanceof %s is error-prone and deprecated.',
Expand All @@ -151,7 +154,7 @@ public function processNode(Node $node, Scope $scope): array
RuleErrorBuilder::message(sprintf(
'Doing instanceof %s is error-prone and deprecated. Use %s instead.',
$className,
$lowerMap[$lowerClassName],
$this->lowerMap[$lowerClassName],
))->identifier('phpstanApi.instanceofType')->tip($tip)->build(),
];
}
Expand Down
Loading