Cheap checks first in TypeSpecifier

phpstan · Dec 13, 2022 · 2092177 · 2092177
1 parent 0962e97
commit 2092177
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -231,9 +231,9 @@ public function specifyTypesInCondition(
 			$exprLeftType = $scope->getType($expr->left);
 			$exprRightType = $scope->getType($expr->right);
 			if (
-				($exprLeftType instanceof ConstantType && !$exprRightType->equals($exprLeftType) && $exprRightType->isSuperTypeOf($exprLeftType)->yes())
-				|| $exprLeftType instanceof ConstantScalarType
+				$exprLeftType instanceof ConstantScalarType
 				|| $exprLeftType instanceof EnumCaseObjectType
+				|| ($exprLeftType instanceof ConstantType && !$exprRightType->equals($exprLeftType) && $exprRightType->isSuperTypeOf($exprLeftType)->yes())
 			) {
 				$types = $this->create(
 					$expr->right,
@@ -245,9 +245,9 @@ public function specifyTypesInCondition(
 				);
 			}
 			if (
-				($exprRightType instanceof ConstantType && !$exprLeftType->equals($exprRightType) && $exprLeftType->isSuperTypeOf($exprRightType)->yes())
-				|| $exprRightType instanceof ConstantScalarType
+				$exprRightType instanceof ConstantScalarType
 				|| $exprRightType instanceof EnumCaseObjectType
+				|| ($exprRightType instanceof ConstantType && !$exprLeftType->equals($exprRightType) && $exprLeftType->isSuperTypeOf($exprRightType)->yes())
 			) {
 				$leftType = $this->create(
 					$expr->left,