PropertyReflectionFinder - DRY

phpstan · Oct 18, 2020 · aeb9925 · aeb9925
1 parent fd66714
commit aeb9925
Showing 1 changed file with 3 additions and 19 deletions.
diff --git a/src/Rules/Properties/PropertyReflectionFinder.php b/src/Rules/Properties/PropertyReflectionFinder.php
@@ -82,28 +82,12 @@ public function findPropertyReflectionsFromNode($propertyFetch, Scope $scope): a
 	 */
 	public function findPropertyReflectionFromNode($propertyFetch, Scope $scope): ?FoundPropertyReflection
 	{
-		if ($propertyFetch instanceof \PhpParser\Node\Expr\PropertyFetch) {
-			if (!$propertyFetch->name instanceof \PhpParser\Node\Identifier) {
-				return null;
-			}
-			$propertyHolderType = $scope->getType($propertyFetch->var);
-			$fetchedOnThis = $propertyHolderType instanceof ThisType && $scope->isInClass();
-			return $this->findPropertyReflection($propertyHolderType, $propertyFetch->name->name, $scope, $fetchedOnThis);
-		}
-
-		if (!$propertyFetch->name instanceof \PhpParser\Node\Identifier) {
+		$reflections = $this->findPropertyReflectionsFromNode($propertyFetch, $scope);
+		if (count($reflections) !== 1) {
 			return null;
 		}
 
-		if ($propertyFetch->class instanceof \PhpParser\Node\Name) {
-			$propertyHolderType = new ObjectType($scope->resolveName($propertyFetch->class));
-		} else {
-			$propertyHolderType = $scope->getType($propertyFetch->class);
-		}
-
-		$fetchedOnThis = $propertyHolderType instanceof ThisType && $scope->isInClass();
-
-		return $this->findPropertyReflection($propertyHolderType, $propertyFetch->name->name, $scope, $fetchedOnThis);
+		return $reflections[0];
 	}
 
 	private function findPropertyReflection(Type $propertyHolderType, string $propertyName, Scope $scope, bool $fetchedOnThis): ?FoundPropertyReflection