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

Author: ondrejmirtes

phpstan-baseline.neon

@@ -43,7 +43,8 @@ parameters:
 			path: src/Analyser/MutatingScope.php
 
 		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantBooleanType is error\\-prone and deprecated\\. Use Type\\:\\:isTrue\\(\\) or Type\\:\\:isFalse\\(\\) instead\\.$#"
+			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantBooleanType is error\-prone and deprecated\. Use Type\:\:isTrue\(\) or Type\:\:isFalse\(\) instead\.$#'
+			identifier: phpstanApi.instanceofType
 			count: 2
 			path: src/Analyser/NodeScopeResolver.php
 
@@ -671,6 +672,12 @@ parameters:
 			count: 1
 			path: src/Rules/RuleLevelHelper.php
 
+		-
+			message: '#^Doing instanceof PHPStan\\Type\\ObjectType is error\-prone and deprecated\. Use Type\:\:isObject\(\) or Type\:\:getObjectClassNames\(\) instead\.$#'
+			identifier: phpstanApi.instanceofType
+			count: 2
+			path: src/Rules/RuleLevelHelper.php
+
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantBooleanType is error\-prone and deprecated\. Use Type\:\:isTrue\(\) or Type\:\:isFalse\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType

src/Type/TypeCombinator.php

@@ -852,8 +852,8 @@ private static function optimizeConstantArrays(array $types): array
 				$eachIsList = false;
 			}
 
-			$keyType = self::union(...array_values($keyTypes));
-			$valueType = self::union(...array_values($valueTypes));
+			$keyType = self::union(...$keyTypes);
+			$valueType = self::union(...$valueTypes);
 
 			$arrayType = new ArrayType($keyType, $valueType);
 			if ($eachIsList) {