Skip to content

Commit 4a29d16

Browse files
alexandre-dauboisalexandre-daubois
committed
Add func_get_named_args() 
1 parent bdffded commit 4a29d16

19 files changed

+1174
-580
lines changed

‎NEWS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ PHP NEWS
7272
(nielsdos)
7373
. Optimized PHP html_entity_decode function. (Artem Ukrainskiy)
7474
. Minor optimization to array_chunk(). (nielsdos)
75+
. Added func_get_named_args() function. (alexandre-daubois)
7576

7677
- URI:
7778
. Empty host handling is fixed. (Máté Kocsis)

‎UPGRADING‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,7 @@ PHP 8.5 UPGRADE NOTES
506506
- Standard:
507507
. Added array_first() and array_last().
508508
RFC: https://wiki.php.net/rfc/array_first_last
509+
. Added func_get_named_args() function.
509510

510511
========================================
511512
7. New Classes and Interfaces

‎Zend/Optimizer/dce.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ static inline bool may_have_side_effects(
123123
case ZEND_IN_ARRAY:
124124
case ZEND_FUNC_NUM_ARGS:
125125
case ZEND_FUNC_GET_ARGS:
126+
case ZEND_FUNC_GET_NAMED_ARGS:
126127
case ZEND_ARRAY_KEY_EXISTS:
127128
/* No side effects */
128129
return 0;

‎Zend/Optimizer/zend_cfg.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ ZEND_API void zend_build_cfg(zend_arena **arena, const zend_op_array *op_array,
421421
}
422422
break;
423423
case ZEND_FUNC_GET_ARGS:
424+
case ZEND_FUNC_GET_NAMED_ARGS:
424425
flags |= ZEND_FUNC_VARARG;
425426
break;
426427
case ZEND_EXT_STMT:

‎Zend/Optimizer/zend_func_infos.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ static const func_info_t func_infos[] = {
44
F1("clone", MAY_BE_OBJECT),
55
F1("zend_version", MAY_BE_STRING),
66
FN("func_get_args", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_ANY),
7+
FN("func_get_named_args", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY),
78
F1("get_class_vars", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_STRING|MAY_BE_ARRAY_OF_ANY|MAY_BE_ARRAY_OF_REF),
89
F1("get_class_methods", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING),
910
F1("get_included_files", MAY_BE_ARRAY|MAY_BE_ARRAY_KEY_LONG|MAY_BE_ARRAY_OF_STRING),

‎Zend/Optimizer/zend_inference.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3926,6 +3926,7 @@ static zend_always_inline zend_result _zend_update_type_info(
39263926
UPDATE_SSA_TYPE(MAY_BE_LONG, ssa_op->result_def);
39273927
break;
39283928
case ZEND_FUNC_GET_ARGS:
3929+
case ZEND_FUNC_GET_NAMED_ARGS:
39293930
UPDATE_SSA_TYPE(MAY_BE_RC1|MAY_BE_RCN|MAY_BE_ARRAY|MAY_BE_ARRAY_EMPTY|MAY_BE_ARRAY_PACKED|MAY_BE_ARRAY_OF_ANY, ssa_op->result_def);
39303931
break;
39313932
case ZEND_GET_CLASS:
@@ -5025,6 +5026,7 @@ ZEND_API bool zend_may_throw_ex(const zend_op *opline, const zend_ssa_op *ssa_op
50255026
case ZEND_ISSET_ISEMPTY_CV:
50265027
case ZEND_FUNC_NUM_ARGS:
50275028
case ZEND_FUNC_GET_ARGS:
5029+
case ZEND_FUNC_GET_NAMED_ARGS:
50285030
case ZEND_COPY_TMP:
50295031
case ZEND_JMP_NULL:
50305032
case ZEND_JMP_FRAMELESS:

‎Zend/Optimizer/zend_optimizer.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,6 +1024,8 @@ uint32_t zend_optimizer_classify_function(zend_string *name, uint32_t num_args)
10241024
return ZEND_FUNC_VARARG;
10251025
} else if (zend_string_equals_literal(name, "func_get_args")) {
10261026
return ZEND_FUNC_VARARG;
1027+
} else if (zend_string_equals_literal(name, "func_get_named_args")) {
1028+
return ZEND_FUNC_VARARG;
10271029
} else {
10281030
return 0;
10291031
}

‎Zend/tests/func_get_named_args.phpt‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
--TEST--
2+
Testing func_get_named_args()
3+
--FILE--
4+
<?php
5+
6+
function test($a, $b = 'default_b', $c = 'default_c') {
7+
return func_get_named_args();
8+
}
9+
10+
var_dump(test('A', 'B', 'C'));
11+
var_dump(test(c: 'C', a: 'A'));
12+
var_dump(test('A', c: 'C'));
13+
14+
function variadic_test($a, $b, ...$rest) {
15+
return func_get_named_args();
16+
}
17+
18+
var_dump(variadic_test('A', 'B', 'C', 'D'));
19+
20+
function no_args() {
21+
return func_get_named_args();
22+
}
23+
24+
var_dump(no_args());
25+
26+
try {
27+
func_get_named_args();
28+
} catch (Error $e) {
29+
echo "Error: " . $e->getMessage() . "\n";
30+
}
31+
32+
function by_ref($a, &$b) {
33+
return func_get_named_args();
34+
}
35+
36+
var_dump(by_ref('A', $b));
37+
38+
?>
39+
--EXPECT--
40+
array(3) {
41+
["a"]=>
42+
string(1) "A"
43+
["b"]=>
44+
string(1) "B"
45+
["c"]=>
46+
string(1) "C"
47+
}
48+
array(3) {
49+
["a"]=>
50+
string(1) "A"
51+
["b"]=>
52+
string(9) "default_b"
53+
["c"]=>
54+
string(1) "C"
55+
}
56+
array(3) {
57+
["a"]=>
58+
string(1) "A"
59+
["b"]=>
60+
string(9) "default_b"
61+
["c"]=>
62+
string(1) "C"
63+
}
64+
array(4) {
65+
["a"]=>
66+
string(1) "A"
67+
["b"]=>
68+
string(1) "B"
69+
[2]=>
70+
string(1) "C"
71+
[3]=>
72+
string(1) "D"
73+
}
74+
array(0) {
75+
}
76+
Error: func_get_named_args() cannot be called from the global scope
77+
array(2) {
78+
["a"]=>
79+
string(1) "A"
80+
["b"]=>
81+
NULL
82+
}

‎Zend/tests/func_get_named_args_closures.phpt‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
--TEST--
2+
Testing func_get_named_args() with anonymous functions and closures
3+
--FILE--
4+
<?php
5+
6+
$anonymousFunc = function($a, $b = 'default_b', $c = 'default_c') {
7+
return func_get_named_args();
8+
};
9+
10+
var_dump($anonymousFunc('A', 'B', 'C'));
11+
var_dump($anonymousFunc(c: 'C', a: 'A'));
12+
var_dump($anonymousFunc('A', c: 'C'));
13+
14+
$capturedVar = 'captured';
15+
$closure = function($x, $y = 'default_y') use ($capturedVar) {
16+
return func_get_named_args();
17+
};
18+
19+
var_dump($closure('X', 'Y'));
20+
var_dump($closure(y: 'Y', x: 'X'));
21+
22+
$variadicFunc = function($first, ...$rest) {
23+
return func_get_named_args();
24+
};
25+
26+
var_dump($variadicFunc('FIRST', 'extra1', 'extra2'));
27+
var_dump($variadicFunc(first: 'FIRST', extra: 'EXTRA'));
28+
29+
$arrow = fn($p, $q = 'default_q') => func_get_named_args();
30+
31+
var_dump($arrow('P', 'Q'));
32+
var_dump($arrow(q: 'Q', p: 'P'));
33+
34+
$mapped = array_map(function($item, $prefix = 'prefix') {
35+
return func_get_named_args();
36+
}, ['test']);
37+
var_dump($mapped[0]);
38+
39+
?>
40+
--EXPECT--
41+
array(3) {
42+
["a"]=>
43+
string(1) "A"
44+
["b"]=>
45+
string(1) "B"
46+
["c"]=>
47+
string(1) "C"
48+
}
49+
array(3) {
50+
["a"]=>
51+
string(1) "A"
52+
["b"]=>
53+
string(9) "default_b"
54+
["c"]=>
55+
string(1) "C"
56+
}
57+
array(3) {
58+
["a"]=>
59+
string(1) "A"
60+
["b"]=>
61+
string(9) "default_b"
62+
["c"]=>
63+
string(1) "C"
64+
}
65+
array(2) {
66+
["x"]=>
67+
string(1) "X"
68+
["y"]=>
69+
string(1) "Y"
70+
}
71+
array(2) {
72+
["x"]=>
73+
string(1) "X"
74+
["y"]=>
75+
string(1) "Y"
76+
}
77+
array(3) {
78+
["first"]=>
79+
string(5) "FIRST"
80+
[1]=>
81+
string(6) "extra1"
82+
[2]=>
83+
string(6) "extra2"
84+
}
85+
array(2) {
86+
["first"]=>
87+
string(5) "FIRST"
88+
["extra"]=>
89+
string(5) "EXTRA"
90+
}
91+
array(2) {
92+
["p"]=>
93+
string(1) "P"
94+
["q"]=>
95+
string(1) "Q"
96+
}
97+
array(2) {
98+
["p"]=>
99+
string(1) "P"
100+
["q"]=>
101+
string(1) "Q"
102+
}
103+
array(1) {
104+
["item"]=>
105+
string(4) "test"
106+
}

‎Zend/tests/func_get_named_args_methods.phpt‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
--TEST--
2+
Testing func_get_named_args() with methods
3+
--FILE--
4+
<?php
5+
6+
class TestClass {
7+
public function instanceMethod($a, $b = 'default_b', $c = 'default_c') {
8+
return func_get_named_args();
9+
}
10+
11+
public static function staticMethod($x, $y = 'default_y', $z = 'default_z') {
12+
return func_get_named_args();
13+
}
14+
15+
public function variadicMethod($first, ...$rest) {
16+
return func_get_named_args();
17+
}
18+
}
19+
20+
$obj = new TestClass();
21+
22+
var_dump($obj->instanceMethod('A', 'B', 'C'));
23+
var_dump($obj->instanceMethod(c: 'C', a: 'A'));
24+
var_dump($obj->instanceMethod('A', c: 'C'));
25+
26+
var_dump(TestClass::staticMethod('X', 'Y', 'Z'));
27+
var_dump(TestClass::staticMethod(z: 'Z', x: 'X'));
28+
29+
var_dump($obj->variadicMethod('FIRST', 'extra1', 'extra2'));
30+
var_dump($obj->variadicMethod(first: 'FIRST', extra: 'EXTRA'));
31+
32+
?>
33+
--EXPECT--
34+
array(3) {
35+
["a"]=>
36+
string(1) "A"
37+
["b"]=>
38+
string(1) "B"
39+
["c"]=>
40+
string(1) "C"
41+
}
42+
array(3) {
43+
["a"]=>
44+
string(1) "A"
45+
["b"]=>
46+
string(9) "default_b"
47+
["c"]=>
48+
string(1) "C"
49+
}
50+
array(3) {
51+
["a"]=>
52+
string(1) "A"
53+
["b"]=>
54+
string(9) "default_b"
55+
["c"]=>
56+
string(1) "C"
57+
}
58+
array(3) {
59+
["x"]=>
60+
string(1) "X"
61+
["y"]=>
62+
string(1) "Y"
63+
["z"]=>
64+
string(1) "Z"
65+
}
66+
array(3) {
67+
["x"]=>
68+
string(1) "X"
69+
["y"]=>
70+
string(9) "default_y"
71+
["z"]=>
72+
string(1) "Z"
73+
}
74+
array(3) {
75+
["first"]=>
76+
string(5) "FIRST"
77+
[1]=>
78+
string(6) "extra1"
79+
[2]=>
80+
string(6) "extra2"
81+
}
82+
array(2) {
83+
["first"]=>
84+
string(5) "FIRST"
85+
["extra"]=>
86+
string(5) "EXTRA"
87+
}

0 commit comments

Comments
 (0)