refactor

staabm · staabm · commit d663d421f139 · 2024-10-29T13:50:41.000+01:00
diff --git a/src/Type/Accessory/AccessoryArrayListType.php b/src/Type/Accessory/AccessoryArrayListType.php
@@ -172,7 +172,7 @@ public function unsetOffset(Type $offsetType): Type
 		return new ErrorType();
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
 		return $this;
 	}
diff --git a/src/Type/Accessory/HasOffsetType.php b/src/Type/Accessory/HasOffsetType.php
@@ -338,7 +338,7 @@ public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType
 		return new BooleanType();
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
 		return new NonEmptyArrayType();
 	}
diff --git a/src/Type/Accessory/HasOffsetValueType.php b/src/Type/Accessory/HasOffsetValueType.php
@@ -195,7 +195,7 @@ public function unsetOffset(Type $offsetType): Type
 		return $this;
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
 		return new NonEmptyArrayType();
 	}
diff --git a/src/Type/Accessory/NonEmptyArrayType.php b/src/Type/Accessory/NonEmptyArrayType.php
@@ -158,7 +158,7 @@ public function unsetOffset(Type $offsetType): Type
 		return new ErrorType();
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
 		return $this;
 	}
diff --git a/src/Type/Accessory/OversizedArrayType.php b/src/Type/Accessory/OversizedArrayType.php
@@ -154,7 +154,7 @@ public function unsetOffset(Type $offsetType): Type
 		return new ErrorType();
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
 		return $this;
 	}
diff --git a/src/Type/ArrayType.php b/src/Type/ArrayType.php
@@ -165,7 +165,7 @@ public function generalizeValues(): self
 		return new self($this->keyType, $this->itemType->generalize(GeneralizePrecision::lessSpecific()));
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): 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
@@ -1245,9 +1245,21 @@ public function generalizeValues(): self
 		return new self($this->keyTypes, $valueTypes, $this->nextAutoIndexes, $this->optionalKeys, $this->isList);
 	}
 
-	public function getKeysArray(): self
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
-		return $this->getKeysOrValuesArray($this->keyTypes);
+		$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 $keysArray;
 	}
 
 	public function getValuesArray(): self
diff --git a/src/Type/IntersectionType.php b/src/Type/IntersectionType.php
@@ -781,9 +781,9 @@ public function unsetOffset(Type $offsetType): Type
 		return $this->intersectTypes(static fn (Type $type): Type => $type->unsetOffset($offsetType));
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
-		return $this->intersectTypes(static fn (Type $type): Type => $type->getKeysArray());
+		return $this->intersectTypes(static fn (Type $type): Type => $type->getKeysArray($filterValueType, $strict));
 	}
 
 	public function getValuesArray(): Type
diff --git a/src/Type/MixedType.php b/src/Type/MixedType.php
@@ -178,7 +178,7 @@ public function unsetOffset(Type $offsetType): Type
 		return $this;
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
 		if ($this->isArray()->no()) {
 			return new ErrorType();
diff --git a/src/Type/NeverType.php b/src/Type/NeverType.php
@@ -273,7 +273,7 @@ public function unsetOffset(Type $offsetType): Type
 		return new NeverType();
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
 		return new NeverType();
 	}
diff --git a/src/Type/Php/ArrayKeysFunctionDynamicReturnTypeExtension.php b/src/Type/Php/ArrayKeysFunctionDynamicReturnTypeExtension.php
@@ -6,14 +6,10 @@
 use PHPStan\Analyser\Scope;
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\FunctionReflection;
-use PHPStan\Type\Accessory\AccessoryArrayListType;
-use PHPStan\Type\ArrayType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
-use PHPStan\Type\GeneralizePrecision;
 use PHPStan\Type\NeverType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\Type;
-use PHPStan\Type\TypeCombinator;
 use function count;
 use function strtolower;
 
@@ -40,22 +36,15 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			return $this->phpVersion->arrayFunctionsReturnNullWithNonArray() ? new NullType() : new NeverType();
 		}
 
-		$keysArray = $arrayType->getKeysArray();
-		if (count($functionCall->getArgs()) === 1) {
-			return $keysArray;
+		$strict = false;
+		$filterType = null;
+		if (count($functionCall->getArgs()) >= 2) {
+			$filterType = $scope->getType($functionCall->getArgs()[1]->value);
 		}
-
-		$newArrayType = $keysArray;
-		if (!$keysArray->isConstantArray()->no()) {
-			$newArrayType = new ArrayType(
-				$keysArray->getIterableKeyType()->generalize(GeneralizePrecision::lessSpecific()),
-				$keysArray->getIterableValueType()->generalize(GeneralizePrecision::lessSpecific()),
-			);
-		}
-		if ($keysArray->isList()->yes()) {
-			$newArrayType = TypeCombinator::intersect($newArrayType, new AccessoryArrayListType());
+		if (count($functionCall->getArgs()) >= 3) {
+			$strict = $scope->getType($functionCall->getArgs()[2]->value)->isTrue()->yes();
 		}
-		return $newArrayType;
+		return $arrayType->getKeysArray($filterType, $strict);
 	}
 
 }
diff --git a/src/Type/StaticType.php b/src/Type/StaticType.php
@@ -396,9 +396,9 @@ public function unsetOffset(Type $offsetType): Type
 		return $this->getStaticObjectType()->unsetOffset($offsetType);
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
-		return $this->getStaticObjectType()->getKeysArray();
+		return $this->getStaticObjectType()->getKeysArray($filterValueType, $strict);
 	}
 
 	public function getValuesArray(): Type
