cleanup

Author: staabm

src/Analyser/TypeSpecifier.php

@@ -2242,11 +2242,23 @@ public function resolveEqual(Expr\BinaryOp\Equal $expr, Scope $scope, TypeSpecif
 
 	public function resolveIdentical(Expr\BinaryOp\Identical $expr, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
 	{
-		$specifiedTypes = $this->resolveNormalizedIdentical($expr, $scope, $context);
-
-		// merge result of fn1() === fn2() and fn2() === fn1()
 		$leftExpr = $expr->left;
 		$rightExpr = $expr->right;
+
+		// Normalize to: fn() === expr
+		if ($rightExpr instanceof FuncCall && !$leftExpr instanceof FuncCall) {
+			$specifiedTypes = $this->resolveNormalizedIdentical(new Expr\BinaryOp\Identical(
+				$rightExpr,
+				$leftExpr,
+			), $scope, $context);
+		} else {
+			$specifiedTypes = $this->resolveNormalizedIdentical(new Expr\BinaryOp\Identical(
+				$leftExpr,
+				$rightExpr,
+			), $scope, $context);
+		}
+
+		// merge result of fn1() === fn2() and fn2() === fn1()
 		if ($rightExpr instanceof FuncCall && $leftExpr instanceof FuncCall) {
 			return $specifiedTypes->unionWith(
 				$this->resolveNormalizedIdentical(new Expr\BinaryOp\Identical(
@@ -2261,12 +2273,8 @@ public function resolveIdentical(Expr\BinaryOp\Identical $expr, Scope $scope, Ty
 
 	private function resolveNormalizedIdentical(Expr\BinaryOp\Identical $expr, Scope $scope, TypeSpecifierContext $context): SpecifiedTypes
 	{
-		// Normalize to: fn() === expr
 		$leftExpr = $expr->left;
 		$rightExpr = $expr->right;
-		if ($rightExpr instanceof FuncCall && !$leftExpr instanceof FuncCall) {
-			[$leftExpr, $rightExpr] = [$rightExpr, $leftExpr];
-		}
 
 		$unwrappedLeftExpr = $leftExpr;
 		if ($leftExpr instanceof AlwaysRememberedExpr) {