MutatingScope - extract exprStringToExpr

Author: ondrejmirtes

src/Analyser/MutatingScope.php

@@ -3593,17 +3593,10 @@ public function invalidateExpression(Expr $expressionToInvalidate, bool $require
 		$nodeFinder = new NodeFinder();
 		foreach (array_keys($moreSpecificTypeHolders) as $exprString) {
 			$exprString = (string) $exprString;
-
-			try {
-				$expr = $this->parser->parseString('<?php ' . $exprString . ';')[0];
-			} catch (ParserErrorsException) {
+			$exprExpr = $this->exprStringToExpr($exprString);
+			if ($exprExpr === null) {
 				continue;
 			}
-			if (!$expr instanceof Node\Stmt\Expression) {
-				throw new ShouldNotHappenException();
-			}
-
-			$exprExpr = $expr->expr;
 			if ($exprExpr instanceof PropertyFetch) {
 				$propertyReflection = $this->propertyReflectionFinder->findPropertyReflectionFromNode($exprExpr, $this);
 				if ($propertyReflection !== null) {
@@ -3659,6 +3652,20 @@ public function invalidateExpression(Expr $expressionToInvalidate, bool $require
 		);
 	}
 
+	private function exprStringToExpr(string $exprString): ?Expr
+	{
+		try {
+			$expr = $this->parser->parseString('<?php ' . $exprString . ';')[0];
+		} catch (ParserErrorsException) {
+			return null;
+		}
+		if (!$expr instanceof Node\Stmt\Expression) {
+			throw new ShouldNotHappenException();
+		}
+
+		return $expr->expr;
+	}
+
 	public function invalidateMethodsOnExpression(Expr $expressionToInvalidate): self
 	{
 		$exprStringToInvalidate = $this->getNodeKey($expressionToInvalidate);