Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Fix GH-18695: float numbers zero fraction is now preserved in zend_ast_export() (#18699)
This commit is contained in:
Daniel Scherzer 2025-05-29 13:48:38 -07:00
commit e44c13cffe
No known key found for this signature in database
GPG key ID: EC64F10448CEAB6F
3 changed files with 29 additions and 1 deletions

2
NEWS
View file

@ -10,6 +10,8 @@ PHP NEWS
. Fixed bugs GH-17711 and GH-18022 (Infinite recursion on deprecated attribute . Fixed bugs GH-17711 and GH-18022 (Infinite recursion on deprecated attribute
evaluation) and GH-18464 (Recursion protection for deprecation constants not evaluation) and GH-18464 (Recursion protection for deprecation constants not
released on bailout). (DanielEScherzer and ilutov) released on bailout). (DanielEScherzer and ilutov)
. Fixed GH-18695 (zend_ast_export() - float number is not preserved).
(Oleg Efimov)
- Date: - Date:
. Fix leaks with multiple calls to DatePeriod iterator current(). (nielsdos) . Fix leaks with multiple calls to DatePeriod iterator current(). (nielsdos)

View file

@ -0,0 +1,26 @@
--TEST--
Serialization of floats are correct
--INI--
zend.assertions=1
--FILE--
<?php
try {
assert(!is_float(0.0));
} catch (AssertionError $e) {
echo 'assert(): ', $e->getMessage(), ' failed', PHP_EOL;
}
try {
assert(!is_float(1.1));
} catch (AssertionError $e) {
echo 'assert(): ', $e->getMessage(), ' failed', PHP_EOL;
}
try {
assert(!is_float(1234.5678));
} catch (AssertionError $e) {
echo 'assert(): ', $e->getMessage(), ' failed', PHP_EOL;
}
?>
--EXPECT--
assert(): assert(!is_float(0.0)) failed
assert(): assert(!is_float(1.1)) failed
assert(): assert(!is_float(1234.5678)) failed

View file

@ -1608,7 +1608,7 @@ static ZEND_COLD void zend_ast_export_zval(smart_str *str, zval *zv, int priorit
break; break;
case IS_DOUBLE: case IS_DOUBLE:
smart_str_append_double( smart_str_append_double(
str, Z_DVAL_P(zv), (int) EG(precision), /* zero_fraction */ false); str, Z_DVAL_P(zv), (int) EG(precision), /* zero_fraction */ true);
break; break;
case IS_STRING: case IS_STRING:
smart_str_appendc(str, '\''); smart_str_appendc(str, '\'');