Merge branch 'PHP-7.4'

Author: nikic

ext/opcache/ZendAccelerator.c

@@ -3275,7 +3275,7 @@ static void get_unresolved_initializer(zend_class_entry *ce, const char **kind,
 	ZEND_HASH_FOREACH_STR_KEY_PTR(&ce->properties_info, key, prop) {
 		zval *val;
 		if (prop->flags & ZEND_ACC_STATIC) {
-			val = &ce->default_static_members_table[OBJ_PROP_TO_NUM(prop->offset)];
+			val = &ce->default_static_members_table[prop->offset];
 		} else {
 			val = &ce->default_properties_table[OBJ_PROP_TO_NUM(prop->offset)];
 		}

ext/phar/tests/tar/require_hash.phpt

@@ -9,9 +9,9 @@ phar.require_hash=0
 <?php
 ini_set('phar.require_hash', 1);
 include dirname(__FILE__) . '/files/tarmaker.php.inc';
-$fname = dirname(__FILE__) . '/tar_004.phar.tar';
+$fname = dirname(__FILE__) . '/require_hash.phar.tar';
 $alias = 'phar://' . $fname;
-$fname2 = dirname(__FILE__) . '/tar_004.tar';
+$fname2 = dirname(__FILE__) . '/require_hash.tar';
 
 $tar = new tarmaker($fname, 'none');
 $tar->init();
@@ -41,11 +41,11 @@ try {
 ===DONE===
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . '/tar_004.phar.tar');
-@unlink(dirname(__FILE__) . '/tar_004.tar');
+@unlink(dirname(__FILE__) . '/require_hash.phar.tar');
+@unlink(dirname(__FILE__) . '/require_hash.tar');
 ?>
 --EXPECTF--
-tar-based phar "%star_004.phar.tar" does not have a signature
+tar-based phar "%srequire_hash.phar.tar" does not have a signature
 bool(false)
 array(2) {
   ["hash"]=>

ext/phar/tests/tar/tar_nostub.phpt

@@ -8,9 +8,9 @@ phar.require_hash=0
 --FILE--
 <?php
 include dirname(__FILE__) . '/files/tarmaker.php.inc';
-$fname = dirname(__FILE__) . '/tar_004.phar.tar';
+$fname = dirname(__FILE__) . '/tar_nostub.phar.tar';
 $alias = 'phar://' . $fname;
-$fname2 = dirname(__FILE__) . '/tar_004.tar';
+$fname2 = dirname(__FILE__) . '/tar_nostub.tar';
 
 $tar = new tarmaker($fname, 'none');
 $tar->init();
@@ -38,11 +38,11 @@ try {
 ===DONE===
 --CLEAN--
 <?php
-@unlink(dirname(__FILE__) . '/tar_004.phar.tar');
-@unlink(dirname(__FILE__) . '/tar_004.tar');
+@unlink(dirname(__FILE__) . '/tar_nostub.phar.tar');
+@unlink(dirname(__FILE__) . '/tar_nostub.tar');
 ?>
 --EXPECTF--
-RecursiveDirectoryIterator::__construct(phar://%star_004.phar.tar/): failed to open dir: '%star_004.phar.tar' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive
-phar url "phar://%star_004.phar.tar/" is unknown
+RecursiveDirectoryIterator::__construct(phar://%star_nostub.phar.tar/): failed to open dir: '%star_nostub.phar.tar' is not a phar archive. Use PharData::__construct() for a standard zip or tar archive
+phar url "phar://%star_nostub.phar.tar/" is unknown
 string(0) ""
 ===DONE===

ext/zlib/tests/gzfile_variation15.phpt

@@ -8,6 +8,7 @@ if (!extension_loaded("zlib")) {
 ?>
 --FILE--
 <?php
+$thisTestDir = 'gzfile_variation15.dir';
 require_once('reading_include_path.inc');
 
 //define the files to go into these directories, create one in dir2

ext/zlib/tests/gzopen_variation4.phpt

@@ -16,6 +16,7 @@ if (!extension_loaded("zlib")) {
 
 echo "*** Testing gzopen() : usage variation ***\n";
 
+$thisTestDir = 'gzopen_variation4.dir';
 require_once('reading_include_path.inc');
 
 //define the files to go into these directories, create one in dir2

ext/zlib/tests/readgzfile_variation15.phpt

@@ -8,6 +8,7 @@ if (!extension_loaded("zlib")) {
 ?>
 --FILE--
 <?php
+$thisTestDir = 'readgzfile_variation15.dir';
 require_once('reading_include_path.inc');
 
 //define the files to go into these directories, create one in dir2

ext/zlib/tests/reading_include_path.inc

@@ -1,5 +1,4 @@
 <?php
-$thisTestDir = "zlibVariation.dir";
 mkdir($thisTestDir);
 chdir($thisTestDir);