gd tweaks

Author: nikic

ext/gd/tests/imagecolorallocatealpha_error1.phpt

@@ -9,17 +9,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 --FILE--
 <?php
 $resource = tmpfile();
-
 imagecolorallocatealpha($resource, 255, 255, 255, 50);
-imagecolorallocatealpha('string', 255, 255, 255, 50);
-imagecolorallocatealpha(array(), 255, 255, 255, 50);
-imagecolorallocatealpha(null, 255, 255, 255, 50);
 ?>
 --EXPECTF--
 Warning: imagecolorallocatealpha(): supplied resource is not a valid Image resource in %s on line %d
-
-Warning: imagecolorallocatealpha() expects parameter 1 to be resource, %s given in %s on line %d
-
-Warning: imagecolorallocatealpha() expects parameter 1 to be resource, array given in %s on line %d
-
-Warning: imagecolorallocatealpha() expects parameter 1 to be resource, null given in %s on line %d

ext/gd/tests/imagecolorstotal_error.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Test imagecolorstotal() function : error conditions  - Pass incorrect number of arguments
+Test imagecolorstotal() function : error conditions - Pass invalid resource type
 --SKIPIF--
 <?php
 if(!extension_loaded('gd')) {
@@ -21,13 +21,6 @@ echo "*** Testing imagecolorstotal() : error conditions ***\n";
 // Get a resource
 $im = fopen(__FILE__, 'r');
 
-echo "\n-- Testing imagecolorstotal() function with Zero arguments --\n";
-var_dump( imagecolorstotal() );
-
-echo "\n-- Testing imagecolorstotal() function with more than expected no. of arguments --\n";
-$extra_arg = false;
-var_dump( imagecolorstotal($im, $extra_arg) );
-
 echo "\n-- Testing imagecolorstotal() function with a invalid resource\n";
 var_dump( imagecolorstotal($im) );
 
@@ -37,16 +30,6 @@ fclose($im);
 --EXPECTF--
 *** Testing imagecolorstotal() : error conditions ***
 
--- Testing imagecolorstotal() function with Zero arguments --
-
-Warning: imagecolorstotal() expects exactly 1 parameter, 0 given in %s on line %d
-NULL
-
--- Testing imagecolorstotal() function with more than expected no. of arguments --
-
-Warning: imagecolorstotal() expects exactly 1 parameter, 2 given in %s on line %d
-NULL
-
 -- Testing imagecolorstotal() function with a invalid resource
 
 Warning: imagecolorstotal(): supplied resource is not a valid Image resource in %s on line %d

ext/gd/tests/imagecreatetruecolor_error2.phpt

@@ -11,14 +11,8 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 <?php
 $image = imagecreatetruecolor(-1, 30);
 $image = imagecreatetruecolor(30, -1);
-$image = imagecreatetruecolor(999999999999999999999999999, 30);
-$image = imagecreatetruecolor(30, 999999999999999999999999999);
 ?>
 --EXPECTF--
 Warning: imagecreatetruecolor(): Invalid image dimensions in %s on line %d
 
 Warning: imagecreatetruecolor(): Invalid image dimensions in %s on line %d
-
-Warning: imagecreatetruecolor() expects parameter 1 to be int, float given in %s on line %d
-
-Warning: imagecreatetruecolor() expects parameter 2 to be int, float given in %s on line %d

ext/gd/tests/imagefilter_error1.phpt

@@ -11,8 +11,11 @@ if (!extension_loaded("gd")) die("skip GD not present");
 <?php
 $image = imagecreatetruecolor(180, 30);
 
-var_dump(imagefilter($image));
+try {
+    var_dump(imagefilter($image));
+} catch (TypeError $e) {
+    echo $e->getMessage(), "\n";
+}
 ?>
---EXPECTF--
-Warning: Wrong parameter count for imagefilter() in %s on line %d
-NULL
+--EXPECT--
+Wrong parameter count for imagefilter()

ext/gd/tests/imagegd2_nullbyte_injection.phpt

@@ -22,13 +22,16 @@ $userinput = "1\0"; // from post or get data
 $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)

ext/gd/tests/imagegd_nullbyte_injection.phpt

@@ -22,13 +22,16 @@ $userinput = "1\0"; // from post or get data
 $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)

ext/gd/tests/imageistruecolor_error1.phpt

@@ -9,16 +9,8 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 ?>
 --FILE--
 <?php
-$image = imagecreatetruecolor(180, 30);
 $resource = tmpfile();
-
-imageistruecolor('string');
 imageistruecolor($resource);
-imageistruecolor(array());
 ?>
 --EXPECTF--
-Warning: imageistruecolor() expects parameter 1 to be resource, string given in %s on line %d
-
 Warning: imageistruecolor(): supplied resource is not a valid Image resource in %s on line %d
-
-Warning: imageistruecolor() expects parameter 1 to be resource, array given in %s on line %d

ext/gd/tests/imagesetthickness_error1.phpt

@@ -9,14 +9,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 --FILE--
 <?php
 $resource = tmpfile();
-
-imagesetthickness('string', 5);
-imagesetthickness(array(), 5);
 imagesetthickness($resource, 5);
 ?>
 --EXPECTF--
-Warning: imagesetthickness() expects parameter 1 to be resource, %s given in %s on line %d
-
-Warning: imagesetthickness() expects parameter 1 to be resource, array given in %s on line %d
-
 Warning: imagesetthickness(): supplied resource is not a valid Image resource in %s on line %d

ext/gd/tests/imagetruecolortopalette_error1.phpt

@@ -10,17 +10,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 --FILE--
 <?php
 $resource = tmpfile();
-
 imagetruecolortopalette($resource, true, 2);
-imagetruecolortopalette('string', true, 2);
-imagetruecolortopalette(array(), true, 2);
-imagetruecolortopalette(null, true, 2);
 ?>
 --EXPECTF--
 Warning: imagetruecolortopalette(): supplied resource is not a valid Image resource in %s on line %d
-
-Warning: imagetruecolortopalette() expects parameter 1 to be resource, %s given in %s on line %d
-
-Warning: imagetruecolortopalette() expects parameter 1 to be resource, array given in %s on line %d
-
-Warning: imagetruecolortopalette() expects parameter 1 to be resource, null given in %s on line %d

ext/gd/tests/imagetruecolortopalette_error3.phpt

@@ -10,19 +10,7 @@ Rafael Dohms <rdohms [at] gmail [dot] com>
 --FILE--
 <?php
 $image = imagecreatetruecolor(50, 50);
-$resource = tmpfile();
-
-imagetruecolortopalette($image, true, 'string');
-imagetruecolortopalette($image, true, $resource);
-imagetruecolortopalette($image, true, array());
 imagetruecolortopalette($image, true, null);
-
 ?>
 --EXPECTF--
-Warning: imagetruecolortopalette() expects parameter 3 to be int, string given in %s on line %d
-
-Warning: imagetruecolortopalette() expects parameter 3 to be int, resource given in %s on line %d
-
-Warning: imagetruecolortopalette() expects parameter 3 to be int, array given in %s on line %d
-
 Warning: imagetruecolortopalette(): Number of colors has to be greater than zero and no more than %d in %s on line %d