Skip to content

Commit d6f211f

Browse files
authored
Rules\LazyRegistry, Collectors\Registry: Cache extension-class-names (#6205)
1 parent 8e90347 commit d6f211f

4 files changed

Lines changed: 23 additions & 18 deletions

File tree

‎phpstan-baseline.neon‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -669,18 +669,6 @@ parameters:
669669
count: 1
670670
path: src/Rules/Generics/TemplateTypeCheck.php
671671

672-
-
673-
rawMessage: 'Function class_implements() is a runtime reflection concept that might not work in PHPStan because it uses fully static reflection engine. Use objects retrieved from ReflectionProvider instead.'
674-
identifier: phpstanApi.runtimeReflection
675-
count: 1
676-
path: src/Rules/LazyRegistry.php
677-
678-
-
679-
rawMessage: 'Function class_parents() is a runtime reflection concept that might not work in PHPStan because it uses fully static reflection engine. Use objects retrieved from ReflectionProvider instead.'
680-
identifier: phpstanApi.runtimeReflection
681-
count: 1
682-
path: src/Rules/LazyRegistry.php
683-
684672
-
685673
rawMessage: 'Method PHPStan\Rules\LazyRegistry::getRulesByNodeType() return type with generic interface PHPStan\Rules\Rule does not specify its types: TNodeType'
686674
identifier: missingType.generics

‎src/Collectors/Registry.php‎

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

55
use PhpParser\Node;
66
use PHPStan\DependencyInjection\AutowiredService;
7-
use function class_implements;
8-
use function class_parents;
7+
use PHPStan\Type\ExtensionClassHelper;
98

109
#[AutowiredService(factory: '@PHPStan\Collectors\RegistryFactory::create')]
1110
final class Registry
@@ -35,7 +34,7 @@ public function __construct(array $collectors)
3534
public function getCollectors(string $nodeType): array
3635
{
3736
if (!isset($this->cache[$nodeType])) {
38-
$parentNodeTypes = [$nodeType] + class_parents($nodeType) + class_implements($nodeType);
37+
$parentNodeTypes = ExtensionClassHelper::getExtensionClassNamesByRuntimeReflection($nodeType);
3938

4039
$collectors = [];
4140
foreach ($parentNodeTypes as $parentNodeType) {

‎src/Rules/LazyRegistry.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
use PHPStan\DependencyInjection\AutowiredExtensions;
77
use PHPStan\DependencyInjection\AutowiredService;
88
use PHPStan\DependencyInjection\ExtensionsCollection;
9-
use function class_implements;
10-
use function class_parents;
9+
use PHPStan\Type\ExtensionClassHelper;
1110

1211
#[AutowiredService(name: 'registry', as: Registry::class)]
1312
final class LazyRegistry implements Registry
@@ -39,7 +38,7 @@ public function __construct(
3938
public function getRules(string $nodeType): array
4039
{
4140
if (!isset($this->cache[$nodeType])) {
42-
$parentNodeTypes = [$nodeType] + class_parents($nodeType) + class_implements($nodeType);
41+
$parentNodeTypes = ExtensionClassHelper::getExtensionClassNamesByRuntimeReflection($nodeType);
4342

4443
$rules = [];
4544
$rulesFromContainer = $this->getRulesByNodeType();

‎src/Type/ExtensionClassHelper.php‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,22 @@
22

33
namespace PHPStan\Type;
44

5+
use PhpParser\Node;
56
use PHPStan\Reflection\ReflectionProvider;
67
use function array_key_exists;
78
use function array_merge;
9+
use function class_implements;
10+
use function class_parents;
811

912
final class ExtensionClassHelper
1013
{
1114

1215
/** @var array<string, array<string>> */
1316
private static array $extensionClassNames = [];
1417

18+
/** @var array<class-string<Node>, array<class-string<Node>>> */
19+
private static array $extensionClassNamesRuntimeReflections = [];
20+
1521
/**
1622
* @return string[]
1723
*/
@@ -25,4 +31,17 @@ public static function getExtensionClassNames(ReflectionProvider $reflectionProv
2531
return self::$extensionClassNames[$className];
2632
}
2733

34+
/**
35+
* @param class-string<Node> $className
36+
* @return array<class-string<Node>>
37+
*/
38+
public static function getExtensionClassNamesByRuntimeReflection(string $className): array
39+
{
40+
if (!array_key_exists($className, self::$extensionClassNamesRuntimeReflections)) {
41+
self::$extensionClassNamesRuntimeReflections[$className] = [$className] + class_parents($className) + class_implements($className);
42+
}
43+
44+
return self::$extensionClassNamesRuntimeReflections[$className];
45+
}
46+
2847
}

0 commit comments

Comments
 (0)