Merge branch 'PHP-7.4'

* PHP-7.4:
  Upgrade deprecated directives and use non-posix bison

3 files changed, 3 insertions, 3 deletions

diff --git a/ext/json/json_parser.y b/ext/json/json_parser.y
index e251d6e0d4..1fce1e94fe 100644
--- a/ext/json/json_parser.y
+++ b/ext/json/json_parser.y
@@ -47,7 +47,7 @@ int json_yydebug = 1;
 }
 
 %pure-parser
-%name-prefix "php_json_yy"
+%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 88baa010b2..c4f6682fee 100644
--- a/sapi/phpdbg/phpdbg_parser.y
+++ b/sapi/phpdbg/phpdbg_parser.y
@@ -29,7 +29,7 @@ ZEND_EXTERN_MODULE_GLOBALS(phpdbg)
 %}
 
 %pure-parser
-%error-verbose
+%define parse.error verbose
 
 %code requires {
 #include "phpdbg.h"
diff --git a/scripts/dev/genfiles b/scripts/dev/genfiles
index 4e3a6d62e0..c633429e0f 100755
--- a/scripts/dev/genfiles
+++ b/scripts/dev/genfiles
@@ -35,7 +35,7 @@
 
 # Parser generator
 YACC=${YACC:-bison}
-YACC="$YACC -y -l"
+YACC="$YACC -l"
 
 # Lexer generator
 RE2C=${RE2C:-re2c}