Warnings to errors for imagecreatefromgd2part

We also delete tests which were duplicates of a completely unrelated
test.

Author: marandall

ext/gd/gd.c

@@ -1710,10 +1710,17 @@ static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type,
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), "pllll", &file, &file_len, &srcx, &srcy, &width, &height) == FAILURE) {
 			return;
 		}
-		if (width < 1 || height < 1) {
-			php_error_docref(NULL, E_WARNING, "Zero width or height not allowed");
-			RETURN_FALSE;
+
+		if (width < 1) {
+			zend_throw_error(NULL, "Width must be at least 1");
+			return;
 		}
+
+		if (height < 1) {
+			zend_throw_error(NULL, "Height must be at least 1");
+			return;
+		}
+
 	} else {
 		if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &file, &file_len) == FAILURE) {
 			return;

ext/gd/tests/bug38212-mb.phpt

@@ -6,12 +6,20 @@ Bug #38212 (Seg Fault on invalid imagecreatefromgd2part() parameters)
 ?>
 --FILE--
 <?php
+require __DIR__ . '/func.inc';
+
 $file = __DIR__ . '/bug38212私はガラスを食べられます.gd2';
 $im1 = imagecreatetruecolor(10,100);
 imagefill($im1, 0,0, 0xffffff);
 imagegd2($im1, $file);
-$im = imagecreatefromgd2part($file, 0,0, -25,10);
+
+trycatch_dump(
+    fn() => imagecreatefromgd2part($file, 0,0, -25, 10),
+    fn() => imagecreatefromgd2part($file, 0,0, 10, -25)
+);
+
 unlink($file);
 ?>
---EXPECTF--
-Warning: imagecreatefromgd2part(): Zero width or height not allowed in %s on line %d
+--EXPECT--
+!! [Error] Width must be at least 1
+!! [Error] Height must be at least 1

ext/gd/tests/bug38212.phpt

@@ -6,12 +6,20 @@ Bug #38212 (Seg Fault on invalid imagecreatefromgd2part() parameters)
 ?>
 --FILE--
 <?php
+require __DIR__ . '/func.inc';
+
 $file = __DIR__ . '/bug38212.gd2';
 $im1 = imagecreatetruecolor(10,100);
 imagefill($im1, 0,0, 0xffffff);
 imagegd2($im1, $file);
-$im = imagecreatefromgd2part($file, 0,0, -25,10);
+
+trycatch_dump(
+    fn() => imagecreatefromgd2part($file, 0,0, -25, 10),
+    fn() => imagecreatefromgd2part($file, 0,0, 10, -25)
+);
+
 unlink($file);
 ?>
---EXPECTF--
-Warning: imagecreatefromgd2part(): Zero width or height not allowed in %s on line %d
+--EXPECT--
+!! [Error] Width must be at least 1
+!! [Error] Height must be at least 1