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

Author: ondrejmirtes

src/Type/Accessory/AccessoryNumericStringType.php

@@ -210,7 +210,13 @@ public function toArray(): Type
 
 	public function toArrayKey(): Type
 	{
-		return new IntegerType();
+		return new UnionType([
+			new IntegerType(),
+			new IntersectionType([
+				new StringType(),
+				new AccessoryNumericStringType(),
+			]),
+		]);
 	}
 
 	public function toCoercedArgumentType(bool $strictTypes): Type

src/Type/Constant/ConstantArrayType.php

@@ -580,11 +580,17 @@ public function findTypeAndMethodNames(): array
 
 	public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 	{
-		$offsetType = $offsetType->toArrayKey();
+		$offsetArrayKeyType = $offsetType->toArrayKey();
+
+		return $this->recursiveHasOffsetValueType($offsetArrayKeyType);
+	}
+
+	private function recursiveHasOffsetValueType(Type $offsetType): TrinaryLogic
+	{
 		if ($offsetType instanceof UnionType) {
 			$results = [];
 			foreach ($offsetType->getTypes() as $innerType) {
-				$results[] = $this->hasOffsetValueType($innerType);
+				$results[] = $this->recursiveHasOffsetValueType($innerType);
 			}
 
 			return TrinaryLogic::extremeIdentity(...$results);
@@ -594,7 +600,7 @@ public function hasOffsetValueType(Type $offsetType): TrinaryLogic
 			if ($finiteTypes !== []) {
 				$results = [];
 				foreach ($finiteTypes as $innerType) {
-					$results[] = $this->hasOffsetValueType($innerType);
+					$results[] = $this->recursiveHasOffsetValueType($innerType);
 				}
 
 				return TrinaryLogic::extremeIdentity(...$results);

src/Type/IntersectionType.php

@@ -1103,7 +1103,10 @@ public function toArray(): Type
 	public function toArrayKey(): Type
 	{
 		if ($this->isNumericString()->yes()) {
-			return new IntegerType();
+			return TypeCombinator::union(
+				new IntegerType(),
+				$this,
+			);
 		}
 
 		if ($this->isString()->yes()) {

tests/PHPStan/Analyser/nsrt/bug-3133.php

@@ -52,7 +52,7 @@ public function doLorem(
 	{
 		$a = [];
 		$a[$numericString] = 'foo';
-		assertType('non-empty-array<int, \'foo\'>', $a);
+		assertType('non-empty-array<int|numeric-string, \'foo\'>', $a);
 	}
 
 }

tests/PHPStan/Analyser/nsrt/bug-8592.php

@@ -0,0 +1,15 @@
+<?php declare(strict_types = 1);
+
+namespace Bug8592;
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param array<numeric-string, mixed> $foo
+ */
+function foo(array $foo): void
+{
+	foreach ($foo as $key => $value) {
+		assertType('int|numeric-string', $key);
+	}
+}

tests/PHPStan/Analyser/nsrt/isset-coalesce-empty-type.php

@@ -296,7 +296,7 @@ class Bug4671
 	 */
 	public function doFoo(int $intput, array $strings): void
 	{
-		assertType('false', isset($strings[(string) $intput]));
+		assertType('bool', isset($strings[(string) $intput]));
 	}
 
 }

tests/PHPStan/Rules/Arrays/NonexistentOffsetInArrayDimFetchRuleTest.php

@@ -754,6 +754,11 @@ public function testBug2634(): void
 		$this->analyse([__DIR__ . '/data/bug-2634.php'], []);
 	}
 
+	public function testBug11390(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-11390.php'], []);
+	}
+
 	public function testInternalClassesWithOverloadedOffsetAccess(): void
 	{
 		$this->analyse([__DIR__ . '/data/internal-classes-overload-offset-access.php'], []);

tests/PHPStan/Rules/Arrays/data/bug-11390.php

@@ -0,0 +1,29 @@
+<?php declare(strict_types = 1);
+
+namespace Bug11390;
+
+/**
+ * @param array<array{
+ *   id: numeric-string,
+ *   tagName: string
+ * }> $tags
+ * @param numeric-string $tagId
+ */
+function printTagName(array $tags, string $tagId): void
+{
+	// Adding the second `*` to either of the following lines makes the error disappear
+
+	$tagsById = array_combine(array_column($tags, 'id'), $tags);
+	if (false !== $tagsById) {
+		echo $tagsById[$tagId]['tagName'] . PHP_EOL;
+	}
+}
+
+printTagName(
+	[
+		['id' => '123', 'tagName' => 'abc'],
+		['id' => '4.5', 'tagName' => 'def'],
+		['id' => '6e78', 'tagName' => 'ghi']
+	],
+	'4.5'
+);

tests/PHPStan/Rules/Methods/ReturnTypeRuleTest.php

@@ -1101,6 +1101,16 @@ public function testBug10653(): void
 		$this->analyse([__DIR__ . '/data/bug-10653.php'], []);
 	}
 
+	public function testBug4163(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-4163.php'], [
+			[
+				'Method Bug4163\HelloWorld::lall() should return array<string, string> but returns array<int|string, string>.',
+				28,
+			],
+		]);
+	}
+
 	public function testBug11663(): void
 	{
 		$this->analyse([__DIR__ . '/data/bug-11663.php'], []);

tests/PHPStan/Rules/Methods/data/bug-4163.php

@@ -0,0 +1,30 @@
+<?php declare(strict_types = 1);
+
+namespace Bug4163;
+
+class HelloWorld
+{
+	/**
+	 * @phpstan-var numeric
+	 */
+	public $lall = 0;
+
+	/**
+	 * @phpstan-return array<string, string>
+	 */
+	function lall() {
+		$helloCollection = [new HelloWorld(), new HelloWorld()];
+		$result = [];
+
+		foreach ($helloCollection as $hello) {
+			$key = (string)$hello->lall;
+
+			if (!isset($result[$key])) {
+				$lall = 'do_something_here';
+				$result[$key] = $lall;
+			}
+		}
+
+		return $result;
+	}
+}