[pull] master from php:master #627
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
dom_xinclude_strip_fallback_references() now also takes into account xi:include nodes children. This now subsumes all work done normally by the old start/end node removal, so we can remove that code and start using XML_PARSE_NOXINCNODE. Closes GH-17878.
* PHP-8.3: Fix GH-17847: xinclude destroys live node
* PHP-8.4: Fix GH-17847: xinclude destroys live node
Apparently a copy and paste issue. Closes GH-17881.
* PHP-8.3: Fix GH-17879: readfile_variation8-win32.phpt test conflict
* PHP-8.4: Fix GH-17879: readfile_variation8-win32.phpt test conflict
This code was introduced when the Dom\Node and DOMNode classes were still aliases, so the type check was never updated. We fix this by checking if the doc pointer follows the spec and pick the right node CE based on that. Closes GH-17888.
* PHP-8.4: Fix using Dom\Node with Dom\XPath callbacks
Create new sub directories for tests related to backtraces and for tests related to `$this` being reserved in different places and not being usable or reassignable. Work towards GH-15631
when opcache is enabled. close GH-17901
Add directories for tests relating to - calling user functions (`call_user_func()` and `call_user_func_array()`) - using `::class` to access class names - null coalescing with `??` - concatenation with `.` - indirect function calls (e.g. by calling a variable with a function name) - reporting of line numbers - static variables in functions - type casts As well as organizing a couple of tests into existing sub directories along the way Work towards GH-15631
* PHP-8.3: Fix cycle leak in sqlite3 setAuthorizer()
* We need to clean the trampoline if the construction check fails * Checking for an exception and then returning causes a leak on `collation`. Returning early is pointless anyway. Closes GH-17904.
* PHP-8.4: Fix memory leaks in pdo_sqlite callback registration Fix cycle leak in sqlite3 setAuthorizer()
- Three of our gd tests could be skipped with a message about requiring bundled GD, but those tests don't actually require bundled GD. We update the messages to mention the specific functions that are required. - add SKIPIF stanzas for missing PNG support The bundled libgd always has PNG support, but an external one may not. - imagerotate() is always available Following 59ec80c, the imagerotate() function is always available. We may therefore remove its function_exists() checks without harm. close GH-17894
This is IS_LONG.
skip if imagefttext() is not available This test calls imagefttext(), which may not be available if libgd was built without freetype support. Closes GH-17910
This solely affects the builtin enum functions currently. Given that these are stored in SHM, we cannot simply hardwire a pointer into the internal function runtime cache on NTS too, but have to use a MAP_PTR (like on ZTS). Now, by design, the runtime cache of internal functions no longer is reset between requests, hence we need to store them explicitly as static runtime cache. On NTS builds we cannot trivially move the pointers into CG(internal_run_time_cache) as they're directly stored on the individual functions (on ZTS we could simply iterate the static map_ptrs). Hence, we have the choice between having opcache managing the internal run_time_cache for its preloaded functions itself or realloc CG(internal_run_time_cache) and iterate through all functions to assign the new address. We choose the latter for simplicity and initial speed.
See: laravel/framework#54754 (comment) According to this comment, the default branch more actively receives changes throuought the year than master. Hence, it makes more sense to test the default branch.
* PHP-8.1: [skip ci] Use laravel default branch in community build
* PHP-8.2: [skip ci] Use laravel default branch in community build
* PHP-8.3: [skip ci] Use laravel default branch in community build
* PHP-8.4: [skip ci] Use laravel default branch in community build
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 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 : )