Skip to content

[pull] master from php:master #970

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 16, 2025
Merged

[pull] master from php:master #970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a97717d
Fix GH-19021: deprecation for tidyOptIsReadOnly
arjendekorte Aug 16, 2025
0fc3a2e
Merge branch 'PHP-8.3' into PHP-8.4
devnexen Aug 16, 2025
1299376
Merge branch 'PHP-8.4'
devnexen Aug 16, 2025
096938f
Remove `report_memleaks` entry from php.ini-* (#19502)
alexandre-daubois Aug 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion ext/tidy/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ if test "$PHP_TIDY" != "no"; then
[],
[-L$TIDY_LIBDIR])

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],
[Define to 1 if Tidy library has the 'tidyOptGetCategory' function.])],
[],
Expand Down
7 changes: 0 additions & 7 deletions php.ini-development
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 0 additions & 7 deletions php.ini-production
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down