Skip to content

Make constant array degradation to general array more DRY #3953

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

Closed
wants to merge 1 commit into from
Closed

Make constant array degradation to general array more DRY #3953

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
18 changes: 10 additions & 8 deletions src/Type/Constant/ConstantArrayType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,10 +913,7 @@ public function shiftArray(): Type

public function shuffleArray(): Type
{
$builder = ConstantArrayTypeBuilder::createFromConstantArray($this->getValuesArray());
$builder->degradeToGeneralArray();

return $builder->getArray();
return $this->getValuesArray()->degradeToGeneralArray();
}

public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
Expand All @@ -937,10 +934,7 @@ public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $pre
}

if ($offset === null || $length === null) {
$builder = ConstantArrayTypeBuilder::createFromConstantArray($this);
$builder->degradeToGeneralArray();

return $builder->getArray()
return $this->degradeToGeneralArray()
->sliceArray($offsetType, $lengthType, $preserveKeys);
}

Expand Down Expand Up @@ -1252,6 +1246,14 @@ public function generalizeValues(): self
return new self($this->keyTypes, $valueTypes, $this->nextAutoIndexes, $this->optionalKeys, $this->isList);
}

private function degradeToGeneralArray(): Type
{
$builder = ConstantArrayTypeBuilder::createFromConstantArray($this);
$builder->degradeToGeneralArray();

return $builder->getArray();
}

public function getKeysArray(): self
{
return $this->getKeysOrValuesArray($this->keyTypes);
Expand Down
Loading