[pull] master from php:master #1075
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
…ribute(PDO::ATTR_PREFETCH, 0)" This reverts commit 8982351.
Normally, simplexml cannot import document nodes, but xsl allows to circumvent this. A document does not have a name, so we return the empty string in that case. While we could add an explicit check, we might as well switch the macro to a form that would be more optimal anyway as many tag names can be single characters. The test was added in xsl because adding it in simplexml would break out-of-tree builds of simplexml. Closes GH-19990.
* PHP-8.3: Fix NEWS order Fix GH-19988: zend_string_init with NULL pointer in simplexml (UB)
* PHP-8.4: Fix NEWS order Fix GH-19988: zend_string_init with NULL pointer in simplexml (UB)
* PHP-8.5: Fix NEWS order Fix GH-19988: zend_string_init with NULL pointer in simplexml (UB)
* PHP-8.5: Fix uninitialized soap lang_en string on ZTS
* Merge odbc_fetch_into into odbc_fetch_hash Now that we can assume fetch_hash exists, there's a lot of redundancy in these functions. Merge their implementations, and smooth over the differences in how they handle returning their result set as an array. * Convert php_odbc_fetch_hash to ZPP * Use SQLFetchScroll instead of SQLExtendedFetch Fixes GH-19522 * Convert result type constants to an enum * Implement odbc_fetch_row in terms of php_odbc_fetch_hash These are also doing extremely similar jobs, but with slightly different behaviours for the return value (in this case, none, as it's tended to be used with odbc_result). Unify this too. The $row value deprecation for 0/-1 is only handled for odbc_fetch_row; it's too late to do so for PHP 8.5. Should probably unify it for PHP 8.6. * Rename php_odbc_fetch_hash to remove _hash Since this is a much more shared fetch function now.
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 : )