Merge branch 'PHP-7.4' into master

cmb69 · cmb69 · commit 7769ae18a17e · 2020-09-03T10:33:35.000+02:00
* PHP-7.4:
  Skip test if A: drive exists
diff --git a/ext/phar/tests/bug71625.phpt b/ext/phar/tests/bug71625.phpt
@@ -9,6 +9,7 @@ if (!extension_loaded("phar") || !extension_loaded("zlib")) die("skip");
 if(substr(PHP_OS, 0, 3) != 'WIN' ) {
     die('skip windows only test');
 }
+if (file_exists('A:')) die('skip drive A: exists');
 
 ?>
 --FILE--

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ if (!extension_loaded("phar") \|\| !extension_loaded("zlib")) die("skip");`
`9`	`9`	`if(substr(PHP_OS, 0, 3) != 'WIN' ) {`
`10`	`10`	`die('skip windows only test');`
`11`	`11`	`}`
	`12`	`+if (file_exists('A:')) die('skip drive A: exists');`
`12`	`13`
`13`	`14`	`?>`
`14`	`15`	`--FILE--`