add separate Type method

staabm · staabm · commit 05c0c60a87ab · 2025-01-19T16:14:39.000+01:00
diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -172,7 +172,12 @@ public function unsetOffset(Type $offsetType): Type
 		return new ErrorType();
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	{
+		return $this->getKeysArray();
+	}
+
+	public function getKeysArray(): Type
 	{
 		return $this;
 	}
diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -343,7 +343,12 @@ public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 		return new BooleanType();
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	{
+		return $this->getKeysArray();
+	}
+
+	public function getKeysArray(): Type
 	{
 		return new NonEmptyArrayType();
 	}
diff --git a/src/Type/Accessory/HasOffsetValueType.php b/src/Type/Accessory/HasOffsetValueType.php
@@ -195,7 +195,12 @@ public function unsetOffset(Type $offsetType): Type
 		return $this;
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	{
+		return $this->getKeysArray();
+	}
+
+	public function getKeysArray(): Type
 	{
 		return new NonEmptyArrayType();
 	}
diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -159,7 +159,12 @@ public function unsetOffset(Type $offsetType): Type
 		return new ErrorType();
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	{
+		return $this->getKeysArray();
+	}
+
+	public function getKeysArray(): Type
 	{
 		return $this;
 	}
diff --git a/src/Type/Accessory/OversizedArrayType.php b/src/Type/Accessory/OversizedArrayType.php
@@ -154,7 +154,12 @@ public function unsetOffset(Type $offsetType): Type
 		return new ErrorType();
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	{
+		return $this->getKeysArray();
+	}
+
+	public function getKeysArray(): Type
 	{
 		return $this;
 	}
diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -170,7 +170,12 @@ public function generalizeValues(): self
 		return new self($this->keyType, $this->itemType->generalize(GeneralizePrecision::lessSpecific()));
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	{
+		return $this->getKeysArray();
+	}
+
+	public function getKeysArray(): Type
 	{
 		return TypeCombinator::intersect(new self(new IntegerType(), $this->getIterableKeyType()), new AccessoryArrayListType());
 	}
diff --git a/src/Type/Constant/ConstantArrayType.php b/src/Type/Constant/ConstantArrayType.php
@@ -1250,21 +1250,22 @@ public function generalizeValues(): self
 		return new self($this->keyTypes, $valueTypes, $this->nextAutoIndexes, $this->optionalKeys, $this->isList);
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
 	{
 		$keysArray = $this->getKeysOrValuesArray($this->keyTypes);
 
-		if ($filterValueType !== null) {
-			return TypeCombinator::intersect(
-				new ArrayType(
-					$keysArray->getIterableKeyType()->generalize(GeneralizePrecision::lessSpecific()),
-					$keysArray->getIterableValueType()->generalize(GeneralizePrecision::lessSpecific()),
-				),
-				new AccessoryArrayListType(),
-			);
-		}
+		return TypeCombinator::intersect(
+			new ArrayType(
+				$keysArray->getIterableKeyType()->generalize(GeneralizePrecision::lessSpecific()),
+				$keysArray->getIterableValueType()->generalize(GeneralizePrecision::lessSpecific()),
+			),
+			new AccessoryArrayListType(),
+		);
+	}
 
-		return $keysArray;
+	public function getKeysArray(): self
+	{
+		return $this->getKeysOrValuesArray($this->keyTypes);
 	}
 
 	public function getValuesArray(): self
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -799,9 +799,14 @@ public function unsetOffset(Type $offsetType): Type
 		return $this->intersectTypes(static fn (Type $type): Type => $type->unsetOffset($offsetType));
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
 	{
-		return $this->intersectTypes(static fn (Type $type): Type => $type->getKeysArray($filterValueType, $strict));
+		return $this->intersectTypes(static fn (Type $type): Type => $type->getKeysArrayFiltered($filterValueType, $strict));
+	}
+
+	public function getKeysArray(): Type
+	{
+		return $this->intersectTypes(static fn (Type $type): Type => $type->getKeysArray());
 	}
 
 	public function getValuesArray(): Type
diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -179,7 +179,12 @@ public function unsetOffset(Type $offsetType): Type
 		return $this;
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	{
+		return $this->getKeysArray();
+	}
+
+	public function getKeysArray(): Type
 	{
 		if ($this->isArray()->no()) {
 			return new ErrorType();
diff --git a/src/Type/NeverType.php b/src/Type/NeverType.php
@@ -273,7 +273,12 @@ public function unsetOffset(Type $offsetType): Type
 		return new NeverType();
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	{
+		return $this->getKeysArray();
+	}
+
+	public function getKeysArray(): Type
 	{
 		return new NeverType();
 	}
diff --git a/src/Type/Php/ArrayKeysFunctionDynamicReturnTypeExtension.php b/src/Type/Php/ArrayKeysFunctionDynamicReturnTypeExtension.php
@@ -36,15 +36,18 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			return $this->phpVersion->arrayFunctionsReturnNullWithNonArray() ? new NullType() : new NeverType();
 		}
 
-		$strict = false;
-		$filterType = null;
 		if (count($functionCall->getArgs()) >= 2) {
 			$filterType = $scope->getType($functionCall->getArgs()[1]->value);
+
+			$strict = false;
+			if (count($functionCall->getArgs()) >= 3) {
+				$strict = $scope->getType($functionCall->getArgs()[2]->value)->isTrue()->yes();
+			}
+
+			return $arrayType->getKeysArrayFiltered($filterType, $strict);
 		}
-		if (count($functionCall->getArgs()) >= 3) {
-			$strict = $scope->getType($functionCall->getArgs()[2]->value)->isTrue()->yes();
-		}
-		return $arrayType->getKeysArray($filterType, $strict);
+
+		return $arrayType->getKeysArray();
 	}
 
 }
diff --git a/src/Type/StaticType.php b/src/Type/StaticType.php
@@ -396,9 +396,14 @@ public function unsetOffset(Type $offsetType): Type
 		return $this->getStaticObjectType()->unsetOffset($offsetType);
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
 	{
-		return $this->getStaticObjectType()->getKeysArray($filterValueType, $strict);
+		return $this->getStaticObjectType()->getKeysArrayFiltered($filterValueType, $strict);
+	}
+
+	public function getKeysArray(): Type
+	{
+		return $this->getStaticObjectType()->getKeysArray();
 	}
 
 	public function getValuesArray(): Type
diff --git a/src/Type/Traits/LateResolvableTypeTrait.php b/src/Type/Traits/LateResolvableTypeTrait.php
@@ -248,9 +248,14 @@ public function unsetOffset(Type $offsetType): Type
 		return $this->resolve()->unsetOffset($offsetType);
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
 	{
-		return $this->resolve()->getKeysArray($filterValueType, $strict);
+		return $this->resolve()->getKeysArrayFiltered($filterValueType, $strict);
+	}
+
+	public function getKeysArray(): Type
+	{
+		return $this->resolve()->getKeysArray();
 	}
 
 	public function getValuesArray(): Type
diff --git a/src/Type/Traits/MaybeArrayTypeTrait.php b/src/Type/Traits/MaybeArrayTypeTrait.php
@@ -39,7 +39,12 @@ public function isList(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	{
+		return $this->getKeysArray();
+	}
+
+	public function getKeysArray(): Type
 	{
 		return new ErrorType();
 	}
diff --git a/src/Type/Traits/NonArrayTypeTrait.php b/src/Type/Traits/NonArrayTypeTrait.php
@@ -39,7 +39,12 @@ public function isList(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
+	{
+		return $this->getKeysArray();
+	}
+
+	public function getKeysArray(): Type
 	{
 		return new ErrorType();
 	}
diff --git a/src/Type/Type.php b/src/Type/Type.php
@@ -134,7 +134,9 @@ public function setExistingOffsetValueType(Type $offsetType, Type $valueType): T
 
 	public function unsetOffset(Type $offsetType): Type;
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type;
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type;
+
+	public function getKeysArray(): Type;
 
 	public function getValuesArray(): Type;
 
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -730,9 +730,14 @@ public function unsetOffset(Type $offsetType): Type
 		return $this->unionTypes(static fn (Type $type): Type => $type->unsetOffset($offsetType));
 	}
 
-	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
+	public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type
 	{
-		return $this->unionTypes(static fn (Type $type): Type => $type->getKeysArray($filterValueType, $strict));
+		return $this->unionTypes(static fn (Type $type): Type => $type->getKeysArrayFiltered($filterValueType, $strict));
+	}
+
+	public function getKeysArray(): Type
+	{
+		return $this->unionTypes(static fn (Type $type): Type => $type->getKeysArray());
 	}
 
 	public function getValuesArray(): Type

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,12 @@ public function unsetOffset(Type $offsetType): Type`
`172`	`172`	`return new ErrorType();`
`173`	`173`	`}`
`174`	`174`
`175`		`- public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
	`175`	`+ public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type`
	`176`	`+ {`
	`177`	`+ return $this->getKeysArray();`
	`178`	`+ }`
	`179`	`+`
	`180`	`+ public function getKeysArray(): Type`
