From a97717d23e27e918249ff3653a72da86c8f54a1c Mon Sep 17 00:00:00 2001 From: Arjen de Korte Date: Sat, 16 Aug 2025 18:59:41 +0200 Subject: [PATCH 1/2] Fix GH-19021: deprecation for tidyOptIsReadOnly The tidyOptGetCategory function (added in libtidy 5.4.0) if only useable if TidyInternalCategory (added in libtidy 5.6.0) is also present, so check for the latter instead. close GH-19053 --- NEWS | 5 +++++ ext/tidy/config.m4 | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 17424b38a72d5..858b7190cd207 100644 --- a/NEWS +++ b/NEWS @@ -17,6 +17,11 @@ PHP NEWS - Standard: . Fixed bug GH-16649 (UAF during array_splice). (alexandre-daubois) +- Tidy: + . Fixed GH-19021 build issue with libtidy in regard of tidyOptIsReadonly + deprecation and TidyInternalCategory being available later than + tidyOptGetCategory. (arjendekorte) + 28 Aug 2025, PHP 8.3.25 - Core: diff --git a/ext/tidy/config.m4 b/ext/tidy/config.m4 index 569cb3672944b..802e12fc367c0 100644 --- a/ext/tidy/config.m4 +++ b/ext/tidy/config.m4 @@ -62,7 +62,9 @@ if test "$PHP_TIDY" != "no"; then AC_DEFINE(HAVE_TIDYRELEASEDATE,1,[ ]) ], [], []) - PHP_CHECK_LIBRARY($TIDY_LIB_NAME,tidyOptGetCategory, + dnl The tidyOptGetCategory function (added in libtidy 5.4.0) if only useable + dnl if TidyInternalCategory (added in libtidy 5.6.0) is also present. + PHP_CHECK_LIBRARY($TIDY_LIB_NAME,TidyInternalCategory, [ AC_DEFINE(HAVE_TIDYOPTGETCATEGORY,1,[ ]) ], [], []) From 096938fd4a6028e03f78b25172f1b91cc068d89f Mon Sep 17 00:00:00 2001 From: Alexandre Daubois <2144837+alexandre-daubois@users.noreply.github.com> Date: Sat, 16 Aug 2025 20:41:03 +0200 Subject: [PATCH 2/2] Remove `report_memleaks` entry from php.ini-* (#19502) --- php.ini-development | 7 ------- php.ini-production | 7 ------- 2 files changed, 14 deletions(-) diff --git a/php.ini-development b/php.ini-development index 852561435b1d0..5cbf6a54ee44c 100644 --- a/php.ini-development +++ b/php.ini-development @@ -537,13 +537,6 @@ ignore_repeated_errors = Off ; https://php.net/ignore-repeated-source ignore_repeated_source = Off -; Use of this INI entry is deprecated, it will be removed in PHP 9.0. -; If this parameter is set to Off, then memory leaks will not be shown (on -; stdout or in the log). This is only effective in a debug compile, and if -; error reporting includes E_WARNING in the allowed list -; https://php.net/report-memleaks -;report_memleaks = On - ; This setting is off by default. ;report_zend_debug = 0 diff --git a/php.ini-production b/php.ini-production index fea8830e56fca..697c7073ebde0 100644 --- a/php.ini-production +++ b/php.ini-production @@ -539,13 +539,6 @@ ignore_repeated_errors = Off ; https://php.net/ignore-repeated-source ignore_repeated_source = Off -; Use of this INI entry is deprecated, it will be removed in PHP 9.0. -; If this parameter is set to Off, then memory leaks will not be shown (on -; stdout or in the log). This is only effective in a debug compile, and if -; error reporting includes E_WARNING in the allowed list -; https://php.net/report-memleaks -;report_memleaks = On - ; This setting is off by default. ;report_zend_debug = 0