Fix AccessoryNonFalsyStringType::setOffsetValueType()

phpstan · Aug 14, 2024 · c28c936 · c28c936
1 parent 93c5226
commit c28c936
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/Type/Accessory/AccessoryNonFalsyStringType.php b/src/Type/Accessory/AccessoryNonFalsyStringType.php
@@ -155,7 +155,11 @@ public function getOffsetValueType(Type $offsetType): Type
 
 	public function setOffsetValueType(?Type $offsetType, Type $valueType, bool $unionValues = true): Type
 	{
-		return $this;
+		if ($valueType->isNonFalsyString()->yes()) {
+			return $this;
+		}
+
+		return new StringType();
 	}
 
 	public function setExistingOffsetValueType(Type $offsetType, Type $valueType): Type

diff --git a/tests/PHPStan/Analyser/nsrt/bug-3981.php b/tests/PHPStan/Analyser/nsrt/bug-3981.php
@@ -29,7 +29,6 @@ public function doFoo(string $s, string $nonEmptyString): void
 
 	/**
 	 * @param literal-string $literalString
-	 * @param literal-string $anotherLiteralString
 	 */
 	public function doBar(string $literalString, string $generalString): void
 	{
@@ -40,4 +39,16 @@ public function doBar(string $literalString, string $generalString): void
 		assertType('non-empty-string', $literalString);
 	}
 
+	/**
+	 * @param non-falsy-string $nonFalsyString
+	 */
+	public function doBaz(string $nonFalsyString, string $generalString): void
+	{
+		$nonFalsyString[0] = 'a';
+		assertType('non-falsy-string', $nonFalsyString);
+
+		$nonFalsyString[1] = $generalString;
+		assertType('non-empty-string', $nonFalsyString);
+	}
+
 }