Merge branch 'PHP-7.4' into master

* PHP-7.4:
  Fix #76943: Inconsistent stream_wrapper_restore() errors

diff --cc main/streams/userspace.c
index f6381a0014c4935596b293b526976fee8671787a,cf8f59b756fc12148dc692a18c86ee235d4b00af..0e9059a99e5239ff99f9733ea65a1070c0234aa2
--- 1/main/streams/userspace.c
--- 2/main/streams/userspace.c
+++ b/main/streams/userspace.c
@@@ -526,10 -559,10 +526,10 @@@ PHP_FUNCTION(stream_wrapper_restore
  {
        zend_string *protocol;
        php_stream_wrapper *wrapper;
-       HashTable *global_wrapper_hash;
+       HashTable *global_wrapper_hash, *wrapper_hash;
  
        if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &protocol) == FAILURE) {
 -              RETURN_FALSE;
 +              RETURN_THROWS();
        }
  
        global_wrapper_hash = php_stream_get_url_stream_wrappers_hash_global();