mirror of
https://github.com/php/php-src.git
synced 2026-04-25 08:58:28 +02:00
Juliette
4c5767f62f
Follow up on 13483 As previously reported in https://github.com/php/php-src/pull/13483#discussion_r1718546927: > The parameter names seem to be incorrect. > > It should be `$status`, not `$code`. > > The RFC explicitly uses that parameter name in the proposal: https://wiki.php.net/rfc/exit-as-function#proposal > > It is also the name already used in the [manual](https://www.php.net/exit). > > Lastly, the parameter name `$status` better covers what can be passed: either a status _message_ or a status _code_. > While `$code` would read pretty weird when passing a message: > ```php > exit(code: 'message'); > ``` This commit attempts to fix this. Includes adding a test for exit/die using a named argument. Co-authored-by: jrfnl <jrfnl@users.noreply.github.com>
184 lines
4.1 KiB
PHP
184 lines
4.1 KiB
PHP
--TEST--
|
|
exit(false);
|
|
--FILE--
|
|
<?php
|
|
|
|
function zend_test_var_export($value) {
|
|
if ($value === PHP_INT_MIN) {
|
|
return "PHP_INT_MIN";
|
|
}
|
|
if ($value === PHP_INT_MAX) {
|
|
return "PHP_INT_MAX";
|
|
}
|
|
if (is_array($value)) {
|
|
return "[]";
|
|
}
|
|
if (is_resource($value)) {
|
|
return "STDERR";
|
|
}
|
|
if ($value instanceof stdClass) {
|
|
return "new stdClass()";
|
|
}
|
|
return var_export($value, true);
|
|
}
|
|
|
|
$values = [
|
|
null,
|
|
false,
|
|
true,
|
|
0,
|
|
1,
|
|
20,
|
|
10.0,
|
|
15.5,
|
|
"Hello world",
|
|
[],
|
|
STDERR,
|
|
new stdClass(),
|
|
];
|
|
|
|
const FILE_PATH = __DIR__ . '/exit_values_test.php';
|
|
const FILE_CONTENT = <<<'TEMPLATE'
|
|
<?php
|
|
try {
|
|
exit(VALUE);
|
|
} catch (\Throwable $e) {
|
|
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
|
|
}
|
|
|
|
TEMPLATE;
|
|
|
|
$php = getenv('TEST_PHP_EXECUTABLE_ESCAPED');
|
|
$command = $php . ' --no-php-ini ' . escapeshellarg(FILE_PATH);
|
|
|
|
foreach ([FILE_CONTENT, str_replace('exit', 'die', FILE_CONTENT)] as $code) {
|
|
foreach ($values as $value) {
|
|
echo 'Using ', zend_test_var_export($value), ' as value:', PHP_EOL;
|
|
$output = [];
|
|
$content = str_replace('VALUE', zend_test_var_export($value), $code);
|
|
file_put_contents(FILE_PATH, $content);
|
|
exec($command, $output, $exit_status);
|
|
echo 'Exit status is: ', $exit_status, PHP_EOL,
|
|
'Output is:', PHP_EOL, join($output), PHP_EOL;
|
|
}
|
|
|
|
echo 'As a statement:', PHP_EOL;
|
|
$output = [];
|
|
$content = str_replace('(VALUE)', '', $code);
|
|
exec($command, $output, $exit_status);
|
|
echo 'Exit status is: ', $exit_status, PHP_EOL,
|
|
'Output is:', PHP_EOL, join($output), PHP_EOL;
|
|
}
|
|
|
|
?>
|
|
--CLEAN--
|
|
<?php
|
|
const FILE_PATH = __DIR__ . '/exit_values_test.php';
|
|
@unlink(FILE_PATH);
|
|
?>
|
|
--EXPECTF--
|
|
Using NULL as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
Deprecated: exit(): Passing null to parameter #1 ($status) of type string|int is deprecated in %s on line %d
|
|
Using false as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
|
|
Using true as value:
|
|
Exit status is: 1
|
|
Output is:
|
|
|
|
Using 0 as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
|
|
Using 1 as value:
|
|
Exit status is: 1
|
|
Output is:
|
|
|
|
Using 20 as value:
|
|
Exit status is: 20
|
|
Output is:
|
|
|
|
Using 10.0 as value:
|
|
Exit status is: 10
|
|
Output is:
|
|
|
|
Using 15.5 as value:
|
|
Exit status is: 15
|
|
Output is:
|
|
Deprecated: Implicit conversion from float 15.5 to int loses precision in %s on line %d
|
|
Using 'Hello world' as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
Hello world
|
|
Using [] as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
TypeError: exit(): Argument #1 ($status) must be of type string|int, array given
|
|
Using STDERR as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
TypeError: exit(): Argument #1 ($status) must be of type string|int, resource given
|
|
Using new stdClass() as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
TypeError: exit(): Argument #1 ($status) must be of type string|int, stdClass given
|
|
As a statement:
|
|
Exit status is: 0
|
|
Output is:
|
|
TypeError: exit(): Argument #1 ($status) must be of type string|int, stdClass given
|
|
Using NULL as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
Deprecated: exit(): Passing null to parameter #1 ($status) of type string|int is deprecated in %s on line %d
|
|
Using false as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
|
|
Using true as value:
|
|
Exit status is: 1
|
|
Output is:
|
|
|
|
Using 0 as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
|
|
Using 1 as value:
|
|
Exit status is: 1
|
|
Output is:
|
|
|
|
Using 20 as value:
|
|
Exit status is: 20
|
|
Output is:
|
|
|
|
Using 10.0 as value:
|
|
Exit status is: 10
|
|
Output is:
|
|
|
|
Using 15.5 as value:
|
|
Exit status is: 15
|
|
Output is:
|
|
Deprecated: Implicit conversion from float 15.5 to int loses precision in %s on line %d
|
|
Using 'Hello world' as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
Hello world
|
|
Using [] as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
TypeError: exit(): Argument #1 ($status) must be of type string|int, array given
|
|
Using STDERR as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
TypeError: exit(): Argument #1 ($status) must be of type string|int, resource given
|
|
Using new stdClass() as value:
|
|
Exit status is: 0
|
|
Output is:
|
|
TypeError: exit(): Argument #1 ($status) must be of type string|int, stdClass given
|
|
As a statement:
|
|
Exit status is: 0
|
|
Output is:
|
|
TypeError: exit(): Argument #1 ($status) must be of type string|int, stdClass given
|