Merge branch 'PHP-7.4'

* PHP-7.4:
  Canonicalize bison error during ini parsing

diff --cc Zend/zend_ini_parser.y
index a204496a357beede26e66b5f7309d4d0fa6f5380,db9b7d670b65fde239a1314b21b2411afb191760..5b82ec2f6a3fa58a11d42186e89c224220affdb6
--- 1/Zend/zend_ini_parser.y
--- 2/Zend/zend_ini_parser.y
+++ b/Zend/zend_ini_parser.y
@@@ -287,11 -289,10 +287,12 @@@ static void zval_ini_dtor(zval *zv
  %}
  
  %expect 0
 +%define api.prefix {ini_}
  %define api.pure full
 +%define api.value.type {zval}
  %define parse.error verbose
  
+ %token END 0 "end of file"
  %token TC_SECTION
  %token TC_RAW
  %token TC_CONSTANT