[pull] master from php:master#807
Merged
Merged
Conversation
Align IntlTimeZone::getDisplayName() object error handling for invalid display types with the corresponding IntlDateFormatter behavior, and add coverage for the invalid enum values. Closes GH-22270.
) Add a new --disable-apache2-conf option that prevents apxs from editing httpd.conf during installation. When SYSCONFDIR is non-empty, apxs is invoked with -a, which requires httpd.conf to exist at the target path. This fails when installing into a staging directory (INSTALL_ROOT) where no `httpd.conf` exists but apxs is present and works, and is also unwanted on distributions [like Debian][1] that manage Apache module activation separately (e.g. via a2enmod). [1]: https://salsa.debian.org/php-team/php/-/blob/9bd72dc78216cf136315d765ec3a602ac99e60e3/debian/patches/0030-Add-patch-to-install-php7-module-directly-to-APXS_LI.patch Assisted-by: Claude Sonnet 4.6
[skip ci]
* PHP-8.4: ext/intl: Sync IntlTimeZone object errors for invalid display types
* PHP-8.5: ext/intl: Sync IntlTimeZone object errors for invalid display types
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )