Unification for working with current class reflection across CallStat…

…icMethodsRule, ClassConstantRule, AccessStaticPropertiesRule
phpstan · Jan 24, 2021 · 863e6c6 · 863e6c6
1 parent b5c43e7
commit 863e6c6
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 17 deletions.
diff --git a/src/Rules/Classes/ClassConstantRule.php b/src/Rules/Classes/ClassConstantRule.php
@@ -70,7 +70,7 @@ public function processNode(Node $node, Scope $scope): array
 					];
 				}
 
-				$className = $scope->getClassReflection()->getName();
+				$classReflection = $scope->getClassReflection();
 			} elseif ($lowercasedClassName === 'parent') {
 				if (!$scope->isInClass()) {
 					return [
@@ -87,7 +87,7 @@ public function processNode(Node $node, Scope $scope): array
 						))->build(),
 					];
 				}
-				$className = $currentClassReflection->getParentClass()->getName();
+				$classReflection = $currentClassReflection->getParentClass();
 			} else {
 				if (!$this->reflectionProvider->hasClass($className)) {
 					if ($scope->isInClassExists($className)) {
@@ -109,13 +109,15 @@ public function processNode(Node $node, Scope $scope): array
 					$messages = $this->classCaseSensitivityCheck->checkClassNames([new ClassNameNodePair($className, $class)]);
 				}
 
-				$className = $this->reflectionProvider->getClass($className)->getName();
+				$classReflection = $this->reflectionProvider->getClass($className);
 			}
 
 			if (strtolower($constantName) === 'class') {
 				return $messages;
 			}
 
+			$className = $classReflection->getName();
+
 			if ($scope->isInClass() && $scope->getClassReflection()->getName() === $className) {
 				$classType = new ThisType($scope->getClassReflection());
 			} else {

diff --git a/src/Rules/Methods/CallStaticMethodsRule.php b/src/Rules/Methods/CallStaticMethodsRule.php
@@ -20,6 +20,7 @@
 use PHPStan\Type\Generic\GenericClassStringType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
+use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeUtils;
@@ -139,7 +140,12 @@ public function processNode(Node $node, Scope $scope): array
 			}
 
 			$className = $classReflection->getName();
-			$classType = new ObjectType($className);
+			if ($scope->isInClass() && $scope->getClassReflection()->getName() === $className) {
+				$classType = new ThisType($scope->getClassReflection());
+				$classReflection = $scope->getClassReflection();
+			} else {
+				$classType = new ObjectType($className);
+			}
 
 			if ($classReflection->hasNativeMethod($methodName) && $lowercasedClassName !== 'static') {
 				$nativeMethodReflection = $classReflection->getNativeMethod($methodName);
@@ -169,6 +175,9 @@ static function (Type $type) use ($methodName): bool {
 		}
 
 		$typeForDescribe = $classType;
+		if ($classType instanceof ThisType) {
+			$typeForDescribe = $classType->getStaticObjectType();
+		}
 		$classType = TypeCombinator::remove($classType, new StringType());
 
 		if (!$classType->canCallMethods()->yes()) {

diff --git a/src/Rules/Properties/AccessStaticPropertiesRule.php b/src/Rules/Properties/AccessStaticPropertiesRule.php
@@ -16,6 +16,7 @@
 use PHPStan\Type\ErrorType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StringType;
+use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\TypeUtils;
@@ -89,7 +90,7 @@ private function processSingleProperty(Scope $scope, StaticPropertyFetch $node,
 						))->build(),
 					];
 				}
-				$className = $scope->getClassReflection()->getName();
+				$classReflection = $scope->getClassReflection();
 			} elseif ($lowercasedClass === 'parent') {
 				if (!$scope->isInClass()) {
 					return [
@@ -122,7 +123,7 @@ private function processSingleProperty(Scope $scope, StaticPropertyFetch $node,
 					return [];
 				}
 
-				$className = $scope->getClassReflection()->getParentClass()->getName();
+				$classReflection = $scope->getClassReflection()->getParentClass();
 			} else {
 				if (!$this->reflectionProvider->hasClass($class)) {
 					if ($scope->isInClassExists($class)) {
@@ -141,19 +142,25 @@ private function processSingleProperty(Scope $scope, StaticPropertyFetch $node,
 				}
 
 				$classReflection = $this->reflectionProvider->getClass($class);
-				$className = $this->reflectionProvider->getClass($class)->getName();
-				if ($classReflection->isTrait()) {
-					return [
-						RuleErrorBuilder::message(sprintf(
-							'Access to static property $%s on trait %s.',
-							$name,
-							$className
-						))->build(),
-					];
-				}
 			}
 
-			$classType = new ObjectType($className);
+			$className = $classReflection->getName();
+			if ($scope->isInClass() && $scope->getClassReflection()->getName() === $className) {
+				$classType = new ThisType($scope->getClassReflection());
+				$classReflection = $scope->getClassReflection();
+			} else {
+				$classType = new ObjectType($className);
+			}
+
+			if ($classReflection->isTrait()) {
+				return [
+					RuleErrorBuilder::message(sprintf(
+						'Access to static property $%s on trait %s.',
+						$name,
+						$className
+					))->build(),
+				];
+			}
 		} else {
 			$classTypeResult = $this->ruleLevelHelper->findTypeToCheck(
 				$scope,
@@ -174,6 +181,9 @@ static function (Type $type) use ($name): bool {
 		}
 
 		$typeForDescribe = $classType;
+		if ($classType instanceof ThisType) {
+			$typeForDescribe = $classType->getStaticObjectType();
+		}
 		$classType = TypeCombinator::remove($classType, new StringType());
 
 		if ($scope->isInExpressionAssign($node)) {