use a actual fix for testing

Author: LamentXU123

NEWS

@@ -35,6 +35,8 @@ PHP                                                                        NEWS
     wrong argument in error messages. (Weilin Du)
   . Fixed imageaffinematrixget() to enforce the documented array|float type
     for the $options parameter. (Weilin Du)
+  . Fixed imageaffinematrixget() accepting non-convertible "x" and "y" entries
+    for translate and scale matrices. (Weilin Du)
 
 - Intl:
   . Fixed grapheme_strrev() treating UBRK_DONE as a byte index and leaving

UPGRADING

@@ -54,6 +54,9 @@ PHP 8.6 UPGRADE NOTES
   . imageaffinematrixget() now enforces the documented array|float type for the
     $options parameter, including the corresponding weak and strict typing
     behavior.
+  . The "x" and "y" entries accepted by imageaffinematrixget() for translate
+    and scale matrices now throw a TypeError when they cannot be converted to
+    float, instead of coercing arbitrary values.
 
 - GMP:
   . GMP power and shift operators now throw a ValueError when GMP right operands

ext/gd/gd.c

@@ -3844,6 +3844,18 @@ static bool php_gd_zval_try_get_c_int(zval *tmp, const char *field, int *res) {
 	return true;
 }
 
+static bool php_gd_zval_try_get_double(const zval *value, const char *field, double *res) {
+	bool failed;
+	*res = zval_try_get_double(value, &failed);
+	if (UNEXPECTED(failed)) {
+		if (!EG(exception)) {
+			zend_argument_type_error(2, "\"%s\" key must be of type float, %s given", field, zend_zval_type_name(value));
+		}
+		return false;
+	}
+	return true;
+}
+
 /* {{{ Crop an image using the given coordinates and size, x, y, width and height. */
 PHP_FUNCTION(imagecrop)
 {
@@ -4190,14 +4202,18 @@ PHP_FUNCTION(imageaffinematrixget)
 			}
 
 			if ((tmp = zend_hash_str_find(options, "x", sizeof("x") - 1)) != NULL) {
-				x = zval_get_double(tmp);
+				if (!php_gd_zval_try_get_double(tmp, "x", &x)) {
+					RETURN_THROWS();
+				}
 			} else {
 				zend_argument_value_error(2, "must have an \"x\" key");
 				RETURN_THROWS();
 			}
 
 			if ((tmp = zend_hash_str_find(options, "y", sizeof("y") - 1)) != NULL) {
-				y = zval_get_double(tmp);
+				if (!php_gd_zval_try_get_double(tmp, "y", &y)) {
+					RETURN_THROWS();
+				}
 			} else {
 				zend_argument_value_error(2, "must have a \"y\" key");
 				RETURN_THROWS();

ext/gd/tests/imageaffinematrixget_options.phpt

@@ -0,0 +1,99 @@
+--TEST--
+imageaffinematrixget() translate option conversions
+--EXTENSIONS--
+gd
+--FILE--
+<?php
+
+$resource = fopen(__FILE__, 'r');
+$values = [
+    'null' => null,
+    'false' => false,
+    'true' => true,
+    'int' => 42,
+    'float' => 42.5,
+    'numeric integer string' => '42',
+    'numeric float string' => '42.5',
+    'numeric scientific string' => '1e3',
+    'non-numeric string' => 'not numeric',
+    'array' => [],
+    'object' => new stdClass(),
+    'resource' => $resource,
+];
+
+foreach ($values as $name => $value) {
+    echo "$name:\n";
+    try {
+        $matrix = imageaffinematrixget(IMG_AFFINE_TRANSLATE, ['x' => $value, 'y' => 0]);
+        var_dump($matrix[4]);
+    } catch (Throwable $e) {
+        echo $e::class, ': ', $e->getMessage(), "\n";
+    }
+}
+
+echo "references:\n";
+$x = 1.5;
+$y = 2.5;
+$matrix = imageaffinematrixget(IMG_AFFINE_TRANSLATE, ['x' => &$x, 'y' => &$y]);
+var_dump($matrix[4], $matrix[5]);
+
+echo "invalid y:\n";
+try {
+    imageaffinematrixget(IMG_AFFINE_TRANSLATE, ['x' => 0, 'y' => []]);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+echo "trailing data:\n";
+$matrix = imageaffinematrixget(IMG_AFFINE_TRANSLATE, ['x' => '42 with trailing data', 'y' => 0]);
+var_dump($matrix[4]);
+
+echo "warning converted to exception:\n";
+set_error_handler(static function (int $errno, string $errstr): never {
+    throw new Exception($errstr);
+});
+try {
+    imageaffinematrixget(IMG_AFFINE_TRANSLATE, ['x' => '42 with trailing data', 'y' => 0]);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+fclose($resource);
+
+?>
+--EXPECTF--
+null:
+float(0)
+false:
+float(0)
+true:
+float(1)
+int:
+float(42)
+float:
+float(42.5)
+numeric integer string:
+float(42)
+numeric float string:
+float(42.5)
+numeric scientific string:
+float(1000)
+non-numeric string:
+TypeError: imageaffinematrixget(): Argument #2 ($options) "x" key must be of type float, string given
+array:
+TypeError: imageaffinematrixget(): Argument #2 ($options) "x" key must be of type float, array given
+object:
+TypeError: imageaffinematrixget(): Argument #2 ($options) "x" key must be of type float, stdClass given
+resource:
+TypeError: imageaffinematrixget(): Argument #2 ($options) "x" key must be of type float, resource given
+references:
+float(1.5)
+float(2.5)
+invalid y:
+TypeError: imageaffinematrixget(): Argument #2 ($options) "y" key must be of type float, array given
+trailing data:
+
+Warning: A non-numeric value encountered in %s on line %d
+float(42)
+warning converted to exception:
+Exception: A non-numeric value encountered

ext/zend_test/test.c

@@ -1138,25 +1138,6 @@ static ZEND_FUNCTION(zend_test_refcount)
 	RETURN_LONG(Z_REFCOUNT_P(value));
 }
 
-static ZEND_FUNCTION(zend_test_zval_try_get_double)
-{
-	zval *value;
-
-	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_ZVAL(value)
-	ZEND_PARSE_PARAMETERS_END();
-
-	bool failed;
-	double result = zval_try_get_double(value, &failed);
-	if (UNEXPECTED(EG(exception))) {
-		RETURN_THROWS();
-	}
-
-	array_init(return_value);
-	add_assoc_double(return_value, "value", result);
-	add_assoc_bool(return_value, "failed", failed);
-}
-
 static ZEND_FUNCTION(zend_get_unit_enum)
 {
 	ZEND_PARSE_PARAMETERS_NONE();

ext/zend_test/test.stub.php

@@ -406,8 +406,6 @@ function zend_test_call_with_consumed_args(callable $cb, array $args, int $consu
 
     function zend_test_refcount(mixed $value): int {}
 
-    function zend_test_zval_try_get_double(mixed $value): array {}
-
     function zend_test_zend_ini_parse_quantity(string $str): int {}
     function zend_test_zend_ini_parse_uquantity(string $str): int {}