Merge branch 'PHP-7.4'

* PHP-7.4:
  Simplify GD null byte injection tests

diff --cc ext/gd/tests/imagegd2_nullbyte_injection.phpt
index 537535b4c203543334b460e41b69b9d41078ebfc,2fc3050421194be444b6720068ed7068458ae3ce..856acaefeea899902578d6dba43c9bf12a052a54
--- 1/ext/gd/tests/imagegd2_nullbyte_injection.phpt
--- 2/ext/gd/tests/imagegd2_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd2_nullbyte_injection.phpt
@@@ -7,30 -7,8 +7,9 @@@ Testing null byte injection in imagegd
  --FILE--
  <?php
  $image = imagecreate(1,1);// 1px image
- 
- $tempdir = sprintf("%s/%s", sys_get_temp_dir(), preg_replace("~\.php$~", null, __FILE__));
- if (!is_dir($tempdir)) {
-       mkdir ($tempdir, 0777, true);
- }
- 
- $userinput = "1\0"; // from post or get data
- $temp = $tempdir. "/test" . $userinput .".tmp";
- 
- echo "\nimagegd2 TEST\n";
- try {
-     imagegd2($image, $temp);
- } catch (TypeError $e) {
-     echo $e->getMessage(), "\n";
- }
- var_dump(file_exists($tempdir. "/test1"));
- var_dump(file_exists($tempdir. "/test1.tmp"));
+ var_dump(imagegd2($image, "./foo\0bar"));
+ ?>
 ---EXPECTF--
 +?>
 +--EXPECT--
- imagegd2 TEST
- imagegd2() expects parameter 2 to be a valid path, string given
- bool(false)
- bool(false)
+ Warning: imagegd2() expects parameter 2 to be a valid path, string given in %s on line %d
+ NULL

diff --cc ext/gd/tests/imagegd_nullbyte_injection.phpt
index dbfff3bd938e1a0e4114769362960bf49b15361c,f5479a0050638efe06ef342ded505e12f436f949..6bcc0ee2bce12ce579f05ec23a6ccd0f14e36b7b
--- 1/ext/gd/tests/imagegd_nullbyte_injection.phpt
--- 2/ext/gd/tests/imagegd_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd_nullbyte_injection.phpt
@@@ -7,30 -7,8 +7,8 @@@ Testing null byte injection in imageg
  --FILE--
  <?php
  $image = imagecreate(1,1);// 1px image
- 
- $tempdir = sprintf("%s/%s", sys_get_temp_dir(), preg_replace("~\.php$~", null, __FILE__));
- if (!is_dir($tempdir)) {
-       mkdir ($tempdir, 0777, true);
- }
- 
- $userinput = "1\0"; // from post or get data
- $temp = $tempdir. "/test" . $userinput .".tmp";
- 
- echo "\nimagegd TEST\n";
- try {
-     imagegd($image, $temp);
- } catch (TypeError $e) {
-     echo $e->getMessage(), "\n";
- }
- var_dump(file_exists($tempdir. "/test1"));
- var_dump(file_exists($tempdir. "/test1.tmp"));
+ var_dump(imagegd($image, "./foo\0bar"));
  ?>
 ---EXPECTF--
 +--EXPECT--
- imagegd TEST
- imagegd() expects parameter 2 to be a valid path, string given
- bool(false)
- bool(false)
+ Warning: imagegd() expects parameter 2 to be a valid path, string given in %s on line %d
+ NULL