From a7744373d55a6e2c9864dd5a3c297afcc4794278 Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Sun, 22 Feb 2026 20:35:41 +0100 Subject: [PATCH 1/2] Fix extracting identifiers --- src/Rules/ClassNameCheck.php | 1 + src/Rules/RestrictedUsage/RestrictedClassConstantUsageRule.php | 1 + .../RestrictedUsage/RestrictedFunctionCallableUsageRule.php | 1 + src/Rules/RestrictedUsage/RestrictedFunctionUsageRule.php | 1 + src/Rules/RestrictedUsage/RestrictedPropertyUsageRule.php | 1 + src/Rules/RestrictedUsage/RestrictedStaticPropertyUsageRule.php | 1 + 6 files changed, 6 insertions(+) diff --git a/src/Rules/ClassNameCheck.php b/src/Rules/ClassNameCheck.php index 9328917f5bc..db3f0cb5d85 100644 --- a/src/Rules/ClassNameCheck.php +++ b/src/Rules/ClassNameCheck.php @@ -50,6 +50,7 @@ public function checkClassNames( return $errors; } + /** @var RestrictedMethodUsageExtension[] $extensions */ $extensions = $this->extensions ??= $this->container->getServicesByTag(RestrictedClassNameUsageExtension::CLASS_NAME_EXTENSION_TAG); if ($extensions === []) { return $errors; diff --git a/src/Rules/RestrictedUsage/RestrictedClassConstantUsageRule.php b/src/Rules/RestrictedUsage/RestrictedClassConstantUsageRule.php index f283844e8d9..116532b053f 100644 --- a/src/Rules/RestrictedUsage/RestrictedClassConstantUsageRule.php +++ b/src/Rules/RestrictedUsage/RestrictedClassConstantUsageRule.php @@ -47,6 +47,7 @@ public function processNode(Node $node, Scope $scope): array return []; } + /** @var RestrictedMethodUsageExtension[] $extensions */ $extensions = $this->extensions ??= $this->container->getServicesByTag(RestrictedClassConstantUsageExtension::CLASS_CONSTANT_EXTENSION_TAG); if ($extensions === []) { return []; diff --git a/src/Rules/RestrictedUsage/RestrictedFunctionCallableUsageRule.php b/src/Rules/RestrictedUsage/RestrictedFunctionCallableUsageRule.php index cc485dc3207..0ea5c8278fc 100644 --- a/src/Rules/RestrictedUsage/RestrictedFunctionCallableUsageRule.php +++ b/src/Rules/RestrictedUsage/RestrictedFunctionCallableUsageRule.php @@ -49,6 +49,7 @@ public function processNode(Node $node, Scope $scope): array $functionReflection = $this->reflectionProvider->getFunction($node->getName(), $scope); + /** @var RestrictedMethodUsageExtension[] $extensions */ $extensions = $this->extensions ??= $this->container->getServicesByTag(RestrictedFunctionUsageExtension::FUNCTION_EXTENSION_TAG); $errors = []; diff --git a/src/Rules/RestrictedUsage/RestrictedFunctionUsageRule.php b/src/Rules/RestrictedUsage/RestrictedFunctionUsageRule.php index 4fbfe812e59..7d9366c7baf 100644 --- a/src/Rules/RestrictedUsage/RestrictedFunctionUsageRule.php +++ b/src/Rules/RestrictedUsage/RestrictedFunctionUsageRule.php @@ -48,6 +48,7 @@ public function processNode(Node $node, Scope $scope): array $functionReflection = $this->reflectionProvider->getFunction($node->name, $scope); + /** @var RestrictedMethodUsageExtension[] $extensions */ $extensions = $this->extensions ??= $this->container->getServicesByTag(RestrictedFunctionUsageExtension::FUNCTION_EXTENSION_TAG); $errors = []; diff --git a/src/Rules/RestrictedUsage/RestrictedPropertyUsageRule.php b/src/Rules/RestrictedUsage/RestrictedPropertyUsageRule.php index 5e528e307ae..ad2d7c2583d 100644 --- a/src/Rules/RestrictedUsage/RestrictedPropertyUsageRule.php +++ b/src/Rules/RestrictedUsage/RestrictedPropertyUsageRule.php @@ -42,6 +42,7 @@ public function processNode(Node $node, Scope $scope): array return []; } + /** @var RestrictedMethodUsageExtension[] $extensions */ $extensions = $this->extensions ??= $this->container->getServicesByTag(RestrictedPropertyUsageExtension::PROPERTY_EXTENSION_TAG); if ($extensions === []) { return []; diff --git a/src/Rules/RestrictedUsage/RestrictedStaticPropertyUsageRule.php b/src/Rules/RestrictedUsage/RestrictedStaticPropertyUsageRule.php index 45b204d2250..9f6bcf85941 100644 --- a/src/Rules/RestrictedUsage/RestrictedStaticPropertyUsageRule.php +++ b/src/Rules/RestrictedUsage/RestrictedStaticPropertyUsageRule.php @@ -47,6 +47,7 @@ public function processNode(Node $node, Scope $scope): array return []; } + /** @var RestrictedMethodUsageExtension[] $extensions */ $extensions = $this->extensions ??= $this->container->getServicesByTag(RestrictedPropertyUsageExtension::PROPERTY_EXTENSION_TAG); if ($extensions === []) { return []; From e01d10d2ab8db3605ad518e00329910ee86d944c Mon Sep 17 00:00:00 2001 From: Markus Staab Date: Sun, 22 Feb 2026 20:39:21 +0100 Subject: [PATCH 2/2] Fix extracting identifiers --- src/Rules/ClassNameCheck.php | 2 +- src/Rules/RestrictedUsage/RestrictedClassConstantUsageRule.php | 2 +- .../RestrictedUsage/RestrictedFunctionCallableUsageRule.php | 2 +- src/Rules/RestrictedUsage/RestrictedFunctionUsageRule.php | 2 +- src/Rules/RestrictedUsage/RestrictedPropertyUsageRule.php | 2 +- src/Rules/RestrictedUsage/RestrictedStaticPropertyUsageRule.php | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Rules/ClassNameCheck.php b/src/Rules/ClassNameCheck.php index db3f0cb5d85..025996acd99 100644 --- a/src/Rules/ClassNameCheck.php +++ b/src/Rules/ClassNameCheck.php @@ -50,7 +50,7 @@ public function checkClassNames( return $errors; } - /** @var RestrictedMethodUsageExtension[] $extensions */ + /** @var RestrictedClassNameUsageExtension[] $extensions */ $extensions = $this->extensions ??= $this->container->getServicesByTag(RestrictedClassNameUsageExtension::CLASS_NAME_EXTENSION_TAG); if ($extensions === []) { return $errors; diff --git a/src/Rules/RestrictedUsage/RestrictedClassConstantUsageRule.php b/src/Rules/RestrictedUsage/RestrictedClassConstantUsageRule.php index 116532b053f..e3271dde86b 100644 --- a/src/Rules/RestrictedUsage/RestrictedClassConstantUsageRule.php +++ b/src/Rules/RestrictedUsage/RestrictedClassConstantUsageRule.php @@ -47,7 +47,7 @@ public function processNode(Node $node, Scope $scope): array return []; } - /** @var RestrictedMethodUsageExtension[] $extensions */ + /** @var RestrictedClassConstantUsageExtension[] $extensions */ $extensions = $this->extensions ??= $this->container->getServicesByTag(RestrictedClassConstantUsageExtension::CLASS_CONSTANT_EXTENSION_TAG); if ($extensions === []) { return []; diff --git a/src/Rules/RestrictedUsage/RestrictedFunctionCallableUsageRule.php b/src/Rules/RestrictedUsage/RestrictedFunctionCallableUsageRule.php index 0ea5c8278fc..944f7f2a3d2 100644 --- a/src/Rules/RestrictedUsage/RestrictedFunctionCallableUsageRule.php +++ b/src/Rules/RestrictedUsage/RestrictedFunctionCallableUsageRule.php @@ -49,7 +49,7 @@ public function processNode(Node $node, Scope $scope): array $functionReflection = $this->reflectionProvider->getFunction($node->getName(), $scope); - /** @var RestrictedMethodUsageExtension[] $extensions */ + /** @var RestrictedFunctionUsageExtension[] $extensions */ $extensions = $this->extensions ??= $this->container->getServicesByTag(RestrictedFunctionUsageExtension::FUNCTION_EXTENSION_TAG); $errors = []; diff --git a/src/Rules/RestrictedUsage/RestrictedFunctionUsageRule.php b/src/Rules/RestrictedUsage/RestrictedFunctionUsageRule.php index 7d9366c7baf..b94843abc6c 100644 --- a/src/Rules/RestrictedUsage/RestrictedFunctionUsageRule.php +++ b/src/Rules/RestrictedUsage/RestrictedFunctionUsageRule.php @@ -48,7 +48,7 @@ public function processNode(Node $node, Scope $scope): array $functionReflection = $this->reflectionProvider->getFunction($node->name, $scope); - /** @var RestrictedMethodUsageExtension[] $extensions */ + /** @var RestrictedFunctionUsageExtension[] $extensions */ $extensions = $this->extensions ??= $this->container->getServicesByTag(RestrictedFunctionUsageExtension::FUNCTION_EXTENSION_TAG); $errors = []; diff --git a/src/Rules/RestrictedUsage/RestrictedPropertyUsageRule.php b/src/Rules/RestrictedUsage/RestrictedPropertyUsageRule.php index ad2d7c2583d..74d225f571d 100644 --- a/src/Rules/RestrictedUsage/RestrictedPropertyUsageRule.php +++ b/src/Rules/RestrictedUsage/RestrictedPropertyUsageRule.php @@ -42,7 +42,7 @@ public function processNode(Node $node, Scope $scope): array return []; } - /** @var RestrictedMethodUsageExtension[] $extensions */ + /** @var RestrictedPropertyUsageExtension[] $extensions */ $extensions = $this->extensions ??= $this->container->getServicesByTag(RestrictedPropertyUsageExtension::PROPERTY_EXTENSION_TAG); if ($extensions === []) { return []; diff --git a/src/Rules/RestrictedUsage/RestrictedStaticPropertyUsageRule.php b/src/Rules/RestrictedUsage/RestrictedStaticPropertyUsageRule.php index 9f6bcf85941..338fa71b736 100644 --- a/src/Rules/RestrictedUsage/RestrictedStaticPropertyUsageRule.php +++ b/src/Rules/RestrictedUsage/RestrictedStaticPropertyUsageRule.php @@ -47,7 +47,7 @@ public function processNode(Node $node, Scope $scope): array return []; } - /** @var RestrictedMethodUsageExtension[] $extensions */ + /** @var RestrictedPropertyUsageExtension[] $extensions */ $extensions = $this->extensions ??= $this->container->getServicesByTag(RestrictedPropertyUsageExtension::PROPERTY_EXTENSION_TAG); if ($extensions === []) { return [];