Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix bug #78323: Code 0 is returned on invalid options

1 files changed, 41 insertions, 0 deletions

diff --git a/sapi/cgi/tests/bug78323.phpt b/sapi/cgi/tests/bug78323.phpt
new file mode 100644
index 0000000000..d89e51874a
--- /dev/null
+++ b/sapi/cgi/tests/bug78323.phpt
@@ -0,0 +1,41 @@
+--TEST--
+Bug #78323 Test exit code and error message for invalid parameters
+--SKIPIF--
+<?php include "skipif.inc"; ?>
+--FILE--
+<?php
+include "include.inc";
+$php = get_cgi_path();
+reset_env_vars();
+
+
+// no argument for option
+ob_start();
+passthru("$php --memory-limit=1G 2>&1", $exitCode);
+$output = ob_get_contents();
+ob_end_clean();
+
+$lines = preg_split('/\R/', $output);
+echo $lines[0], "\n",
+     $lines[1], "\n",
+     "Done: $exitCode\n\n";
+
+
+// Successful execution
+ob_start();
+passthru("$php -dmemory-limit=1G -v", $exitCode);
+$output = ob_get_contents();
+ob_end_clean();
+
+$lines = preg_split('/\R/', $output);
+echo $lines[0], "\n",
+     "Done: $exitCode\n";
+
+?>
+--EXPECTF--
+Error in argument 1, char 1: no argument for option -
+Usage: %s
+Done: 1
+
+PHP %s
+Done: 0