Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 2 deletions src/Optimizer/FuncCallOptimizer.php
Original file line number Diff line number Diff line change
Expand Up @@ -766,11 +766,15 @@ protected function genGetParentClass(string $n, Node\Expr\FuncCall $e, array $c)
return 'php::fn::get_parent_class(' . $this->parseIdentifier($arg) . ')';
}

protected function genArrayKeys(string $n, Node\Expr\FuncCall $e, array $c): string
protected function genArrayKeys(string $n, Node\Expr\FuncCall $e, array $c): string|false
{
$cnt = count($e->args);
if ($cnt >= 3) {
return 'php::fn::array_keys_filter(' . $this->getArg($e, 0) . ', ' . $this->getArg($e, 1) . ', ' . $this->getArg($e, 2) . ')';
if ($this->detectTypeOfExpr($e->args[2]->value) !== Type::BOOL) {
return false;
}
return 'php::fn::array_keys_filter(' . $this->getArg($e, 0) . ', ' . $this->getArg($e, 1) . ', '
. $this->resolveArg($e, 2, self::ARG_TYPE_BOOL) . ')';
}
if ($cnt >= 2) {
return 'php::fn::array_keys_filter(' . $this->getArg($e, 0) . ', ' . $this->getArg($e, 1) . ', false)';
Expand Down
139 changes: 139 additions & 0 deletions tests/compiler/stdlib/array-keys-dynamic-arguments.phpt
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
--TEST--
array_keys optimized calls preserve dynamic arguments, strict types, and evaluation order
--FILE--
<?php
declare(strict_types=1);

final class ArrayKeysOptions
{
public bool $strict = true;
}

function arrayKeysDynamicStrict(array &$events): bool
{
$events[] = 'strict';
return true;
}

function arrayKeysDynamicValues(array &$events): array
{
$events[] = 'array';
return ['integer' => 1, 'string' => '1'];
}

function arrayKeysDynamicFilter(array &$events): mixed
{
$events[] = 'filter';
return '1';
}

function arrayKeysMixedBool(): mixed
{
return true;
}

function arrayKeysMixedInt(): mixed
{
return 1;
}

function arrayKeysMixedArray(): mixed
{
return [];
}

function arrayKeysUnionInt(): bool|int
{
return 1;
}

function main()
{
$values = ['integer' => 1, 'string' => '1'];

var_dump(array_keys($values));
var_dump(array_keys($values, '1'));
var_dump(array_keys($values, '1', true));

$strict = true;
var_dump(array_keys($values, '1', $strict));

$options = new ArrayKeysOptions();
var_dump(array_keys($values, '1', $options->strict));

$events = [];
var_dump(array_keys(
arrayKeysDynamicValues($events),
arrayKeysDynamicFilter($events),
arrayKeysDynamicStrict($events)
));
var_dump($events);

var_dump(array_keys($values, '1', arrayKeysMixedBool()));

try {
array_keys($values, '1', arrayKeysMixedInt());
echo "mixed-int=missing TypeError\n";
} catch (TypeError $error) {
echo "mixed-int=TypeError\n";
}

try {
array_keys($values, '1', arrayKeysMixedArray());
echo "mixed-array=missing TypeError\n";
} catch (TypeError $error) {
echo "mixed-array=TypeError\n";
}

try {
array_keys($values, '1', arrayKeysUnionInt());
echo "union-int=missing TypeError\n";
} catch (TypeError $error) {
echo "union-int=TypeError\n";
}
}
?>
--EXPECT--
array(2) {
[0]=>
string(7) "integer"
[1]=>
string(6) "string"
}
array(2) {
[0]=>
string(7) "integer"
[1]=>
string(6) "string"
}
array(1) {
[0]=>
string(6) "string"
}
array(1) {
[0]=>
string(6) "string"
}
array(1) {
[0]=>
string(6) "string"
}
array(1) {
[0]=>
string(6) "string"
}
array(3) {
[0]=>
string(5) "array"
[1]=>
string(6) "filter"
[2]=>
string(6) "strict"
}
array(1) {
[0]=>
string(6) "string"
}
mixed-int=TypeError
mixed-array=TypeError
union-int=TypeError
Loading