Merge branch 'PHP-8.5'

ndossche · ndossche · commit d837199d7a29 · 2026-06-01T20:22:00.000+02:00
* PHP-8.5: Fix -Werror compile error in `zend_dval_to_lval_cap()` (#22196)
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
@@ -147,6 +147,7 @@ static zend_always_inline zend_long zend_dval_to_lval_silent(double d)
 /* Used to convert a string float to integer during an (int) cast */
 static zend_always_inline zend_long zend_dval_to_lval_cap(double d)
 {
+	ZEND_IGNORE_VALUE(s);
 	if (UNEXPECTED(!zend_finite(d))) {
 		return 0;
 	} else if (!ZEND_DOUBLE_FITS_LONG(d)) {

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ static zend_always_inline zend_long zend_dval_to_lval_silent(double d)`
`147`	`147`	`/* Used to convert a string float to integer during an (int) cast */`
`148`	`148`	`static zend_always_inline zend_long zend_dval_to_lval_cap(double d)`
`149`	`149`	`{`
	`150`	`+ ZEND_IGNORE_VALUE(s);`
`150`	`151`	`if (UNEXPECTED(!zend_finite(d))) {`
`151`	`152`	`return 0;`
`152`	`153`	`} else if (!ZEND_DOUBLE_FITS_LONG(d)) {`