Merge branch 'PHP-7.4'

* PHP-7.4:
  Convert all php_error_docref0 to php_error_docref

diff --cc ext/intl/timezone/timezone_class.cpp
Simple merge

diff --cc ext/intl/transliterator/transliterator_class.c
index c9e0f83c0ba26338cb8beebf822662c5d3634ae8,4417fba4f0510e1d6af1efa5d3cd23c98bef2ad7..e1134230e86da243b14c8b8cce871e810c72e4f7
--- 1/ext/intl/transliterator/transliterator_class.c
--- 2/ext/intl/transliterator/transliterator_class.c
+++ b/ext/intl/transliterator/transliterator_class.c
@@@ -213,11 -235,13 +213,11 @@@ static zval *Transliterator_read_proper
  {
        zval *retval;
  
 -      TRANSLITERATOR_PROPERTY_HANDLER_PROLOG(return &EG(uninitialized_zval));
 -
        if( ( type != BP_VAR_R && type != BP_VAR_IS ) &&
                ( zend_binary_strcmp( "id", sizeof( "id" ) - 1,
 -              Z_STRVAL_P( member ), Z_STRLEN_P( member ) ) == 0 ) )
 +              ZSTR_VAL( name ), ZSTR_LEN( name ) ) == 0 ) )
        {
-               php_error_docref0( NULL, E_WARNING, "The property \"id\" is read-only" );
+               php_error_docref(NULL, E_WARNING, "The property \"id\" is read-only" );
                retval = &EG( uninitialized_zval );
        }
        else
@@@ -243,9 -269,9 +243,9 @@@ static zval *Transliterator_write_prope
        }
        if( ( scope != Transliterator_ce_ptr ) &&
                ( zend_binary_strcmp( "id", sizeof( "id" ) - 1,
 -              Z_STRVAL_P( member ), Z_STRLEN_P( member ) ) == 0 ) )
 +              ZSTR_VAL( name ), ZSTR_LEN( name ) ) == 0 ) )
        {
-               php_error_docref0( NULL, E_WARNING, "The property \"id\" is read-only" );
+               php_error_docref(NULL, E_WARNING, "The property \"id\" is read-only" );
        }
        else
        {

diff --cc ext/intl/transliterator/transliterator_methods.c
Simple merge

diff --cc main/main.c
Simple merge

diff --cc main/php.h
Simple merge