Improve and sync Accessory types accepts() methods

staabm · web-flow · commit 9e9777c3e5d6 · 2026-01-19T09:29:22.000+01:00
diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -76,14 +76,19 @@ public function getConstantStrings(): array
 
 	public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
+		$isArray = $type->isArray();
+		$isList = $type->isList();
+		$isListArray = $isArray->and($isList);
+
+		if ($isListArray->yes()) {
+			return AcceptsResult::createYes();
+		}
+
 		if ($type instanceof CompoundType) {
 			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
-		$isArray = $type->isArray();
-		$isList = $type->isList();
-
-		return new AcceptsResult($isArray->and($isList), []);
+		return new AcceptsResult($isListArray, []);
 	}
 
 	public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
diff --git a/src/Type/Accessory/AccessoryLiteralStringType.php b/src/Type/Accessory/AccessoryLiteralStringType.php
@@ -74,11 +74,17 @@ public function accepts(Type $type, bool $strictTypes): AcceptsResult
 		if ($type instanceof MixedType) {
 			return AcceptsResult::createNo();
 		}
+
+		$isLiteralString = $type->isLiteralString();
+		if ($isLiteralString->yes()) {
+			return AcceptsResult::createYes();
+		}
+
 		if ($type instanceof CompoundType) {
 			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
-		return new AcceptsResult($type->isLiteralString(), []);
+		return new AcceptsResult($isLiteralString, []);
 	}
 
 	public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
diff --git a/src/Type/Accessory/AccessoryLowercaseStringType.php b/src/Type/Accessory/AccessoryLowercaseStringType.php
@@ -71,11 +71,17 @@ public function getConstantStrings(): array
 
 	public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
+		$isLowercaseString = $type->isLowercaseString();
+
+		if ($isLowercaseString->yes()) {
+			return AcceptsResult::createYes();
+		}
+
 		if ($type instanceof CompoundType) {
 			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
-		return new AcceptsResult($type->isLowercaseString(), []);
+		return new AcceptsResult($isLowercaseString, []);
 	}
 
 	public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
diff --git a/src/Type/Accessory/AccessoryNonEmptyStringType.php b/src/Type/Accessory/AccessoryNonEmptyStringType.php
@@ -72,14 +72,17 @@ public function getConstantStrings(): array
 
 	public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
-		if ($type->isNonEmptyString()->yes()) {
+		$isNonEmptyString = $type->isNonEmptyString();
+
+		if ($isNonEmptyString->yes()) {
 			return AcceptsResult::createYes();
 		}
+
 		if ($type instanceof CompoundType) {
 			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
-		return new AcceptsResult($type->isNonEmptyString(), []);
+		return new AcceptsResult($isNonEmptyString, []);
 	}
 
 	public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
diff --git a/src/Type/Accessory/AccessoryNonFalsyStringType.php b/src/Type/Accessory/AccessoryNonFalsyStringType.php
@@ -74,11 +74,17 @@ public function getConstantStrings(): array
 
 	public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
+		$isNonFalsyString = $type->isNonFalsyString();
+
+		if ($isNonFalsyString->yes()) {
+			return AcceptsResult::createYes();
+		}
+
 		if ($type instanceof CompoundType) {
 			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
-		return new AcceptsResult($type->isNonFalsyString(), []);
+		return new AcceptsResult($isNonFalsyString, []);
 	}
 
 	public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
diff --git a/src/Type/Accessory/AccessoryNumericStringType.php b/src/Type/Accessory/AccessoryNumericStringType.php
@@ -71,11 +71,17 @@ public function getConstantStrings(): array
 
 	public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
+		$isNumericString = $type->isNumericString();
+
+		if ($isNumericString->yes()) {
+			return AcceptsResult::createYes();
+		}
+
 		if ($type instanceof CompoundType) {
 			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
-		return new AcceptsResult($type->isNumericString(), []);
+		return new AcceptsResult($isNumericString, []);
 	}
 
 	public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
diff --git a/src/Type/Accessory/AccessoryUppercaseStringType.php b/src/Type/Accessory/AccessoryUppercaseStringType.php
@@ -71,11 +71,17 @@ public function getConstantStrings(): array
 
 	public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
+		$isUppercaseString = $type->isUppercaseString();
+
+		if ($isUppercaseString->yes()) {
+			return AcceptsResult::createYes();
+		}
+
 		if ($type instanceof CompoundType) {
 			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
-		return new AcceptsResult($type->isUppercaseString(), []);
+		return new AcceptsResult($isUppercaseString, []);
 	}
 
 	public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -76,14 +76,19 @@ public function getConstantStrings(): array
 
 	public function accepts(Type $type, bool $strictTypes): AcceptsResult
 	{
+		$isArray = $type->isArray();
+		$isIterableAtLeastOnce = $type->isIterableAtLeastOnce();
+		$isNonEmptyArray = $isArray->and($isIterableAtLeastOnce);
+
+		if ($isNonEmptyArray->yes()) {
+			return AcceptsResult::createYes();
+		}
+
 		if ($type instanceof CompoundType) {
 			return $type->isAcceptedBy($this, $strictTypes);
 		}
 
-		$isArray = $type->isArray();
-		$isIterableAtLeastOnce = $type->isIterableAtLeastOnce();
-
-		return new AcceptsResult($isArray->and($isIterableAtLeastOnce), []);
+		return new AcceptsResult($isNonEmptyArray, []);
 	}
 
 	public function isSuperTypeOf(Type $type): IsSuperTypeOfResult
diff --git a/tests/PHPStan/Rules/Functions/ClosureReturnTypeRuleTest.php b/tests/PHPStan/Rules/Functions/ClosureReturnTypeRuleTest.php
@@ -133,4 +133,9 @@ public function testBugFunctionMethodConstants(): void
 		$this->analyse([__DIR__ . '/data/bug-anonymous-function-method-constant.php'], []);
 	}
 
