Skip to content

Commit 092e090

Browse files
authored
ext/session/tests: more lenient expected output checks. (php#11631)
Several session tests incidentally check the values of INI variables like session.name and session.save_path. This isn't the point of the tests, and it can cause spurious failures if (for example) you want to override your temporary directory while testing. So here, we make the expected output patterns more lenient.
1 parent 15bdc85 commit 092e090

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

ext/session/tests/bug74514.phpt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ var_dump(session_save_path());
2525
var_dump(session_cache_limiter());
2626
var_dump(session_cache_expire());
2727
?>
28-
--EXPECT--
29-
string(9) "PHPSESSID"
30-
string(3) "foo"
31-
string(5) "files"
32-
string(0) ""
33-
string(7) "nocache"
34-
int(180)
28+
--EXPECTF--
29+
string(%d) "%S"
30+
string(%d) "%S"
31+
string(%d) "%S"
32+
string(%d) "%S"
33+
string(%d) "%S"
34+
int(%d)

ext/session/tests/bug74936.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var_dump(session_cache_expire());
1414
var_dump(session_cache_limiter());
1515
var_dump(session_save_path());
1616
?>
17-
--EXPECT--
18-
int(180)
19-
string(7) "nocache"
20-
string(0) ""
17+
--EXPECTF--
18+
int(%d)
19+
string(%d) "%S"
20+
string(%d) "%S"

ext/session/tests/user_session_module/gh7787.phpt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ session_write_close();
7878

7979
?>
8080
--EXPECTF--
81-
Warning: session_write_close(): Failed to write session data using user defined save handler. (session.save_path: , handler: MySessionHandler::write) in %s on line %d
81+
Warning: session_write_close(): Failed to write session data using user defined save handler. (session.save_path: %S, handler: MySessionHandler::write) in %s on line %d
8282

83-
Warning: session_write_close(): Failed to write session data using user defined save handler. (session.save_path: , handler: MySessionHandler::updateTimestamp) in %s on line %d
83+
Warning: session_write_close(): Failed to write session data using user defined save handler. (session.save_path: %S, handler: MySessionHandler::updateTimestamp) in %s on line %d
8484

85-
Warning: session_write_close(): Failed to write session data using user defined save handler. (session.save_path: , handler: write) in %s on line %d
85+
Warning: session_write_close(): Failed to write session data using user defined save handler. (session.save_path: %S, handler: write) in %s on line %d
8686

87-
Warning: session_write_close(): Failed to write session data using user defined save handler. (session.save_path: , handler: update_timestamp) in %s on line %d
87+
Warning: session_write_close(): Failed to write session data using user defined save handler. (session.save_path: %S, handler: update_timestamp) in %s on line %d

0 commit comments

Comments
 (0)