`176`	`181`	`{`
`177`	`182`	`return $this;`
`178`	`183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -343,7 +343,12 @@ public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType`
`343`	`343`	`return new BooleanType();`
`344`	`344`	`}`
`345`	`345`
`346`		`- public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
	`346`	`+ public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type`
	`347`	`+ {`
	`348`	`+ return $this->getKeysArray();`
	`349`	`+ }`
	`350`	`+`
	`351`	`+ public function getKeysArray(): Type`
`347`	`352`	`{`
`348`	`353`	`return new NonEmptyArrayType();`
`349`	`354`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,12 @@ public function unsetOffset(Type $offsetType): Type`
`195`	`195`	`return $this;`
`196`	`196`	`}`
`197`	`197`
`198`		`- public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
	`198`	`+ public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type`
	`199`	`+ {`
	`200`	`+ return $this->getKeysArray();`
	`201`	`+ }`
	`202`	`+`
	`203`	`+ public function getKeysArray(): Type`
`199`	`204`	`{`
`200`	`205`	`return new NonEmptyArrayType();`
`201`	`206`	`}`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,12 @@ public function unsetOffset(Type $offsetType): Type`
`159`	`159`	`return new ErrorType();`
`160`	`160`	`}`
`161`	`161`
`162`		`- public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
	`162`	`+ public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type`
	`163`	`+ {`
	`164`	`+ return $this->getKeysArray();`
	`165`	`+ }`
	`166`	`+`
	`167`	`+ public function getKeysArray(): Type`
`163`	`168`	`{`
`164`	`169`	`return $this;`
`165`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,12 @@ public function unsetOffset(Type $offsetType): Type`
`154`	`154`	`return new ErrorType();`
`155`	`155`	`}`
`156`	`156`
`157`		`- public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
	`157`	`+ public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type`
	`158`	`+ {`
	`159`	`+ return $this->getKeysArray();`
	`160`	`+ }`
	`161`	`+`
	`162`	`+ public function getKeysArray(): Type`
`158`	`163`	`{`
`159`	`164`	`return $this;`
`160`	`165`	`}`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,12 @@ public function generalizeValues(): self`
`170`	`170`	`return new self($this->keyType, $this->itemType->generalize(GeneralizePrecision::lessSpecific()));`
`171`	`171`	`}`
`172`	`172`
`173`		`- public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
	`173`	`+ public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type`
	`174`	`+ {`
	`175`	`+ return $this->getKeysArray();`
	`176`	`+ }`
	`177`	`+`
	`178`	`+ public function getKeysArray(): Type`
`174`	`179`	`{`
`175`	`180`	`return TypeCombinator::intersect(new self(new IntegerType(), $this->getIterableKeyType()), new AccessoryArrayListType());`
`176`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -799,9 +799,14 @@ public function unsetOffset(Type $offsetType): Type`
`799`	`799`	`return $this->intersectTypes(static fn (Type $type): Type => $type->unsetOffset($offsetType));`
`800`	`800`	`}`
`801`	`801`
`802`		`- public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
	`802`	`+ public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type`
`803`	`803`	`{`
`804`		`- return $this->intersectTypes(static fn (Type $type): Type => $type->getKeysArray($filterValueType, $strict));`
	`804`	`+ return $this->intersectTypes(static fn (Type $type): Type => $type->getKeysArrayFiltered($filterValueType, $strict));`
	`805`	`+ }`
	`806`	`+`
	`807`	`+ public function getKeysArray(): Type`
	`808`	`+ {`
	`809`	`+ return $this->intersectTypes(static fn (Type $type): Type => $type->getKeysArray());`
`805`	`810`	`}`
`806`	`811`
`807`	`812`	`public function getValuesArray(): Type`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,12 @@ public function unsetOffset(Type $offsetType): Type`
`179`	`179`	`return $this;`
`180`	`180`	`}`
`181`	`181`
`182`		`- public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
	`182`	`+ public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type`
	`183`	`+ {`
	`184`	`+ return $this->getKeysArray();`
	`185`	`+ }`
	`186`	`+`
	`187`	`+ public function getKeysArray(): Type`
`183`	`188`	`{`
`184`	`189`	`if ($this->isArray()->no()) {`
`185`	`190`	`return new ErrorType();`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,12 @@ public function unsetOffset(Type $offsetType): Type`
`273`	`273`	`return new NeverType();`
`274`	`274`	`}`
`275`	`275`
`276`		`- public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
	`276`	`+ public function getKeysArrayFiltered(Type $filterValueType, bool $strict): Type`
	`277`	`+ {`
	`278`	`+ return $this->getKeysArray();`
	`279`	`+ }`
	`280`	`+`
	`281`	`+ public function getKeysArray(): Type`
`277`	`282`	`{`
`278`	`283`	`return new NeverType();`
`279`	`284`	`}`