Merge remote-tracking branch 'origin/1.12.x' into 2.1.x

Author: ondrejmirtes

phpstan-baseline.neon

@@ -1560,7 +1560,7 @@ parameters:
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\ConstantScalarType is error\-prone and deprecated\. Use Type\:\:isConstantScalarValue\(\) or Type\:\:getConstantScalarTypes\(\) or Type\:\:getConstantScalarValues\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType
-			count: 4
+			count: 2
 			path: src/Type/Php/MinMaxFunctionReturnTypeExtension.php
 
 		-

src/Type/Php/MinMaxFunctionReturnTypeExtension.php

@@ -151,9 +151,6 @@ private function processType(
 	{
 		$resultType = null;
 		foreach ($types as $type) {
-			if (!$type->isConstantValue()->yes()) {
-				return TypeCombinator::union(...$types);
-			}
 			if ($resultType === null) {
 				$resultType = $type;
 				continue;
@@ -188,15 +185,15 @@ private function compareTypes(
 	): ?Type
 	{
 		if (
-			$firstType->isConstantArray()->yes()
-			&& $secondType instanceof ConstantScalarType
+			$firstType->isArray()->yes()
+			&& $secondType->isConstantScalarValue()->yes()
 		) {
 			return $secondType;
 		}
 
 		if (
-			$firstType instanceof ConstantScalarType
-			&& $secondType->isConstantArray()->yes()
+			$firstType->isConstantScalarValue()->yes()
+			&& $secondType->isArray()->yes()
 		) {
 			return $firstType;
 		}

tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php

@@ -2363,14 +2363,42 @@ public function dataBinaryOperations(): array
 				'array<int>',
 				'max($arrayOfUnknownIntegers, $arrayOfUnknownIntegers)',
 			],
-			/*[
-				'array(1, 1, 1, 1)',
+			[
+				'array{1, 1, 1, 1}',
 				'max(array(2, 2, 2), 5, array(1, 1, 1, 1))',
 			],
+			[
+				'array{int, int, int}',
+				'max($arrayOfIntegers, 5)',
+			],
 			[
 				'array<int>',
+				'max($arrayOfUnknownIntegers, 5)',
+			],
+			[
+				'array<int>|int', // could be array<int>
 				'max($arrayOfUnknownIntegers, $integer, $arrayOfUnknownIntegers)',
-			],*/
+			],
+			[
+				'array<int>',
+				'max($arrayOfUnknownIntegers, $conditionalInt)',
+			],
+			[
+				'5',
+				'min($arrayOfIntegers, 5)',
+			],
+			[
+				'5',
+				'min($arrayOfUnknownIntegers, 5)',
+			],
+			[
+				'1|2',
+				'min($arrayOfUnknownIntegers, $conditionalInt)',
+			],
+			[
+				'5',
+				'min(array(2, 2, 2), 5, array(1, 1, 1, 1))',
+			],
 			[
 				'1.1',
 				'min(...[1.1, 2.2, 3.3])',