diff --git a/src/Type/Traits/LateResolvableTypeTrait.php b/src/Type/Traits/LateResolvableTypeTrait.php
@@ -248,9 +248,9 @@ public function unsetOffset(Type $offsetType): Type
 		return $this->resolve()->unsetOffset($offsetType);
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
-		return $this->resolve()->getKeysArray();
+		return $this->resolve()->getKeysArray($filterValueType, $strict);
 	}
 
 	public function getValuesArray(): Type
diff --git a/src/Type/Traits/MaybeArrayTypeTrait.php b/src/Type/Traits/MaybeArrayTypeTrait.php
@@ -39,7 +39,7 @@ public function isList(): TrinaryLogic
 		return TrinaryLogic::createMaybe();
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
 		return new ErrorType();
 	}
diff --git a/src/Type/Traits/NonArrayTypeTrait.php b/src/Type/Traits/NonArrayTypeTrait.php
@@ -39,7 +39,7 @@ public function isList(): TrinaryLogic
 		return TrinaryLogic::createNo();
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
 		return new ErrorType();
 	}
diff --git a/src/Type/Type.php b/src/Type/Type.php
@@ -141,7 +141,7 @@ public function setExistingOffsetValueType(Type $offsetType, Type $valueType): T
 
 	public function unsetOffset(Type $offsetType): Type;
 
-	public function getKeysArray(): Type;
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type;
 
 	public function getValuesArray(): Type;
 
diff --git a/src/Type/UnionType.php b/src/Type/UnionType.php
@@ -683,9 +683,9 @@ public function unsetOffset(Type $offsetType): Type
 		return $this->unionTypes(static fn (Type $type): Type => $type->unsetOffset($offsetType));
 	}
 
-	public function getKeysArray(): Type
+	public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type
 	{
-		return $this->unionTypes(static fn (Type $type): Type => $type->getKeysArray());
+		return $this->unionTypes(static fn (Type $type): Type => $type->getKeysArray($filterValueType, $strict));
 	}
 
 	public function getValuesArray(): Type

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public function unsetOffset(Type $offsetType): Type`
`172`	`172`	`return new ErrorType();`
`173`	`173`	`}`
`174`	`174`
`175`		`- public function getKeysArray(): Type`
	`175`	`+ public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
`176`	`176`	`{`
`177`	`177`	`return $this;`
`178`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ public function looseCompare(Type $type, PhpVersion $phpVersion): BooleanType`
`338`	`338`	`return new BooleanType();`
`339`	`339`	`}`
`340`	`340`
`341`		`- public function getKeysArray(): Type`
	`341`	`+ public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
`342`	`342`	`{`
`343`	`343`	`return new NonEmptyArrayType();`
`344`	`344`	`}`
Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public function unsetOffset(Type $offsetType): Type`
`195`	`195`	`return $this;`
`196`	`196`	`}`
`197`	`197`
`198`		`- public function getKeysArray(): Type`
	`198`	`+ public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
`199`	`199`	`{`
`200`	`200`	`return new NonEmptyArrayType();`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public function unsetOffset(Type $offsetType): Type`
`158`	`158`	`return new ErrorType();`
`159`	`159`	`}`
`160`	`160`
`161`		`- public function getKeysArray(): Type`
	`161`	`+ public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
`162`	`162`	`{`
`163`	`163`	`return $this;`
`164`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public function unsetOffset(Type $offsetType): Type`
`154`	`154`	`return new ErrorType();`
`155`	`155`	`}`
`156`	`156`
`157`		`- public function getKeysArray(): Type`
	`157`	`+ public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
`158`	`158`	`{`
`159`	`159`	`return $this;`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ public function generalizeValues(): self`
`165`	`165`	`return new self($this->keyType, $this->itemType->generalize(GeneralizePrecision::lessSpecific()));`
`166`	`166`	`}`
`167`	`167`
`168`		`- public function getKeysArray(): Type`
	`168`	`+ public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
`169`	`169`	`{`
`170`	`170`	`return TypeCombinator::intersect(new self(new IntegerType(), $this->getIterableKeyType()), new AccessoryArrayListType());`
`171`	`171`	`}`
Original file line number	Diff line number	Diff line change
`@@ -781,9 +781,9 @@ public function unsetOffset(Type $offsetType): Type`
`781`	`781`	`return $this->intersectTypes(static fn (Type $type): Type => $type->unsetOffset($offsetType));`
`782`	`782`	`}`
`783`	`783`
`784`		`- public function getKeysArray(): Type`
	`784`	`+ public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
`785`	`785`	`{`
`786`		`- return $this->intersectTypes(static fn (Type $type): Type => $type->getKeysArray());`
	`786`	`+ return $this->intersectTypes(static fn (Type $type): Type => $type->getKeysArray($filterValueType, $strict));`
`787`	`787`	`}`
`788`	`788`
`789`	`789`	`public function getValuesArray(): Type`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ public function unsetOffset(Type $offsetType): Type`
`178`	`178`	`return $this;`
`179`	`179`	`}`
`180`	`180`
`181`		`- public function getKeysArray(): Type`
	`181`	`+ public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
`182`	`182`	`{`
`183`	`183`	`if ($this->isArray()->no()) {`
`184`	`184`	`return new ErrorType();`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ public function unsetOffset(Type $offsetType): Type`
`273`	`273`	`return new NeverType();`
`274`	`274`	`}`
`275`	`275`
`276`		`- public function getKeysArray(): Type`
	`276`	`+ public function getKeysArray(?Type $filterValueType = null, bool $strict = false): Type`
`277`	`277`	`{`
`278`	`278`	`return new NeverType();`
`279`	`279`	`}`