Extract MutatingScope->isReadonlyPropertyFetchOnThis()

Author: staabm

src/Analyser/MutatingScope.php

@@ -315,24 +315,9 @@ private function rememberConstructorExpressions(array $currentExpressionTypes):
 					continue;
 				}
 			} elseif ($expr instanceof PropertyFetch) {
-				if (
-					!$expr->name instanceof Node\Identifier
-					|| !$expr->var instanceof Variable
-					|| $expr->var->name !== 'this'
-					|| !$this->phpVersion->supportsReadOnlyProperties()
-				) {
+				if (!$this->isReadonlyPropertyFetchOnThis($expr)) {
 					continue;
 				}
-
-				$propertyReflection = $this->propertyReflectionFinder->findPropertyReflectionFromNode($expr, $this);
-				if ($propertyReflection === null) {
-					continue;
-				}
-
-				$nativePropertyReflection = $propertyReflection->getNativeReflection();
-				if ($nativePropertyReflection === null || !$nativePropertyReflection->isReadOnly()) {
-						continue;
-				}
 			} elseif (!$expr instanceof ConstFetch && !$expr instanceof PropertyInitializationExpr) {
 				continue;
 			}
@@ -369,6 +354,30 @@ public function rememberConstructorScope(): self
 		);
 	}
 
+	private function isReadonlyPropertyFetchOnThis(PropertyFetch $expr): bool
+	{
+		if (
+			!$expr->name instanceof Node\Identifier
+			|| !$expr->var instanceof Variable
+			|| $expr->var->name !== 'this'
+			|| !$this->phpVersion->supportsReadOnlyProperties()
+		) {
+			return false;
+		}
+
+		$propertyReflection = $this->propertyReflectionFinder->findPropertyReflectionFromNode($expr, $this);
+		if ($propertyReflection === null) {
+			return false;
+		}
+
+		$nativePropertyReflection = $propertyReflection->getNativeReflection();
+		if ($nativePropertyReflection === null || !$nativePropertyReflection->isReadOnly()) {
+			return false;
+		}
+
+		return true;
+	}
+
 	/** @api */
 	public function isInClass(): bool
 	{