Fix rebase

Author: VincentLanglet

src/Rules/Properties/AccessPropertiesCheck.php

@@ -274,7 +274,7 @@ private function pickProperty(Scope $scope, Type $type, string $name): ?Extended
 		$types = [];
 		if ($type instanceof UnionType) {
 			foreach ($type->getTypes() as $innerType) {
-				if ($innerType->hasProperty($name)->no()) {
+				if ($innerType->hasInstanceProperty($name)->no()) {
 					continue;
 				}
 
@@ -284,15 +284,15 @@ private function pickProperty(Scope $scope, Type $type, string $name): ?Extended
 
 		if (count($types) === 0) {
 			try {
-				return $type->getProperty($name, $scope);
+				return $type->getInstanceProperty($name, $scope);
 			} catch (MissingPropertyFromReflectionException) {
 				return null;
 			}
 		}
 
 		if (count($types) === 1) {
 			try {
-				return $types[0]->getProperty($name, $scope);
+				return $types[0]->getInstanceProperty($name, $scope);
 			} catch (MissingPropertyFromReflectionException) {
 				return null;
 			}
@@ -301,7 +301,7 @@ private function pickProperty(Scope $scope, Type $type, string $name): ?Extended
 		$unionType = TypeCombinator::union(...$types);
 
 		try {
-			return $unionType->getProperty($name, $scope);
+			return $unionType->getInstanceProperty($name, $scope);
 		} catch (MissingPropertyFromReflectionException) {
 			return null;
 		}