Solve deprecations

Author: VincentLanglet

src/Rules/Properties/AccessPropertiesCheck.php

@@ -67,6 +67,7 @@ private function processSingleProperty(Scope $scope, PropertyFetch $node, string
 			$scope,
 			NullsafeOperatorHelper::getNullsafeShortcircuitedExprRespectingScope($scope, $node->var),
 			sprintf('Access to property $%s on an unknown class %%s.', SprintfHelper::escapeFormatString($name)),
+			// TODO use hasInstanceProperty
 			static fn (Type $type): bool => $type->canAccessProperties()->yes() && $type->hasProperty($name)->yes(),
 		);
 		$type = $typeResult->getType();
@@ -93,6 +94,7 @@ private function processSingleProperty(Scope $scope, PropertyFetch $node, string
 			];
 		}
 
+		// TODO use hasInstanceProperty
 		$has = $type->hasProperty($name);
 		if (!$has->no() && $this->canAccessUndefinedProperties($scope, $node)) {
 			return [];
@@ -124,12 +126,12 @@ private function processSingleProperty(Scope $scope, PropertyFetch $node, string
 				$propertyClassReflection = $this->reflectionProvider->getClass($classNames[0]);
 				$parentClassReflection = $propertyClassReflection->getParentClass();
 				while ($parentClassReflection !== null) {
-					if ($parentClassReflection->hasProperty($name)) {
+					if ($parentClassReflection->hasInstanceProperty($name)) {
 						if ($write) {
-							if ($scope->canWriteProperty($parentClassReflection->getProperty($name, $scope))) {
+							if ($scope->canWriteProperty($parentClassReflection->getInstanceProperty($name, $scope))) {
 								return [];
 							}
-						} elseif ($scope->canReadProperty($parentClassReflection->getProperty($name, $scope))) {
+						} elseif ($scope->canReadProperty($parentClassReflection->getInstanceProperty($name, $scope))) {
 							return [];
 						}
 
@@ -173,6 +175,7 @@ private function processSingleProperty(Scope $scope, PropertyFetch $node, string
 			];
 		}
 
+		// TODO use getInstanceProperty
 		$propertyReflection = $type->getProperty($name, $scope);
 		if ($propertyReflection->isStatic()) {
 			return [

src/Rules/Properties/AccessStaticPropertiesRule.php

@@ -135,6 +135,7 @@ private function processSingleProperty(Scope $scope, StaticPropertyFetch $node,
 				$scope,
 				NullsafeOperatorHelper::getNullsafeShortcircuitedExprRespectingScope($scope, $node->class),
 				sprintf('Access to static property $%s on an unknown class %%s.', SprintfHelper::escapeFormatString($name)),
+				// TODO Use hasStaticProperty
 				static fn (Type $type): bool => $type->canAccessProperties()->yes() && $type->hasProperty($name)->yes(),
 			);
 			$classType = $classTypeResult->getType();
@@ -167,6 +168,7 @@ private function processSingleProperty(Scope $scope, StaticPropertyFetch $node,
 			]);
 		}
 
+		// TODO Use hasStaticProperty
 		$has = $classType->hasProperty($name);
 		if (!$has->no() && $scope->isUndefinedExpressionAllowed($node)) {
 			return [];
@@ -183,8 +185,8 @@ private function processSingleProperty(Scope $scope, StaticPropertyFetch $node,
 				$parentClassReflection = $propertyClassReflection->getParentClass();
 
 				while ($parentClassReflection !== null) {
-					if ($parentClassReflection->hasProperty($name)) {
-						if ($scope->canReadProperty($parentClassReflection->getProperty($name, $scope))) {
+					if ($parentClassReflection->hasStaticProperty($name)) {
+						if ($scope->canReadProperty($parentClassReflection->getStaticProperty($name, $scope))) {
 							return [];
 						}
 						return [
@@ -209,6 +211,7 @@ private function processSingleProperty(Scope $scope, StaticPropertyFetch $node,
 			]);
 		}
 
+		// TODO Use getStaticProperty and update the if
 		$property = $classType->getProperty($name, $scope);
 		if (!$property->isStatic()) {
 			$hasPropertyTypes = TypeUtils::getHasPropertyTypes($classType);