Skip to content

Deprecate ConstantArrayType::generalizeToArray() #1856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2022
Merged

Deprecate ConstantArrayType::generalizeToArray() #1856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion src/Type/Constant/ConstantArrayType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,23 @@ public function shiftArray(): Type

public function shuffleArray(): Type
{
return $this->getValuesArray()->generalizeToArray();
$valuesArray = $this->getValuesArray();

$isIterableAtLeastOnce = $valuesArray->isIterableAtLeastOnce();
if ($isIterableAtLeastOnce->no()) {
return $valuesArray;
}

$generalizedArray = new ArrayType($valuesArray->getKeyType(), $valuesArray->getItemType());

if ($isIterableAtLeastOnce->yes()) {
$generalizedArray = TypeCombinator::intersect($generalizedArray, new NonEmptyArrayType());
}
if ($valuesArray->isList) {
$generalizedArray = AccessoryArrayListType::intersectWith($generalizedArray);
}

return $generalizedArray;
}

public function isIterableAtLeastOnce(): TrinaryLogic
Expand Down Expand Up @@ -1091,6 +1107,7 @@ public function generalizeValues(): ArrayType
return new self($this->keyTypes, $valueTypes, $this->nextAutoIndexes, $this->optionalKeys, $this->isList);
}

/** @deprecated */
public function generalizeToArray(): Type
{
$isIterableAtLeastOnce = $this->isIterableAtLeastOnce();
Expand Down