Merge branch 2.1.x into 2.2.x

phpstan-bot · phpstan-bot · commit 9a6efe0a3251 · 2026-03-21T10:23:51.000Z
diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -162,10 +162,6 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni
 
 	public function setExistingOffsetValueType(Type $offsetType, Type $valueType): Type
 	{
-		if ($this->hasOffsetValueType($offsetType)->no()) {
-			return new ErrorType();
-		}
-
 		return $this;
 	}
 
diff --git a/tests/PHPStan/Analyser/nsrt/bug-13629.php b/tests/PHPStan/Analyser/nsrt/bug-13629.php
diff --git a/tests/PHPStan/Rules/Functions/ArrayValuesRuleTest.php b/tests/PHPStan/Rules/Functions/ArrayValuesRuleTest.php
@@ -89,9 +89,4 @@ public function testFile(): void
 		$this->analyse([__DIR__ . '/data/array_values_list.php'], $expectedErrors);
 	}
 
-	public function testBug13629(): void
-	{
-		$this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-13629.php'], []);
-	}
-
 }

Original file line number	Diff line number	Diff line change
`@@ -162,10 +162,6 @@ public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $uni`
`162`	`162`
`163`	`163`	`public function setExistingOffsetValueType(Type $offsetType, Type $valueType): Type`
`164`	`164`	`{`
`165`		`- if ($this->hasOffsetValueType($offsetType)->no()) {`
`166`		`- return new ErrorType();`
`167`		`- }`
`168`		`-`
`169`	`165`	`return $this;`
`170`	`166`	`}`
`171`	`167`
Original file line number	Diff line number	Diff line change
`@@ -89,9 +89,4 @@ public function testFile(): void`
`89`	`89`	`$this->analyse([__DIR__ . '/data/array_values_list.php'], $expectedErrors);`
`90`	`90`	`}`
`91`	`91`
`92`		`- public function testBug13629(): void`
`93`		`- {`
`94`		`- $this->analyse([__DIR__ . '/../../Analyser/nsrt/bug-13629.php'], []);`
`95`		`- }`
`96`		`-`
`97`	`92`	`}`