Don't use instanceof

staabm · staabm · commit bf5ba33a7cdb · 2025-04-15T16:13:31.000+02:00
diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -111,7 +111,7 @@ public function isSubTypeOf(Type $otherType): IsSuperTypeOfResult
 
 	public function isAcceptedBy(Type $acceptingType, bool $strictTypes): AcceptsResult
 	{
-		if ($acceptingType instanceof NonEmptyArrayType) {
+		if ($acceptingType->isArray()->yes() && $acceptingType->isIterableAtLeastOnce()->yes()) {
 			return AcceptsResult::createYes();
 		}
 		return $this->isSubTypeOf($acceptingType)->toAcceptsResult();
diff --git a/src/Type/Accessory/HasOffsetValueType.php b/src/Type/Accessory/HasOffsetValueType.php
@@ -122,7 +122,7 @@ public function isSubTypeOf(Type $otherType): IsSuperTypeOfResult
 
 	public function isAcceptedBy(Type $acceptingType, bool $strictTypes): AcceptsResult
 	{
-		if ($acceptingType instanceof NonEmptyArrayType) {
+		if ($acceptingType->isArray()->yes() && $acceptingType->isIterableAtLeastOnce()->yes()) {
 			return AcceptsResult::createYes();
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ public function isSubTypeOf(Type $otherType): IsSuperTypeOfResult`
`111`	`111`
`112`	`112`	`public function isAcceptedBy(Type $acceptingType, bool $strictTypes): AcceptsResult`
`113`	`113`	`{`
`114`		`- if ($acceptingType instanceof NonEmptyArrayType) {`
	`114`	`+ if ($acceptingType->isArray()->yes() && $acceptingType->isIterableAtLeastOnce()->yes()) {`
`115`	`115`	`return AcceptsResult::createYes();`
`116`	`116`	`}`
`117`	`117`	`return $this->isSubTypeOf($acceptingType)->toAcceptsResult();`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public function isSubTypeOf(Type $otherType): IsSuperTypeOfResult`
`122`	`122`
`123`	`123`	`public function isAcceptedBy(Type $acceptingType, bool $strictTypes): AcceptsResult`
`124`	`124`	`{`
`125`		`- if ($acceptingType instanceof NonEmptyArrayType) {`
	`125`	`+ if ($acceptingType->isArray()->yes() && $acceptingType->isIterableAtLeastOnce()->yes()) {`
`126`	`126`	`return AcceptsResult::createYes();`
`127`	`127`	`}`
`128`	`128`