[pull] master from php:master #422
Merged
Conversation
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
* PHP-8.1: [skip ci] Backport GA root workflow changes
* PHP-8.2: [skip ci] Backport GA root workflow changes
* PHP-8.3: [skip ci] Backport GA root workflow changes
* PHP-8.4: [skip ci] Backport GA root workflow changes
* PHP-8.1: Make MySQLnd protocol stmt test work on 32bit
* PHP-8.2: Make MySQLnd protocol stmt test work on 32bit
* PHP-8.3: Make MySQLnd protocol stmt test work on 32bit
* PHP-8.4: Make MySQLnd protocol stmt test work on 32bit
There are compile errors with 8.4 that we are no longer fixing.
* PHP-8.1: [skip ci] Don't test mysqli with libmysqlclient 8.4
* PHP-8.2: [skip ci] Don't test mysqli with libmysqlclient 8.4
* PHP-8.3: [skip ci] Don't test mysqli with libmysqlclient 8.4
* PHP-8.4: [skip ci] Don't test mysqli with libmysqlclient 8.4
* PHP-8.1: Move FreeBSD build to GitHub actions with QEMU
* PHP-8.2: [skip ci] Add --no-progress to FreeBSD build Move FreeBSD build to GitHub actions with QEMU
* PHP-8.3: [skip ci] Add --no-progress to FreeBSD build Move FreeBSD build to GitHub actions with QEMU
* PHP-8.4: Enable -Werror for FreeBSD build [skip ci] Add --no-progress to FreeBSD build Move FreeBSD build to GitHub actions with QEMU
While the test obviously succeeds on Windows, it may occasionally conflict with file_put_contents_variation7-win32.phpt[1], so we skip it like we do for many other of these tests which have win32 pendants. [1] <https://github.com/php/php-src/actions/runs/11527743659/job/32093951818> Closes GH-16722.
* PHP-8.2: Skip file_put_contents_variation7.phpt on Windows
* PHP-8.3: Skip file_put_contents_variation7.phpt on Windows
* PHP-8.4: Skip file_put_contents_variation7.phpt on Windows
There doesn't seem to be a thread post-startup hook that runs after zend_startup_cb() that could be used for this this fix is similar to accel_startup_ok() as seen here: https://github.com/php/php-src/blob/fc1db70f106525e81f9a24539340b7cf2e82e844/ext/opcache/ZendAccelerator.c#L2631-L2634 Closes GH-16853.
* PHP-8.2: Fix GH-16851: JIT_G(enabled) not set correctly on other threads
* PHP-8.3: Fix GH-16851: JIT_G(enabled) not set correctly on other threads
* PHP-8.4: Fix GH-16851: JIT_G(enabled) not set correctly on other threads
* PHP-8.4: Revert "Merge branch 'PHP-8.3' into PHP-8.4"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.1)
Can you help keep this open source service alive? 💖 Please sponsor : )