From: Joe Watkins <krakjoe@php.net>
Date: Wed, 12 Jun 2019 05:55:21 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74a82ca91c7a34912c17737e3ba2900f550f7724;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  fix flaky gd tests
---

74a82ca91c7a34912c17737e3ba2900f550f7724
diff --cc ext/gd/tests/imagegd2_nullbyte_injection.phpt
index 5eae5c719c,4307704ee2..537535b4c2
--- a/ext/gd/tests/imagegd2_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd2_nullbyte_injection.phpt
@@@ -22,16 -21,12 +21,16 @@@ $userinput = "1\0"; // from post or ge
  $temp = $tempdir. "/test" . $userinput .".tmp";
  
  echo "\nimagegd2 TEST\n";
 -imagegd2($image, $temp);
 +try {
 +    imagegd2($image, $temp);
 +} catch (TypeError $e) {
 +    echo $e->getMessage(), "\n";
 +}
  var_dump(file_exists($tempdir. "/test1"));
  var_dump(file_exists($tempdir. "/test1.tmp"));
- foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
 ---EXPECTF--
++?>
 +--EXPECT--
  imagegd2 TEST
 -
 -Warning: imagegd2() expects parameter 2 to be a valid path, string given in %s on line %d
 +imagegd2() expects parameter 2 to be a valid path, string given
  bool(false)
  bool(false)
diff --cc ext/gd/tests/imagegd_nullbyte_injection.phpt
index 235bd4680c,f904bbf174..dbfff3bd93
--- a/ext/gd/tests/imagegd_nullbyte_injection.phpt
+++ b/ext/gd/tests/imagegd_nullbyte_injection.phpt
@@@ -22,16 -21,13 +21,16 @@@ $userinput = "1\0"; // from post or ge
  $temp = $tempdir. "/test" . $userinput .".tmp";
  
  echo "\nimagegd TEST\n";
 -imagegd($image, $temp);
 +try {
 +    imagegd($image, $temp);
 +} catch (TypeError $e) {
 +    echo $e->getMessage(), "\n";
 +}
  var_dump(file_exists($tempdir. "/test1"));
  var_dump(file_exists($tempdir. "/test1.tmp"));
- foreach (glob($tempdir . "/test*") as $file ) { unlink($file); }
+ ?>
 ---EXPECTF--
 +--EXPECT--
  imagegd TEST
 -
 -Warning: imagegd() expects parameter 2 to be a valid path, string given in %s on line %d
 +imagegd() expects parameter 2 to be a valid path, string given
  bool(false)
  bool(false)