Skip to content

Commit 48e7fc9

Browse files
committed
Update more tests
1 parent 530a936 commit 48e7fc9

File tree

10 files changed

+17
-15
lines changed

10 files changed

+17
-15
lines changed

ext/session/tests/session_decode_variation3.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ob_end_flush();
3131
Warning: session_start(): Cannot find session serialization handler "blah" - session startup failed in %s on line %d
3232
bool(false)
3333

34-
Warning: Undefined variable $_SESSION in %s on line %d
34+
Warning: Undefined global variable $_SESSION in %s on line %d
3535
NULL
3636
array(3) {
3737
["foo"]=>

ext/session/tests/session_set_save_handler_class_012.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var_dump(session_id(), $oldHandler, ini_get('session.save_handler'), $handler->i
4545
Open
4646
SessionHandler::open() expects exactly 2 arguments, 0 given
4747

48-
Warning: Undefined variable $_SESSION in %s on line %d
48+
Warning: Undefined global variable $_SESSION in %s on line %d
4949
string(0) ""
5050
string(5) "files"
5151
string(4) "user"

ext/standard/tests/array/005.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
Test array_shift() function
33
--FILE--
44
<?php
5-
array_shift($GLOBALS);
65

76
$empty_array = array();
87
$number = 5;

ext/standard/tests/array/006.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ Test array_pop behaviour
33
--FILE--
44
<?php
55

6-
array_pop($GLOBALS);
7-
86
$a = array("foo", "bar", "fubar");
97
$b = array("3" => "foo", "4" => "bar", "5" => "fubar");
108
$c = array("a" => "foo", "b" => "bar", "c" => "fubar");

ext/standard/tests/array/array_pop.phpt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ Test array_pop() function
33
--FILE--
44
<?php
55

6-
array_pop($GLOBALS);
7-
86
$empty_array = array();
97
$number = 5;
108
$str = "abc";

ext/standard/tests/array/bug29253.phpt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ $gg = 'afad';
77
var_dump(@array_diff_assoc($GLOBALS, $zz));
88
var_dump($gg);
99
?>
10-
--EXPECT--
11-
array(0) {
10+
--EXPECTF--
11+
array(2) {
12+
["zz"]=>
13+
%A
14+
["gg"]=>
15+
string(4) "afad"
1216
}
1317
string(4) "afad"

ext/standard/tests/array/bug31158.phpt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ __();
1414
echo "ok\n";
1515
?>
1616
--EXPECTF--
17-
Warning: Undefined variable $GLOBALS in %s on line %d
18-
19-
Warning: Trying to access array offset on value of type null in %s on line %d
20-
ok
17+
Fatal error: Uncaught Error: array_splice(): Argument #1 ($array) cannot be passed by reference in %s:%d
18+
Stack trace:
19+
#0 %s(%d): __()
20+
#1 {main}
21+
thrown in %s on line %d

ext/standard/tests/array/bug65251.phpt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ Bug #65251: array_merge_recursive() recursion detection broken
33
--FILE--
44
<?php
55

6+
/* This no longer involves any recursion. */
67
try {
78
array_merge_recursive($GLOBALS, $GLOBALS);
89
} catch (\Error $e) {
910
echo $e->getMessage() . "\n";
1011
}
1112

1213
?>
14+
===DONE===
1315
--EXPECT--
14-
Recursion detected
16+
===DONE===

ext/standard/tests/array/extract_safety.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ echo "\nDone";
1717
?>
1818
--EXPECTF--
1919
string(4) "John" refcount(%d)
20-
int(0)
20+
int(1)
2121
string(4) "John" refcount(%d)
2222

2323
Done
Binary file not shown.

0 commit comments

Comments
 (0)