+	public function testBug13964(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-13964.php'], []);
+	}
+
 }
diff --git a/tests/PHPStan/Rules/Functions/data/bug-13964.php b/tests/PHPStan/Rules/Functions/data/bug-13964.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Bug13964;
+
+/** @var array<string, array<mixed>> $state */
+$state = (fn()=>[])();
+
+$state = array_map(function (array $item): array {
+	if (array_key_exists('type', $item) && array_key_exists('data', $item)) {
+		return $item;
+	}
+
+	return [
+		'type' => 'hello',
+		'data' => [],
+	];
+}, $state);
diff --git a/tests/PHPStan/Type/IntersectionTypeTest.php b/tests/PHPStan/Type/IntersectionTypeTest.php
@@ -10,6 +10,8 @@
 use PHPStan\Type\Accessory\AccessoryArrayListType;
 use PHPStan\Type\Accessory\AccessoryLowercaseStringType;
 use PHPStan\Type\Accessory\AccessoryUppercaseStringType;
+use PHPStan\Type\Accessory\HasOffsetType;
+use PHPStan\Type\Accessory\HasOffsetValueType;
 use PHPStan\Type\Accessory\HasPropertyType;
 use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\Accessory\OversizedArrayType;
@@ -70,6 +72,30 @@ public static function dataAccepts(): Iterator
 			new CallableType(),
 			TrinaryLogic::createMaybe(),
 		];
