Merge remote-tracking branch 'origin/1.10.x' into 1.11.x

Author: ondrejmirtes

composer.json

@@ -14,7 +14,7 @@
 		"hoa/compiler": "3.17.08.08",
 		"hoa/exception": "^1.0",
 		"hoa/regex": "1.17.01.13",
-		"jetbrains/phpstorm-stubs": "dev-master#8ea3bf44722f76a3a32c89fe769b6144c253f8a6",
+		"jetbrains/phpstorm-stubs": "dev-master#be32b6125b9bcbd7deabe830c5935d4c47b9481c",
 		"nette/bootstrap": "^3.0",
 		"nette/di": "3.1.10",
 		"nette/finder": "^2.5",
@@ -24,7 +24,7 @@
 		"nikic/php-parser": "^4.17.1",
 		"ondram/ci-detector": "^3.4.0",
 		"ondrejmirtes/better-reflection": "6.21.0",
-		"phpstan/php-8-stubs": "0.3.82",
+		"phpstan/php-8-stubs": "0.3.84",
 		"phpstan/phpdoc-parser": "1.25.0",
 		"react/async": "^3",
 		"react/child-process": "^0.6.4",

composer.lock

@@ -838,19 +838,14 @@ parameters:
 
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantStringType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantStrings\\(\\) instead\\.$#"
-			count: 4
+			count: 3
 			path: src/Type/Constant/ConstantArrayType.php
 
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\IntersectionType is error\\-prone and deprecated\\.$#"
 			count: 1
 			path: src/Type/Constant/ConstantArrayType.php
 
-		-
-			message: "#^Doing instanceof PHPStan\\\\Type\\\\StringType is error\\-prone and deprecated\\. Use Type\\:\\:isString\\(\\) instead\\.$#"
-			count: 1
-			path: src/Type/Constant/ConstantArrayType.php
-
 		-
 			message: "#^Doing instanceof PHPStan\\\\Type\\\\Constant\\\\ConstantStringType is error\\-prone and deprecated\\. Use Type\\:\\:getConstantStrings\\(\\) instead\\.$#"
 			count: 2

phpstan-baseline.neon

@@ -40,7 +40,6 @@
 use PHPStan\Type\IntersectionType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\NeverType;
-use PHPStan\Type\StringType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
@@ -619,8 +618,8 @@ public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 		foreach ($this->keyTypes as $i => $keyType) {
 			if (
 				$keyType instanceof ConstantIntegerType
-				&& $offsetType instanceof StringType
-				&& !$offsetType instanceof ConstantStringType
+				&& !$offsetType->isString()->no()
+				&& $offsetType->isConstantScalarValue()->no()
 			) {
 				return TrinaryLogic::createMaybe();
 			}

src/Type/Constant/ConstantArrayType.php

@@ -368,4 +368,12 @@ public function testBug8084(): void
 		$this->analyse([__DIR__ . '/data/bug-8084.php'], []);
 	}
 
+	public function testBug10577(): void
+	{
+		$this->treatPhpDocTypesAsCertain = true;
+		$this->strictUnnecessaryNullsafePropertyFetch = true;
+
+		$this->analyse([__DIR__ . '/data/bug-10577.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Variables/NullCoalesceRuleTest.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Bug10577;
+
+class HelloWorld
+{
+	private const MAP = [
+		'10' => 'Test1',
+		'20' => 'Test2',
+	];
+
+
+	public function validate(string $value): void
+	{
+		$value = trim($value);
+
+		if ($value === '') {
+			throw new \RuntimeException();
+		}
+
+		$value = self::MAP[$value] ?? $value;
+
+		// ...
+	}
+}