Merge branch 'PHP-7.3' into PHP-7.4

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

diff --cc NEWS
index cc68ef78b2ee84fe59fe556eb22766f3b7bcade4,fe4c2d37310adc0d5a59c09a5bad586e2eee3714..0f93d0671bfd83c6a2f5c9cdf744f61951b900db
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,11 -1,12 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.3.15
 +?? ??? ????, PHP 7.4.3
  
  - Core:
 -  . Fixed bug #71876 (Memory corruption htmlspecialchars(): charset `*' not
 -    supported). (Nikita)
 -  . Fixed bug ##79146 (cscript can fail to run on some systems). (clarodeus)
 +  . Fixed bug #79146 (cscript can fail to run on some systems). (clarodeus)
 +  . Fixed bug #79155 (Property nullability lost when using multiple property
 +    definition). (Nikita)
+   . Fixed bug #78323 (Code 0 is returned on invalid options). (Ivan Mikheykin)
  
  - CURL:
    . Fixed bug #79078 (Hypothetical use-after-free in curl_multi_add_handle()).

diff --cc ext/standard/basic_functions.c
Simple merge

diff --cc main/getopt.c
Simple merge

diff --cc main/php_getopt.h
index 20746517d4e3a1e537dfaa6f80e5549ecfdf880b,027e15295285d305a600f4e6521fb45e4faa653b..c368aa7fa95e16c93d05a8b45aaf14f648ec7b7c
--- 1/main/php_getopt.h
--- 2/main/php_getopt.h
+++ b/main/php_getopt.h
@@@ -35,4 -35,16 +35,7 @@@ extern PHPAPI int php_optidx
  PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char **optarg, int *optind, int show_err, int arg_start);
  END_EXTERN_C()
  
+ /* php_getopt will return this value if there is an error in arguments */
+ #define PHP_GETOPT_INVALID_ARG (-2)
+ 
  #endif
 -
 -/*
 - * Local variables:
 - * tab-width: 4
 - * c-basic-offset: 4
 - * End:
 - * vim600: noet sw=4 ts=4 fdm=marker
 - * vim<600: noet sw=4 ts=4
 - */

diff --cc sapi/cgi/cgi_main.c
Simple merge

diff --cc sapi/cli/php_cli.c
Simple merge

diff --cc sapi/fpm/fpm/fpm_main.c
Simple merge