Fix #73226: --r[fcez] always return zero exit code

This makes the behavior consistent with `--ri`, and is likely useful for scripting. Closes GH-7221.
php · Jul 12, 2021 · 9db3eda · 9db3eda
1 parent a6b4308
commit 9db3eda
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/NEWS b/NEWS
@@ -13,6 +13,7 @@ PHP                                                                        NEWS
     (cmb)
   . Fixed bug #80173 (Using return value of zend_assign_to_variable() is not
     safe). (Nikita)
+  . Fixed bug #73226 (--r[fcez] always return zero exit code). (cmb)
 
 - Intl:
   . Fixed bug #72809 (Locale::lookup() wrong result with canonicalize option).

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
@@ -1086,6 +1086,7 @@ static int do_cli(int argc, char **argv) /* {{{ */
 						zend_printf("Exception: %s\n", Z_STRVAL_P(msg));
 						zval_ptr_dtor(&tmp);
 						EG(exception) = NULL;
+						exit_status = 1;
 					} else {
 						zend_print_zval(&ref, 0);
 						zend_write("\n", 1);