Skip to content

Use TypeUtils::getOldConstantArrays in array_column extension #1683

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
Sep 1, 2022
Merged

Use TypeUtils::getOldConstantArrays in array_column extension #1683

Show file tree
Hide file tree
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
6 changes: 3 additions & 3 deletions src/Type/Php/ArrayColumnFunctionReturnTypeExtension.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
$columnType = $scope->getType($functionCall->getArgs()[1]->value);
$indexType = $numArgs >= 3 ? $scope->getType($functionCall->getArgs()[2]->value) : null;

$constantArrayTypes = TypeUtils::getConstantArrays($arrayType);
$constantArrayTypes = TypeUtils::getOldConstantArrays($arrayType);
if (count($constantArrayTypes) === 1) {
$type = $this->handleConstantArray($constantArrayTypes[0], $columnType, $indexType, $scope);
if ($type !== null) {
Expand Down Expand Up @@ -108,7 +108,7 @@ private function handleConstantArray(ConstantArrayType $arrayType, Type $columnT
{
$builder = ConstantArrayTypeBuilder::createEmpty();

foreach ($arrayType->getValueTypes() as $iterableValueType) {
foreach ($arrayType->getValueTypes() as $i => $iterableValueType) {
$valueType = $this->getOffsetOrProperty($iterableValueType, $columnType, $scope, false);
if ($valueType === null) {
return null;
Expand All @@ -133,7 +133,7 @@ private function handleConstantArray(ConstantArrayType $arrayType, Type $columnT
if ($keyType !== null) {
$keyType = $this->castToArrayKeyType($keyType);
}
$builder->setOffsetValueType($keyType, $valueType);
$builder->setOffsetValueType($keyType, $valueType, $arrayType->isOptionalKey($i));
}

return $builder->getArray();
Expand Down
14 changes: 7 additions & 7 deletions tests/PHPStan/Analyser/data/array-column-php82.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,13 @@ public function testConstantArray11(array $array): void
assertType('array<\'\', string>', array_column($array, 'column', 'key'));
}

/** @param array{0?: array{column: 'foo', key: 'bar'}} $array */
public function testConstantArray12(array $array): void
{
assertType("array{0?: 'foo'}", array_column($array, 'column'));
assertType("array{bar?: 'foo'}", array_column($array, 'column', 'key'));
}

// These cases aren't handled precisely and will return non-constant arrays.

/** @param array{array{column?: 'foo', key: 'bar'}} $array */
Expand All @@ -162,13 +169,6 @@ public function testImprecise3(array $array): void
assertType('array<int|string, string>', array_column($array, 'column', 'key'));
}

/** @param array{0?: array{column: 'foo', key: 'bar'}} $array */
public function testImprecise4(array $array): void
{
assertType("array<int, 'foo'>", array_column($array, 'column'));
assertType("array<'bar', 'foo'>", array_column($array, 'column', 'key'));
}

/** @param array<int, DOMElement> $array */
public function testImprecise5(array $array): void
{
Expand Down
28 changes: 21 additions & 7 deletions tests/PHPStan/Analyser/data/array-column.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,27 @@ public function testConstantArray11(array $array): void
assertType('array<\'\', string>', array_column($array, 'column', 'key'));
}

/** @param array{0?: array{column: 'foo', key: 'bar'}} $array */
public function testConstantArray12(array $array): void
{
assertType("array{0?: 'foo'}", array_column($array, 'column'));
assertType("array{bar?: 'foo'}", array_column($array, 'column', 'key'));
}

/** @param array{0?: array{column: 'foo1', key: 'bar1'}, 1?: array{column: 'foo2', key: 'bar2'}} $array */
public function testConstantArray13(array $array): void
{
assertType("array{0?: 'foo1'|'foo2', 1?: 'foo2'}", array_column($array, 'column'));
assertType("array{bar1?: 'foo1', bar2?: 'foo2'}", array_column($array, 'column', 'key'));
}

/** @param array{0?: array{column: 'foo1', key: 'bar1'}, 1: array{column: 'foo2', key: 'bar2'}} $array */
public function testConstantArray14(array $array): void
{
assertType("array{0: 'foo1'|'foo2', 1?: 'foo2'}", array_column($array, 'column'));
assertType("array{bar1?: 'foo1', bar2: 'foo2'}", array_column($array, 'column', 'key'));
}

// These cases aren't handled precisely and will return non-constant arrays.

/** @param array{array{column?: 'foo', key: 'bar'}} $array */
Expand All @@ -162,13 +183,6 @@ public function testImprecise3(array $array): void
assertType('array<int|string, string>', array_column($array, 'column', 'key'));
}

/** @param array{0?: array{column: 'foo', key: 'bar'}} $array */
public function testImprecise4(array $array): void
{
assertType("array<int, 'foo'>", array_column($array, 'column'));
assertType("array<'bar', 'foo'>", array_column($array, 'column', 'key'));
}

/** @param array<int, DOMElement> $array */
public function testImprecise5(array $array): void
{
Expand Down