Solve deprecations

Author: VincentLanglet

src/Reflection/InitializerExprTypeResolver.php

@@ -407,11 +407,11 @@ public function getType(Expr $expr, InitializerExprContext $context): Type
 
 		if ($expr instanceof PropertyFetch && $expr->name instanceof Identifier) {
 			$fetchedOnType = $this->getType($expr->var, $context);
-			if (!$fetchedOnType->hasProperty($expr->name->name)->yes()) {
+			if (!$fetchedOnType->hasInstanceProperty($expr->name->name)->yes()) {
 				return new ErrorType();
 			}
 
-			return $fetchedOnType->getProperty($expr->name->name, new OutOfClassScope())->getReadableType();
+			return $fetchedOnType->getInstanceProperty($expr->name->name, new OutOfClassScope())->getReadableType();
 		}
 
 		return new MixedType();

src/Rules/DeadCode/UnusedPrivatePropertyRule.php

@@ -182,7 +182,14 @@ public function processNode(Node $node, Scope $scope): array
 				if (!array_key_exists($propertyName, $properties)) {
 					continue;
 				}
-				$propertyReflection = $usageScope->getPropertyReflection($fetchedOnType, $propertyName);
+
+				$propertyNode = $properties[$propertyName]['node'];
+				if ($propertyNode->isStatic()) {
+					$propertyReflection = $usageScope->getStaticPropertyReflection($fetchedOnType, $propertyName);
+				} else {
+					$propertyReflection = $usageScope->getInstancePropertyReflection($fetchedOnType, $propertyName);
+				}
+
 				if ($propertyReflection === null) {
 					if (!$classType->isSuperTypeOf($fetchedOnType)->no()) {
 						if ($usage instanceof PropertyRead) {

src/Rules/Properties/PropertyReflectionFinder.php

@@ -33,7 +33,7 @@ public function findPropertyReflectionsFromNode($propertyFetch, Scope $scope): a
 			$reflections = [];
 			$propertyHolderType = $scope->getType($propertyFetch->var);
 			foreach ($names as $name) {
-				$reflection = $this->findPropertyReflection(
+				$reflection = $this->findInstancePropertyReflection(
 					$propertyHolderType,
 					$name,
 					$propertyFetch->name instanceof Expr ? $scope->filterByTruthyValue(new Expr\BinaryOp\Identical(
@@ -65,7 +65,7 @@ public function findPropertyReflectionsFromNode($propertyFetch, Scope $scope): a
 
 		$reflections = [];
 		foreach ($names as $name) {
-			$reflection = $this->findPropertyReflection(
+			$reflection = $this->findStaticPropertyReflection(
 				$propertyHolderType,
 				$name,
 				$propertyFetch->name instanceof Expr ? $scope->filterByTruthyValue(new Expr\BinaryOp\Identical(
@@ -91,13 +91,13 @@ public function findPropertyReflectionFromNode($propertyFetch, Scope $scope): ?F
 		if ($propertyFetch instanceof Node\Expr\PropertyFetch) {
 			$propertyHolderType = $scope->getType($propertyFetch->var);
 			if ($propertyFetch->name instanceof Node\Identifier) {
-				return $this->findPropertyReflection($propertyHolderType, $propertyFetch->name->name, $scope);
+				return $this->findInstancePropertyReflection($propertyHolderType, $propertyFetch->name->name, $scope);
 			}
 
 			$nameType = $scope->getType($propertyFetch->name);
 			$nameTypeConstantStrings = $nameType->getConstantStrings();
 			if (count($nameTypeConstantStrings) === 1) {
-				return $this->findPropertyReflection($propertyHolderType, $nameTypeConstantStrings[0]->getValue(), $scope);
+				return $this->findInstancePropertyReflection($propertyHolderType, $nameTypeConstantStrings[0]->getValue(), $scope);
 			}
 
 			return null;
@@ -113,16 +113,33 @@ public function findPropertyReflectionFromNode($propertyFetch, Scope $scope): ?F
 			$propertyHolderType = $scope->getType($propertyFetch->class);
 		}
 
-		return $this->findPropertyReflection($propertyHolderType, $propertyFetch->name->name, $scope);
+		return $this->findStaticPropertyReflection($propertyHolderType, $propertyFetch->name->name, $scope);
 	}
 
-	private function findPropertyReflection(Type $propertyHolderType, string $propertyName, Scope $scope): ?FoundPropertyReflection
+	private function findInstancePropertyReflection(Type $propertyHolderType, string $propertyName, Scope $scope): ?FoundPropertyReflection
 	{
-		if (!$propertyHolderType->hasProperty($propertyName)->yes()) {
+		if (!$propertyHolderType->hasInstanceProperty($propertyName)->yes()) {
 			return null;
 		}
 
-		$originalProperty = $propertyHolderType->getProperty($propertyName, $scope);
+		$originalProperty = $propertyHolderType->getInstanceProperty($propertyName, $scope);
+
+		return new FoundPropertyReflection(
+			$originalProperty,
+			$scope,
+			$propertyName,
+			$originalProperty->getReadableType(),
+			$originalProperty->getWritableType(),
+		);
+	}
+
+	private function findStaticPropertyReflection(Type $propertyHolderType, string $propertyName, Scope $scope): ?FoundPropertyReflection
+	{
+		if (!$propertyHolderType->hasStaticProperty($propertyName)->yes()) {
+			return null;
+		}
+
+		$originalProperty = $propertyHolderType->getStaticProperty($propertyName, $scope);
 
 		return new FoundPropertyReflection(
 			$originalProperty,

src/Type/Php/ArrayColumnHelper.php

@@ -149,15 +149,15 @@ private function getOffsetOrProperty(Type $type, Type $offsetOrProperty, Scope $
 			}
 			foreach ($propertyTypes as $propertyType) {
 				$propertyName = $propertyType->getValue();
-				$hasProperty = $type->hasProperty($propertyName);
+				$hasProperty = $type->hasInstanceProperty($propertyName);
 				if ($hasProperty->maybe()) {
 					return $allowMaybe ? new MixedType() : null;
 				}
 				if (!$hasProperty->yes()) {
 					continue;
 				}
 
-				$returnTypes[] = $type->getProperty($propertyName, $scope)->getReadableType();
+				$returnTypes[] = $type->getInstanceProperty($propertyName, $scope)->getReadableType();
 			}
 		}