From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 22 Feb 2019 09:53:28 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b5e566e621e30f3c987629f3b814ed80e2a9034;p=php

Merge branch 'PHP-7.4'
---

3b5e566e621e30f3c987629f3b814ed80e2a9034
diff --cc ext/phar/tests/phar_commitwrite.phpt
index 56d3498d54,9671737272..7a3b5e7b93
--- a/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 c1ed9555ed,52120fa7f9..4a9bd23a73
--- a/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 6d785d287f,1f6d744917..23d6800598
--- a/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 7a7499eb28,fa9efc7bd2..163622e4dd
--- a/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)