Skip to content

If an object implements \ArrayAccess, check both array value and property #1531

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

If an object implements \ArrayAccess, check both array value and property #1531

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
8 changes: 7 additions & 1 deletion src/Utils/Utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,16 @@ public static function suggestionList(string $input, array $options): array
*/
public static function extractKey($objectLikeValue, string $key)
{
if (\is_array($objectLikeValue) || $objectLikeValue instanceof \ArrayAccess) {
if (\is_array($objectLikeValue)) {
return $objectLikeValue[$key] ?? null;
}

if ($objectLikeValue instanceof \ArrayAccess) {
return $objectLikeValue[$key]
?? $objectLikeValue->{$key} // @phpstan-ignore-line Variable property access on ArrayAccess is fine here, we do the same for arbitrary objects
?? null;
}

if (\is_object($objectLikeValue)) {
return $objectLikeValue->{$key} ?? null;
}
Expand Down
5 changes: 5 additions & 0 deletions tests/Executor/ExecutorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,6 +1117,7 @@ public function testDefaultResolverGrabsValuesOffOfCommonPhpDataStructures(): vo
'name' => 'ArrayAccess',
'fields' => [
'set' => Type::int(),
'setProperty' => Type::int(),
'unsetNull' => Type::int(),
'unsetThrow' => Type::int(),
],
Expand Down Expand Up @@ -1151,6 +1152,8 @@ public function testDefaultResolverGrabsValuesOffOfCommonPhpDataStructures(): vo
'arrayAccess' => [
'type' => $ArrayAccess,
'resolve' => static fn (): \ArrayAccess => new class() implements \ArrayAccess {
public ?int $setProperty = 1;

/** @param mixed $offset */
#[\ReturnTypeWillChange]
public function offsetExists($offset): bool
Expand Down Expand Up @@ -1244,6 +1247,7 @@ public function __get(string $name): ?int
}
arrayAccess {
set
setProperty
unsetNull
unsetThrow
}
Expand Down Expand Up @@ -1271,6 +1275,7 @@ public function __get(string $name): ?int
],
'arrayAccess' => [
'set' => 1,
'setProperty' => 1,
'unsetNull' => null,
'unsetThrow' => null,
],
Expand Down