Merge branch refs/heads/1.12.x into 2.1.x

Author: phpstan-bot

src/Reflection/InitializerExprTypeResolver.php

@@ -637,6 +637,9 @@ public function getBitwiseAndType(Expr $left, Expr $right, callable $getTypeCall
 				}
 				return TypeCombinator::union(...$resultTypes);
 			}
+
+			$leftType = $this->optimizeScalarType($leftType);
+			$rightType = $this->optimizeScalarType($rightType);
 		}
 
 		if ($leftType->isString()->yes() && $rightType->isString()->yes()) {
@@ -703,6 +706,9 @@ public function getBitwiseOrType(Expr $left, Expr $right, callable $getTypeCallb
 				}
 				return TypeCombinator::union(...$resultTypes);
 			}
+
+			$leftType = $this->optimizeScalarType($leftType);
+			$rightType = $this->optimizeScalarType($rightType);
 		}
 
 		if ($leftType->isString()->yes() && $rightType->isString()->yes()) {
@@ -759,6 +765,9 @@ public function getBitwiseXorType(Expr $left, Expr $right, callable $getTypeCall
 				}
 				return TypeCombinator::union(...$resultTypes);
 			}
+
+			$leftType = $this->optimizeScalarType($leftType);
+			$rightType = $this->optimizeScalarType($rightType);
 		}
 
 		if ($leftType->isString()->yes() && $rightType->isString()->yes()) {
@@ -844,6 +853,9 @@ public function getDivType(Expr $left, Expr $right, callable $getTypeCallback):
 				}
 				return TypeCombinator::union(...$resultTypes);
 			}
+
+			$leftType = $this->optimizeScalarType($leftType);
+			$rightType = $this->optimizeScalarType($rightType);
 		}
 
 		$rightScalarValues = $rightType->toNumber()->getConstantScalarValues();
@@ -909,6 +921,9 @@ public function getModType(Expr $left, Expr $right, callable $getTypeCallback):
 				}
 				return TypeCombinator::union(...$resultTypes);
 			}
+
+			$leftType = $this->optimizeScalarType($leftType);
+			$rightType = $this->optimizeScalarType($rightType);
 		}
 
 		$integerType = $rightType->toInteger();
@@ -1001,6 +1016,9 @@ public function getPlusType(Expr $left, Expr $right, callable $getTypeCallback):
 
 				return TypeCombinator::union(...$resultTypes);
 			}
+
+			$leftType = $this->optimizeScalarType($leftType);
+			$rightType = $this->optimizeScalarType($rightType);
 		}
 
 		$leftConstantArrays = $leftType->getConstantArrays();
@@ -1162,6 +1180,9 @@ public function getMinusType(Expr $left, Expr $right, callable $getTypeCallback)
 
 				return TypeCombinator::union(...$resultTypes);
 			}
+
+			$leftType = $this->optimizeScalarType($leftType);
+			$rightType = $this->optimizeScalarType($rightType);
 		}
 
 		return $this->resolveCommonMath(new BinaryOp\Minus($left, $right), $leftType, $rightType);
@@ -1203,6 +1224,9 @@ public function getMulType(Expr $left, Expr $right, callable $getTypeCallback):
 
 				return TypeCombinator::union(...$resultTypes);
 			}
+
+			$leftType = $this->optimizeScalarType($leftType);
+			$rightType = $this->optimizeScalarType($rightType);
 		}
 
 		$leftNumberType = $leftType->toNumber();
@@ -1288,6 +1312,9 @@ public function getShiftLeftType(Expr $left, Expr $right, callable $getTypeCallb
 
 				return TypeCombinator::union(...$resultTypes);
 			}
+
+			$leftType = $this->optimizeScalarType($leftType);
+			$rightType = $this->optimizeScalarType($rightType);
 		}
 
 		$leftNumberType = $leftType->toNumber();
@@ -1344,6 +1371,9 @@ public function getShiftRightType(Expr $left, Expr $right, callable $getTypeCall
 
 				return TypeCombinator::union(...$resultTypes);
 			}
+
+			$leftType = $this->optimizeScalarType($leftType);
+			$rightType = $this->optimizeScalarType($rightType);
 		}
 
 		$leftNumberType = $leftType->toNumber();
@@ -1356,6 +1386,33 @@ public function getShiftRightType(Expr $left, Expr $right, callable $getTypeCall
 		return $this->resolveCommonMath(new Expr\BinaryOp\ShiftRight($left, $right), $leftType, $rightType);
 	}
 
+	private function optimizeScalarType(Type $type): Type
+	{
+		$types = [];
+		if ($type->isInteger()->yes()) {
+			$types[] = new IntegerType();
+		}
+		if ($type->isString()->yes()) {
+			$types[] = new StringType();
+		}
+		if ($type->isFloat()->yes()) {
+			$types[] = new FloatType();
+		}
+		if ($type->isNull()->yes()) {
+			$types[] = new NullType();
+		}
+
+		if (count($types) === 0) {
+			return new ErrorType();
+		}
+
+		if (count($types) === 1) {
+			return $types[0];
+		}
+
+		return new UnionType($types);
+	}
+
 	/**
 	 * @return TypeResult<BooleanType>
 	 */