MinMaxFunctionReturnTypeExtension: Cleanup instanceof ConstantScalarType

Author: staabm

phpstan-baseline.neon

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

src/Type/Php/MinMaxFunctionReturnTypeExtension.php

@@ -187,13 +187,13 @@ private function compareTypes(
 	{
 		if (
 			$firstType->isConstantArray()->yes()
-			&& $secondType instanceof ConstantScalarType
+			&& $secondType->isConstantScalarValue()->yes()
 		) {
 			return $secondType;
 		}
 
 		if (
-			$firstType instanceof ConstantScalarType
+			$firstType->isConstantScalarValue()->yes()
 			&& $secondType->isConstantArray()->yes()
 		) {
 			return $firstType;

tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php

@@ -2363,14 +2363,18 @@ 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>',
+				'array<int>|int', // could be array<int>
 				'max($arrayOfUnknownIntegers, $integer, $arrayOfUnknownIntegers)',
-			],*/
+			],
+			[
+				'5',
+				'min(array(2, 2, 2), 5, array(1, 1, 1, 1))',
+			],
 			[
 				'1.1',
 				'min(...[1.1, 2.2, 3.3])',