Skip to content

Commit 836631d

Browse files
committed
Fix tests
1 parent c0587a8 commit 836631d

5 files changed

Lines changed: 16 additions & 16 deletions

File tree

Zend/tests/partial_application/references_004.phpt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ var_dump($b, $c, $d);
2626
Closure [ <user> static function {closure:%s:%d} ] {
2727
@@ %sreferences_004.php 13 - 13
2828

29-
- Bound Variables [2] {
30-
Variable #0 [ $a ]
31-
Variable #1 [ $args2 ]
29+
- Bound Variables [1] {
30+
Variable #0 [ $args2 ]
3231
}
3332

3433
- Parameters [2] {

Zend/tests/partial_application/variation_debug_001.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
--TEST--
22
PFA variation: var_dump(), user function
3+
--ENV--
4+
A=20
35
--FILE--
46
<?php
57
function bar($a = 1, $b = 2, ...$c) {
68

79
}
810

9-
var_dump(bar(?, new stdClass, 20, new stdClass, four: 4));
11+
var_dump(bar(?, new stdClass, (int)getenv('A'), new stdClass, four: 4));
1012
?>
1113
--EXPECTF--
1214
object(Closure)#%d (5) {

Zend/tests/partial_application/variation_debug_002.phpt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
--TEST--
22
PFA variation: var_dump(), internal function
3+
--ENV--
4+
A=1
35
--FILE--
46
<?php
5-
var_dump(array_map(?, [1, 2, 3], [4, 5, 6], four: new stdClass, ...));
7+
8+
function notconst($value) {
9+
return getenv('A') ? $value : null;
10+
}
11+
12+
var_dump(array_map(?, notconst([1, 2, 3]), notconst([4, 5, 6]), four: new stdClass, ...));
613
?>
714
--EXPECTF--
815
object(Closure)#%d (5) {
@@ -11,7 +18,7 @@ object(Closure)#%d (5) {
1118
["file"]=>
1219
string(%d) "%svariation_debug_002.php"
1320
["line"]=>
14-
int(2)
21+
int(7)
1522
["static"]=>
1623
array(3) {
1724
["array"]=>

Zend/tests/partial_application/variation_variadics_001.phpt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
--TEST--
22
PFA variation: variadics, user function
3+
--ENV--
4+
A=1
35
--FILE--
46
<?php
57
function foo($a, ...$b) {
@@ -16,11 +18,6 @@ $foo(1000, 10000);
1618
Closure [ <user> static function {closure:%s:%d} ] {
1719
@@ %s 6 - 6
1820

19-
- Bound Variables [2] {
20-
Variable #0 [ $a ]
21-
Variable #1 [ $b2 ]
22-
}
23-
2421
- Parameters [1] {
2522
Parameter #0 [ <optional> ...$b ]
2623
}

Zend/tests/partial_application/variation_variadics_002.phpt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ echo $sprintf(1000, 10000);
1212
Closure [ <user> static function {closure:%s:%d} ] {
1313
@@ %svariation_variadics_002.php 2 - 2
1414

15-
- Bound Variables [2] {
16-
Variable #0 [ $format ]
17-
Variable #1 [ $values2 ]
18-
}
19-
2015
- Parameters [1] {
2116
Parameter #0 [ <optional> mixed ...$values ]
2217
}

0 commit comments

Comments
 (0)