Merge branch 'PHP-8.5' into PHP-8.6

* PHP-8.5:
  Fix argument number in curl_multi_setopt() CURLMOPT_PUSHFUNCTION error (#25367)
  Fix the argument named by the imageaffine() element TypeError (#25369)

Author: TimWolla

ext/curl/multi.c

@@ -480,7 +480,7 @@ static bool _php_curl_multi_setopt(php_curlm *mh, zend_long option, zval *zvalue
 			char *error_str = NULL;
 			if (UNEXPECTED(!zend_is_callable_ex(zvalue, /* object */ NULL, /* check_flags */ 0, /* callable_name */ NULL, &mh->handlers.server_push, /* error */ &error_str))) {
 				if (!EG(exception)) {
-					zend_argument_type_error(2, "must be a valid callback for option CURLMOPT_PUSHFUNCTION, %s", error_str);
+					zend_argument_type_error(3, "must be a valid callback for option CURLMOPT_PUSHFUNCTION, %s", error_str);
 				}
 				efree(error_str);
 				return false;

ext/curl/tests/curl_multi_setopt_callables.phpt

@@ -14,4 +14,4 @@ try {
 
 ?>
 --EXPECT--
-TypeError: curl_multi_setopt(): Argument #2 ($option) must be a valid callback for option CURLMOPT_PUSHFUNCTION, function "undefined" not found or invalid function name
+TypeError: curl_multi_setopt(): Argument #3 ($value) must be a valid callback for option CURLMOPT_PUSHFUNCTION, function "undefined" not found or invalid function name

ext/gd/gd.c

@@ -4128,7 +4128,7 @@ PHP_FUNCTION(imageaffine)
 					}
 					break;
 				default:
-					zend_argument_type_error(3, "contains invalid type for element %i", i);
+					zend_argument_type_error(2, "contains invalid type for element %i", i);
 					RETURN_THROWS();
 			}
 		}

ext/gd/tests/imageaffine_element_type_error.phpt

@@ -0,0 +1,15 @@
+--TEST--
+imageaffine(): the TypeError for an invalid element names the $affine argument
+--EXTENSIONS--
+gd
+--FILE--
+<?php
+$im = imagecreatetruecolor(20, 20);
+try {
+    imageaffine($im, [1, 0, null, 1, 0, 0]);
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+TypeError: imageaffine(): Argument #2 ($affine) contains invalid type for element 2