+
+		yield [
+			TypeCombinator::intersect(
+				new ArrayType(new MixedType(), new MixedType()),
+				new NonEmptyArrayType(),
+			),
+			TypeCombinator::intersect(
+				new ArrayType(new MixedType(), new MixedType()),
+				new HasOffsetType(new ConstantStringType('some-key')),
+			),
+			TrinaryLogic::createYes(),
+		];
+
+		yield [
+			TypeCombinator::intersect(
+				new ArrayType(new MixedType(), new MixedType()),
+				new NonEmptyArrayType(),
+			),
+			TypeCombinator::intersect(
+				new ArrayType(new MixedType(), new MixedType()),
+				new HasOffsetValueType(new ConstantStringType('some-key'), new IntegerType()),
+			),
+			TrinaryLogic::createYes(),
+		];
 	}
 
 	#[DataProvider('dataAccepts')]

Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,17 @@ public function accepts(Type $type, bool $strictTypes): AcceptsResult`
`74`	`74`	`if ($type instanceof MixedType) {`
`75`	`75`	`return AcceptsResult::createNo();`
`76`	`76`	`}`
	`77`	`+`
	`78`	`+ $isLiteralString = $type->isLiteralString();`
	`79`	`+ if ($isLiteralString->yes()) {`
	`80`	`+ return AcceptsResult::createYes();`
	`81`	`+ }`
	`82`	`+`
`77`	`83`	`if ($type instanceof CompoundType) {`
`78`	`84`	`return $type->isAcceptedBy($this, $strictTypes);`
`79`	`85`	`}`
`80`	`86`
`81`		`- return new AcceptsResult($type->isLiteralString(), []);`
	`87`	`+ return new AcceptsResult($isLiteralString, []);`
`82`	`88`	`}`
`83`	`89`
`84`	`90`	`public function isSuperTypeOf(Type $type): IsSuperTypeOfResult`
Original file line number	Diff line number	Diff line change
`@@ -71,11 +71,17 @@ public function getConstantStrings(): array`
`71`	`71`
`72`	`72`	`public function accepts(Type $type, bool $strictTypes): AcceptsResult`
`73`	`73`	`{`
	`74`	`+ $isLowercaseString = $type->isLowercaseString();`
	`75`	`+`
	`76`	`+ if ($isLowercaseString->yes()) {`
	`77`	`+ return AcceptsResult::createYes();`
	`78`	`+ }`
	`79`	`+`
`74`	`80`	`if ($type instanceof CompoundType) {`
`75`	`81`	`return $type->isAcceptedBy($this, $strictTypes);`
`76`	`82`	`}`
`77`	`83`
`78`		`- return new AcceptsResult($type->isLowercaseString(), []);`
	`84`	`+ return new AcceptsResult($isLowercaseString, []);`
`79`	`85`	`}`
`80`	`86`
`81`	`87`	`public function isSuperTypeOf(Type $type): IsSuperTypeOfResult`
Original file line number	Diff line number	Diff line change
`@@ -72,14 +72,17 @@ public function getConstantStrings(): array`
`72`	`72`
`73`	`73`	`public function accepts(Type $type, bool $strictTypes): AcceptsResult`
`74`	`74`	`{`
`75`		`- if ($type->isNonEmptyString()->yes()) {`
	`75`	`+ $isNonEmptyString = $type->isNonEmptyString();`
	`76`	`+`
	`77`	`+ if ($isNonEmptyString->yes()) {`
`76`	`78`	`return AcceptsResult::createYes();`
`77`	`79`	`}`
	`80`	`+`
`78`	`81`	`if ($type instanceof CompoundType) {`
`79`	`82`	`return $type->isAcceptedBy($this, $strictTypes);`
`80`	`83`	`}`
`81`	`84`
`82`		`- return new AcceptsResult($type->isNonEmptyString(), []);`
	`85`	`+ return new AcceptsResult($isNonEmptyString, []);`
`83`	`86`	`}`
`84`	`87`
`85`	`88`	`public function isSuperTypeOf(Type $type): IsSuperTypeOfResult`
Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,17 @@ public function getConstantStrings(): array`
`74`	`74`
`75`	`75`	`public function accepts(Type $type, bool $strictTypes): AcceptsResult`
`76`	`76`	`{`
	`77`	`+ $isNonFalsyString = $type->isNonFalsyString();`
	`78`	`+`
	`79`	`+ if ($isNonFalsyString->yes()) {`
	`80`	`+ return AcceptsResult::createYes();`
	`81`	`+ }`
	`82`	`+`
`77`	`83`	`if ($type instanceof CompoundType) {`
`78`	`84`	`return $type->isAcceptedBy($this, $strictTypes);`
`79`	`85`	`}`
`80`	`86`
`81`		`- return new AcceptsResult($type->isNonFalsyString(), []);`
	`87`	`+ return new AcceptsResult($isNonFalsyString, []);`
`82`	`88`	`}`
`83`	`89`
`84`	`90`	`public function isSuperTypeOf(Type $type): IsSuperTypeOfResult`
Original file line number	Diff line number	Diff line change
`@@ -133,4 +133,9 @@ public function testBugFunctionMethodConstants(): void`
`133`	`133`	`$this->analyse([__DIR__ . '/data/bug-anonymous-function-method-constant.php'], []);`
`134`	`134`	`}`
`135`	`135`
	`136`	`+ public function testBug13964(): void`
	`137`	`+ {`
	`138`	`+ $this->analyse([__DIR__ . '/data/bug-13964.php'], []);`
	`139`	`+ }`
	`140`	`+`
`136`	`141`	`}`