Merge branch 'PHP-7.4'

Zend/zend_ini_parser.y

@@ -289,7 +289,7 @@ static void zval_ini_dtor(zval *zv)
 %}
 
 %expect 0
-%pure-parser
+%define api.pure full
 
 %token TC_SECTION
 %token TC_RAW

Zend/zend_language_parser.y

@@ -42,7 +42,7 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 
 %}
 
-%pure-parser
+%define api.pure full
 %expect 0
 
 %code requires {

ext/json/json_parser.y

@@ -46,7 +46,7 @@ int json_yydebug = 1;
 
 }
 
-%pure-parser
+%define api.pure full
 %define api.prefix {php_json_yy}
 %lex-param  { php_json_parser *parser  }
 %parse-param { php_json_parser *parser }

ext/standard/config.m4

@@ -406,12 +406,12 @@ AC_CHECK_DECLS([arc4random_buf])
 dnl
 dnl Check for argon2
 dnl
-PHP_ARG_WITH([argon2],
+PHP_ARG_WITH([password-argon2],
   [whether to build with Argon2 support],
-  [AS_HELP_STRING([--with-argon2],
+  [AS_HELP_STRING([--with-password-argon2],
     [Build with Argon2 support])])
 
-if test "$PHP_ARGON2" != "no"; then
+if test "$PHP_PASSWORD_ARGON2" != "no"; then
   PKG_CHECK_MODULES([ARGON2], [libargon2])
 
   PHP_EVAL_INCLINE($ARGON2_CFLAGS)

sapi/phpdbg/phpdbg_parser.y

@@ -28,7 +28,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 
 %}
 
-%pure-parser
+%define api.pure full
 %define parse.error verbose
 
 %code requires {