Merge branch 'PHP-7.4'

diff --cc ext/phar/tests/phar_commitwrite.phpt
index 56d3498d54444daf7be4302fa6b90b1acd10ba7d,96717372720eebbd36a03c50e42ac160b3ee7f84..7a3b5e7b931d88ab1586979f9ad18087ff1f4367
--- 1/ext/phar/tests/phar_commitwrite.phpt
--- 2/ext/phar/tests/phar_commitwrite.phpt
+++ b/ext/phar/tests/phar_commitwrite.phpt
@@@ -12,11 -12,12 +12,11 @@@ $p['file1.txt'] = 'hi'
  $p->stopBuffering();
  var_dump(strlen($p->getStub()));
  $p->setStub("<?php
 -function __autoload(\$class)
 -{
 +spl_autoload_register(function(\$class) {
      include 'phar://' . str_replace('_', '/', \$class);
 -}
 +});
- Phar::mapPhar('brandnewphar.phar');
- include 'phar://brandnewphar.phar/startup.php';
+ Phar::mapPhar('phar_commitwrite.phar');
+ include 'phar://phar_commitwrite.phar/startup.php';
  __HALT_COMPILER();
  ?>");
  var_dump($p->getStub());
@@@ -30,11 -31,12 +30,11 @@@ __HALT_COMPILER()
  --EXPECTF--
  int(6641)
  string(%d) "<?php
 -function __autoload($class)
 -{
 +spl_autoload_register(function($class) {
      include 'phar://' . str_replace('_', '/', $class);
 -}
 +});
- Phar::mapPhar('brandnewphar.phar');
- include 'phar://brandnewphar.phar/startup.php';
+ Phar::mapPhar('phar_commitwrite.phar');
+ include 'phar://phar_commitwrite.phar/startup.php';
  __HALT_COMPILER(); ?>
  "
  ===DONE===

diff --cc ext/phar/tests/phar_create_in_cwd.phpt
index c1ed9555eddf476d3babddf001c345ef98a11437,52120fa7f934888f6d0f9bf68feacaa4a237758f..4a9bd23a735cdea45ef7aabf483c6b7c9b2e10bb
--- 1/ext/phar/tests/phar_create_in_cwd.phpt
--- 2/ext/phar/tests/phar_create_in_cwd.phpt
+++ b/ext/phar/tests/phar_create_in_cwd.phpt
@@@ -13,11 -13,12 +13,11 @@@ try 
        $p['file1.txt'] = 'hi';
        var_dump(strlen($p->getStub()));
        $p->setStub("<?php
 -function __autoload(\$class)
 -{
 +spl_autoload_register(function(\$class) {
      include 'phar://' . str_replace('_', '/', \$class);
 -}
 +});
- Phar::mapPhar('brandnewphar.phar');
- include 'phar://brandnewphar.phar/startup.php';
+ Phar::mapPhar('phar_create_in_cwd.phar');
+ include 'phar://phar_create_in_cwd.phar/startup.php';
  __HALT_COMPILER();
  ?>");
        var_dump($p->getStub());
@@@ -33,11 -34,12 +33,11 @@@ unlink(dirname(__FILE__) . '/phar_creat
  --EXPECTF--
  int(6641)
  string(%d) "<?php
 -function __autoload($class)
 -{
 +spl_autoload_register(function($class) {
      include 'phar://' . str_replace('_', '/', $class);
 -}
 +});
- Phar::mapPhar('brandnewphar.phar');
- include 'phar://brandnewphar.phar/startup.php';
+ Phar::mapPhar('phar_create_in_cwd.phar');
+ include 'phar://phar_create_in_cwd.phar/startup.php';
  __HALT_COMPILER(); ?>
  "
  ===DONE===

diff --cc ext/phar/tests/tar/phar_commitwrite.phpt
index 6d785d287f2ca9f128b091c674bc5cb36d8ace2c,1f6d744917256c313d16ffe773cd7d231cb41d67..23d6800598cf16c69772055ace88892d8ef1be3c
--- 1/ext/phar/tests/tar/phar_commitwrite.phpt
--- 2/ext/phar/tests/tar/phar_commitwrite.phpt
+++ b/ext/phar/tests/tar/phar_commitwrite.phpt
@@@ -12,11 -12,12 +12,11 @@@ $p['file1.txt'] = 'hi'
  $p->stopBuffering();
  var_dump($p->getStub());
  $p->setStub("<?php
 -function __autoload(\$class)
 -{
 +spl_autoload_register(function(\$class) {
      include 'phar://' . str_replace('_', '/', \$class);
 -}
 +});
- Phar::mapPhar('brandnewphar.phar');
- include 'phar://brandnewphar.phar/startup.php';
+ Phar::mapPhar('phar_commitwrite.phar');
+ include 'phar://phar_commitwrite.phar/startup.php';
  __HALT_COMPILER();
  ?>");
  var_dump($p->getStub());
@@@ -31,11 -32,12 +31,11 @@@ unlink(dirname(__FILE__) . '/phar_commi
  string(60) "<?php // tar-based phar archive stub file
  __HALT_COMPILER();"
  string(%d) "<?php
 -function __autoload($class)
 -{
 +spl_autoload_register(function($class) {
      include 'phar://' . str_replace('_', '/', $class);
 -}
 +});
- Phar::mapPhar('brandnewphar.phar');
- include 'phar://brandnewphar.phar/startup.php';
+ Phar::mapPhar('phar_commitwrite.phar');
+ include 'phar://phar_commitwrite.phar/startup.php';
  __HALT_COMPILER(); ?>
  "
  bool(true)

diff --cc ext/phar/tests/zip/phar_commitwrite.phpt
index 7a7499eb2812c21ec311e994d88eb9f652d4d5a6,fa9efc7bd2295220926b40da214bb9439f3d60fc..163622e4dd642290daf182be81819a1c3a4263c5
--- 1/ext/phar/tests/zip/phar_commitwrite.phpt
--- 2/ext/phar/tests/zip/phar_commitwrite.phpt
+++ b/ext/phar/tests/zip/phar_commitwrite.phpt
@@@ -12,11 -12,12 +12,11 @@@ $p['file1.txt'] = 'hi'
  $p->stopBuffering();
  var_dump($p->getStub());
  $p->setStub("<?php
 -function __autoload(\$class)
 -{
 +spl_autoload_register(function(\$class) {
      include 'phar://' . str_replace('_', '/', \$class);
 -}
 +});
- Phar::mapPhar('brandnewphar.phar');
- include 'phar://brandnewphar.phar/startup.php';
+ Phar::mapPhar('phar_commitwrite.phar');
+ include 'phar://phar_commitwrite.phar/startup.php';
  __HALT_COMPILER();
  ?>");
  var_dump($p->getStub());
@@@ -31,11 -32,12 +31,11 @@@ unlink(dirname(__FILE__) . '/phar_commi
  string(60) "<?php // zip-based phar archive stub file
  __HALT_COMPILER();"
  string(%d) "<?php
 -function __autoload($class)
 -{
 +spl_autoload_register(function($class) {
      include 'phar://' . str_replace('_', '/', $class);
 -}
 +});
- Phar::mapPhar('brandnewphar.phar');
- include 'phar://brandnewphar.phar/startup.php';
+ Phar::mapPhar('phar_commitwrite.phar');
+ include 'phar://phar_commitwrite.phar/startup.php';
  __HALT_COMPILER(); ?>
  "
  bool(true)