Skip to content

Commit 6ede937

Browse files
committed
rewrite tests
1 parent 03be2a2 commit 6ede937

2 files changed

Lines changed: 11 additions & 18 deletions

File tree

ext/standard/tests/general_functions/getenv_null_bytes.phpt

Lines changed: 0 additions & 17 deletions
This file was deleted.

ext/standard/tests/general_functions/putenv_null_bytes.phpt renamed to ext/standard/tests/general_functions/putenv_and_getenv_reject_null_bytes.phpt

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
11
--TEST--
2-
putenv() rejects null bytes
2+
getenv() and putenv() reject null bytes
33
--FILE--
44
<?php
55

6+
foreach ([false, true] as $local_only) {
7+
try {
8+
getenv("PHP_GETENV_NUL_TEST\0SUFFIX", $local_only);
9+
} catch (ValueError $exception) {
10+
echo $exception->getMessage() . "\n";
11+
}
12+
}
13+
614
$var_name = 'PHP_PUTENV_NUL_TEST';
715

816
foreach ([
@@ -20,6 +28,8 @@ var_dump(getenv($var_name));
2028

2129
?>
2230
--EXPECT--
31+
getenv(): Argument #1 ($name) must not contain any null bytes
32+
getenv(): Argument #1 ($name) must not contain any null bytes
2333
putenv(): Argument #1 ($assignment) must not contain any null bytes
2434
putenv(): Argument #1 ($assignment) must not contain any null bytes
2535
bool(false)

0 commit comments

Comments
 (0)