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

phpstan · Nov 27, 2024 · 62b2683 · 62b2683
2 parents f9e84e0 + 0b925a9
commit 62b2683
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 1 deletion.
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -777,7 +777,14 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 				);
 			});
 		}
-		return $this->intersectTypes(static fn (Type $type): Type => $type->setOffsetValueType($offsetType, $valueType, $unionValues));
+
+		$result = $this->intersectTypes(static fn (Type $type): Type => $type->setOffsetValueType($offsetType, $valueType, $unionValues));
+
+		if ($offsetType !== null && $this->isList()->yes() && $this->isIterableAtLeastOnce()->yes() && (new ConstantIntegerType(1))->isSuperTypeOf($offsetType)->yes()) {
+			$result = TypeCombinator::intersect($result, new AccessoryArrayListType());
+		}
+
+		return $result;
 	}
 
 	public function setExistingOffsetValueType(Type $offsetType, Type $valueType): Type

diff --git a/tests/PHPStan/Analyser/nsrt/list-type.php b/tests/PHPStan/Analyser/nsrt/list-type.php
@@ -106,4 +106,29 @@ public function testUnset(array $list): void
 		assertType('array<int<0, 1>|int<3, max>, int>', $list);
 	}
 
+	/** @param list<int> $list */
+	public function testSetOffsetExplicitlyWithoutGap(array $list): void
+	{
+		assertType('list<int>', $list);
+		$list[0] = 17;
+		assertType('non-empty-list<int>&hasOffsetValue(0, 17)', $list);
+		$list[1] = 19;
+		assertType('non-empty-list<int>&hasOffsetValue(0, 17)&hasOffsetValue(1, 19)', $list);
+		$list[0] = 21;
+		assertType('non-empty-list<int>&hasOffsetValue(0, 21)&hasOffsetValue(1, 19)', $list);
+
+		$list[2] = 23;
+		assertType('non-empty-array<int<0, max>, int>&hasOffsetValue(0, 21)&hasOffsetValue(1, 19)&hasOffsetValue(2, 23)', $list);
+	}
+
+	/** @param list<int> $list */
+	public function testSetOffsetExplicitlyWithGap(array $list): void
+	{
+		assertType('list<int>', $list);
+		$list[0] = 17;
+		assertType('non-empty-list<int>&hasOffsetValue(0, 17)', $list);
+		$list[2] = 21;
+		assertType('non-empty-array<int<0, max>, int>&hasOffsetValue(0, 17)&hasOffsetValue(2, 21)', $list);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Properties/TypesAssignedToPropertiesRuleTest.php b/tests/PHPStan/Rules/Properties/TypesAssignedToPropertiesRuleTest.php
@@ -676,4 +676,16 @@ public function testBug4174(): void
 		$this->analyse([__DIR__ . '/data/bug-4174.php'], []);
 	}
 
+	public function testBug12131(): void
+	{
+		$this->checkExplicitMixed = true;
+		$this->analyse([__DIR__ . '/data/bug-12131.php'], [
+			[
+				'Property Bug12131\Test::$array (non-empty-list<int>) does not accept non-empty-array<int<0, max>, int>.',
+				29,
+				'non-empty-array<int<0, max>, int> might not be a list.',
+			],
+		]);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Properties/data/bug-12131.php b/tests/PHPStan/Rules/Properties/data/bug-12131.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1); // lint >= 7.4
+
+namespace Bug12131;
+
+class Test
+{
+	/**
+	 * @var non-empty-list<int>
+	 */
+	public array $array;
+
+	public function __construct()
+	{
+		$this->array = array_fill(0, 10, 1);
+	}
+
+	public function setAtZero(): void
+	{
+		$this->array[0] = 1;
+	}
+
+	public function setAtOne(): void
+	{
+		$this->array[1] = 1;
+	}
+
+	public function setAtTwo(): void
+	{
+		$this->array[2] = 1;
+	}
+}