Solve deprecations

Author: VincentLanglet

Diff for: src/Dependency/DependencyResolver.php

@@ -369,8 +369,12 @@ public function resolveDependencies(Node $node, Scope $scope): NodeDependencies
 					$className = $scope->resolveName($node->class);
 					if ($this->reflectionProvider->hasClass($className)) {
 						$propertyClassReflection = $this->reflectionProvider->getClass($className);
-						if ($propertyClassReflection->hasProperty($node->name->toString())) {
-							$propertyReflection = $propertyClassReflection->getProperty($node->name->toString(), $scope);
+						if ($propertyClassReflection->hasInstanceProperty($node->name->toString())) {
+							$propertyReflection = $propertyClassReflection->getInstanceProperty($node->name->toString(), $scope);
+							$this->addClassToDependencies($propertyReflection->getDeclaringClass()->getName(), $dependenciesReflections);
+						}
+						if ($propertyClassReflection->hasStaticProperty($node->name->toString())) {
+							$propertyReflection = $propertyClassReflection->getStaticProperty($node->name->toString(), $scope);
 							$this->addClassToDependencies($propertyReflection->getDeclaringClass()->getName(), $dependenciesReflections);
 						}
 					}

Diff for: src/Rules/Properties/AccessPropertiesCheck.php

@@ -64,6 +64,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();
@@ -90,6 +91,7 @@ private function processSingleProperty(Scope $scope, PropertyFetch $node, string
 			];
 		}
 
+		// TODO use hasInstanceProperty
 		$has = $type->hasProperty($name);
 		if (!$has->no() && $this->canAccessUndefinedProperties($scope, $node)) {
 			return [];
@@ -121,12 +123,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 [];
 						}
 
@@ -159,6 +161,7 @@ private function processSingleProperty(Scope $scope, PropertyFetch $node, string
 			];
 		}
 
+		// TODO use getInstanceProperty
 		$propertyReflection = $type->getProperty($name, $scope);
 		if ($propertyReflection->isStatic()) {
 			return [

Diff for: 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);

Diff for: src/Type/Php/ReflectionPropertyConstructorThrowTypeExtension.php

@@ -40,7 +40,7 @@ public function getThrowTypeFromStaticMethodCall(MethodReflection $methodReflect
 
 			$classReflection = $this->reflectionProvider->getClass($constantString->getValue());
 			foreach ($propertyType->getConstantStrings() as $constantPropertyString) {
-				if (!$classReflection->hasProperty($constantPropertyString->getValue())) {
+				if (!$classReflection->hasInstanceProperty($constantPropertyString->getValue())) {
 					return $methodReflection->getThrowType();
 				}
 			}