Simplify access to class reflections in InClassNode rules.

rajyan · Jul 7, 2023 · dabbd59 · dabbd59
1 parent e8455a1
commit dabbd59
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 32 deletions.
diff --git a/src/Rules/Classes/DuplicateDeclarationRule.php b/src/Rules/Classes/DuplicateDeclarationRule.php
@@ -28,10 +28,7 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		$classReflection = $scope->getClassReflection();
-		if ($classReflection === null) {
-			throw new ShouldNotHappenException();
-		}
+		$classReflection = $node->getClassReflection();
 
 		$errors = [];
 

diff --git a/src/Rules/Classes/MixinRule.php b/src/Rules/Classes/MixinRule.php
@@ -42,10 +42,7 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if (!$scope->isInClass()) {
-			return [];
-		}
-		$classReflection = $scope->getClassReflection();
+		$classReflection = $node->getClassReflection();
 		$mixinTags = $classReflection->getMixinTags();
 		$errors = [];
 		foreach ($mixinTags as $mixinTag) {

diff --git a/src/Rules/Generics/ClassAncestorsRule.php b/src/Rules/Generics/ClassAncestorsRule.php
@@ -38,10 +38,7 @@ public function processNode(Node $node, Scope $scope): array
 		if (!$originalNode instanceof Node\Stmt\Class_) {
 			return [];
 		}
-		if (!$scope->isInClass()) {
-			return [];
-		}
-		$classReflection = $scope->getClassReflection();
+		$classReflection = $node->getClassReflection();
 		if ($classReflection->isAnonymous()) {
 			return [];
 		}

diff --git a/src/Rules/Generics/ClassTemplateTypeRule.php b/src/Rules/Generics/ClassTemplateTypeRule.php
@@ -29,10 +29,7 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if (!$scope->isInClass()) {
-			return [];
-		}
-		$classReflection = $scope->getClassReflection();
+		$classReflection = $node->getClassReflection();
 		if (!$classReflection->isClass()) {
 			return [];
 		}

diff --git a/src/Rules/Generics/EnumAncestorsRule.php b/src/Rules/Generics/EnumAncestorsRule.php
@@ -38,10 +38,7 @@ public function processNode(Node $node, Scope $scope): array
 		if (!$originalNode instanceof Node\Stmt\Enum_) {
 			return [];
 		}
-		if (!$scope->isInClass()) {
-			return [];
-		}
-		$classReflection = $scope->getClassReflection();
+		$classReflection = $node->getClassReflection();
 
 		$enumName = $classReflection->getName();
 		$escapedEnumName = SprintfHelper::escapeFormatString($enumName);

diff --git a/src/Rules/Generics/EnumTemplateTypeRule.php b/src/Rules/Generics/EnumTemplateTypeRule.php
@@ -23,10 +23,7 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if (!$scope->isInClass()) {
-			return [];
-		}
-		$classReflection = $scope->getClassReflection();
+		$classReflection = $node->getClassReflection();
 		if (!$classReflection->isEnum()) {
 			return [];
 		}

diff --git a/src/Rules/Generics/InterfaceAncestorsRule.php b/src/Rules/Generics/InterfaceAncestorsRule.php
@@ -38,10 +38,7 @@ public function processNode(Node $node, Scope $scope): array
 		if (!$originalNode instanceof Node\Stmt\Interface_) {
 			return [];
 		}
-		if (!$scope->isInClass()) {
-			return [];
-		}
-		$classReflection = $scope->getClassReflection();
+		$classReflection = $node->getClassReflection();
 
 		$interfaceName = $classReflection->getName();
 		$escapedInterfaceName = SprintfHelper::escapeFormatString($interfaceName);

diff --git a/src/Rules/Generics/InterfaceTemplateTypeRule.php b/src/Rules/Generics/InterfaceTemplateTypeRule.php
@@ -29,10 +29,7 @@ public function getNodeType(): string
 
 	public function processNode(Node $node, Scope $scope): array
 	{
-		if (!$scope->isInClass()) {
-			return [];
-		}
-		$classReflection = $scope->getClassReflection();
+		$classReflection = $node->getClassReflection();
 		if (!$classReflection->isInterface()) {
 			return [];
 		}