Skip to content

Commit d4fa6df

Browse files
committed
Amend test + add
1 parent 23fd145 commit d4fa6df

File tree

5 files changed

+51
-5
lines changed

5 files changed

+51
-5
lines changed

Zend/tests/bug77339.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class Foo
99
if (!isset($arguments[0])) {
1010
var_dump(['getSomeWhat']);
1111
var_dump($arguments);
12-
exit;
12+
exit();
1313
}
1414
}
1515
echo "OK\n";

Zend/tests/exit/define_exit_die_class_members.phpt renamed to Zend/tests/exit/define_class_members_exit_die.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--TEST--
2-
Attempting to define die constant
2+
Can define die and exit as class methods, constants and property
33
--FILE--
44
<?php
55

Zend/tests/die_string_cast_exception.phpt renamed to Zend/tests/exit/die_string_cast_exception.phpt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ try {
1111

1212
?>
1313
--EXPECT--
14-
die(): Argument #1 must be of type string|int, stdClass given
14+
die(): Argument #1 ($code) must be of type string|int, stdClass given

Zend/tests/exit/exit_statements.phpt

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
--TEST--
2+
Using exit/die as a statement/constant
3+
--FILE--
4+
<?php
5+
6+
const FILE_PATH = __DIR__ . '/exit_statements.inc';
7+
const FILE_CONTENT = <<<'TEMPLATE'
8+
<?php
9+
echo "Before FUNCTION";
10+
try {
11+
FUNCTION;
12+
} catch (\Throwable $e) {
13+
echo $e::class, ': ', $e->getMessage(), PHP_EOL;
14+
}
15+
16+
TEMPLATE;
17+
18+
19+
$php = getenv('TEST_PHP_EXECUTABLE_ESCAPED');
20+
$command = $php . ' ' . escapeshellarg(FILE_PATH);
21+
22+
foreach (['exit', 'die'] as $value) {
23+
echo 'Using ', $value, ' as value:', PHP_EOL;
24+
$output = [];
25+
$content = str_replace('FUNCTION', $value, FILE_CONTENT);
26+
file_put_contents(FILE_PATH, $content);
27+
exec($command, $output, $exit_status);
28+
echo 'Exit status is: ', $exit_status, PHP_EOL,
29+
'Output is:', PHP_EOL, join($output), PHP_EOL;
30+
}
31+
32+
?>
33+
--CLEAN--
34+
<?php
35+
const FILE_PATH = __DIR__ . '/exit_statements.inc';
36+
@unlink(FILE_PATH);
37+
?>
38+
--EXPECT--
39+
Using exit as value:
40+
Exit status is: 0
41+
Output is:
42+
Before exit
43+
Using die as value:
44+
Exit status is: 0
45+
Output is:
46+
Before die

Zend/tests/generators/yield_precedence.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ Precedence of yield and arrow operators
55

66
function gen() {
77
yield "a" . "b";
8-
yield "a" or die;
8+
yield "a" or die();
99
yield "k" => "a" . "b";
10-
yield "k" => "a" or die;
10+
yield "k" => "a" or die();
1111
var_dump([yield "k" => "a" . "b"]);
1212
yield yield "k1" => yield "k2" => "a" . "b";
1313
yield yield "k1" => (yield "k2") => "a" . "b";

0 commit comments

Comments
 (0)