Merge branch 'PHP-7.4'

* PHP-7.4:
  Properly propagate url_stat exceptions during include

diff --cc Zend/tests/bug60909_1.phpt
index d674490302a8d7056c3ae829af86337378a7bbab,c82cf6c4d58ff98f6dc9b28023d2f51032152089..51b2dcae4c18ca8440f78b55b83d5bfa8c863de7
--- 1/Zend/tests/bug60909_1.phpt
--- 2/Zend/tests/bug60909_1.phpt
+++ b/Zend/tests/bug60909_1.phpt
@@@ -11,9 -11,9 +11,9 @@@ set_error_handler(function($errno, $err
  require 'notfound.php';
  --EXPECTF--
  error(require(notfound.php): failed to open stream: %s)
- Warning: Uncaught Exception: Foo in %sbug60909_1.php:5
+ Fatal error: Uncaught Exception: Foo in %sbug60909_1.php:5
  Stack trace:
 -#0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8, Array)
 +#0 %sbug60909_1.php(8): {closure}(2, 'require(notfoun...', '%s', 8)
  #1 %sbug60909_1.php(8): require()
  #2 {main}
    thrown in %sbug60909_1.php on line 5

diff --cc Zend/zend_execute.c
Simple merge

diff --cc Zend/zend_language_scanner.l
Simple merge

diff --cc main/fopen_wrappers.c
Simple merge

diff --cc main/streams/streams.c
Simple merge