Merge branch 'PHP-7.4'

Author: nikic

ext/dba/tests/CONFLICTS

@@ -0,0 +1,2 @@
+# Many of these tests work on the same database file
+dba

ext/zip/tests/oo_addglob.phpt

@@ -11,11 +11,12 @@ if(!defined("GLOB_BRACE")) die ('skip');
 ?>
 --FILE--
 <?php
-$dirname = dirname(__FILE__) . '/';
-include $dirname . 'utils.inc';
-$file = $dirname . '__tmp_oo_addglob.zip';
+include __DIR__ . '/utils.inc';
+$dirname = __DIR__ . '/oo_addglob_dir/';
+$file = $dirname . 'tmp.zip';
 
-copy($dirname . 'test.zip', $file);
+@mkdir($dirname);
+copy(__DIR__ . '/test.zip', $file);
 touch($dirname . 'foo.txt');
 touch($dirname . 'bar.baz');
 
@@ -36,10 +37,11 @@ if ($zip->status == ZIPARCHIVE::ER_OK) {
 ?>
 --CLEAN--
 <?php
-$dirname = dirname(__FILE__) . '/';
-unlink($dirname . '__tmp_oo_addglob.zip');
+$dirname = __DIR__ . '/oo_addglob_dir/';
+unlink($dirname . 'tmp.zip');
 unlink($dirname . 'foo.txt');
 unlink($dirname . 'bar.baz');
+rmdir($dirname);
 ?>
 --EXPECT--
 0 bar