From 852ab5d83fc350cabbe5d80237410ab9e2d47176 Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 11 Jun 2019 17:19:43 +0200
Subject: [PATCH 1/2] Use %define api.pure instead of %pure-parser

%pure-parser is deprecated. In our case there is no difference between
true & full, as we don't use locations.
---
 Zend/zend_ini_parser.y      | 2 +-
 Zend/zend_language_parser.y | 2 +-
 ext/json/json_parser.y      | 2 +-
 sapi/phpdbg/phpdbg_parser.y | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y
index d0ac75a7346..0a90d0fa26b 100644
--- a/Zend/zend_ini_parser.y
+++ b/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
diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
index b20c619f050..3c54d5dd928 100644
--- a/Zend/zend_language_parser.y
+++ b/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 {
diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y
index c3d0976ad9b..ff9e50362a8 100644
--- a/ext/json/json_parser.y
+++ b/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 }
diff --git a/sapi/phpdbg/phpdbg_parser.y b/sapi/phpdbg/phpdbg_parser.y
index c4f6682fee5..3031ce5a807 100644
--- a/sapi/phpdbg/phpdbg_parser.y
+++ b/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 {

From b654a0749233d89704d8b23ae6e758095fdfea1d Mon Sep 17 00:00:00 2001
From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 12 Jun 2019 09:28:25 +0200
Subject: [PATCH 2/2] Revert option rename

Let's keep this at --with-password-argon2 to avoid churn, I don't
think we have a strong motivation to rename this one.
---
 UPGRADING              | 3 +++
 ext/standard/config.m4 | 6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index 66be319cb9b..42671609cd4 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -608,6 +608,9 @@ The following extensions and SAPIs are affected:
 - SQLite3:
   . --with-sqlite3 no longer accepts a directory.
 
+- Standard:
+  . --with-password-argon2 no longer accepts a directory.
+
 - XSL:
   . --with-xsl no longer accepts a directory.
 
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4
index 20ff3d55c05..0a46b1e3419 100644
--- a/ext/standard/config.m4
+++ b/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)