Merge branch 'PHP-8.5' into PHP-8.6

* PHP-8.5:
  Fix alternate form flag for %x testing stale signed value

Author: iliaal

ext/fileinfo/tests/cdf_unknown_property_id.phpt

@@ -0,0 +1,13 @@
+--TEST--
+Unknown CDF property IDs are printed with the 0x prefix
+--EXTENSIONS--
+fileinfo
+--FILE--
+<?php
+$data = file_get_contents(__DIR__ . '/resources/test.ppt');
+$data[40576] = "\x1f";
+$desc = (new finfo())->buffer($data);
+echo substr($desc, strrpos($desc, ', ') + 2), "\n";
+?>
+--EXPECT--
+0x1f: 0

main/snprintf.c

@@ -798,7 +798,7 @@ static size_t format_converter(buffy * odp, const char *fmt, va_list ap) /* {{{
 					}
 					s = ap_php_conv_p2(ui_num, 4, *fmt, &num_buf[NUM_BUF_SIZE], &s_len);
 					FIX_PRECISION(adjust_precision, precision, s, s_len);
-					if (alternate_form && i_num != 0) {
+					if (alternate_form && ui_num != 0) {
 						*--s = *fmt;	/* 'x' or 'X' */
 						*--s = '0';
 						s_len += 2;