Merged
Conversation
* Remove conditional definitions for zend_engine 2 * Inline compatibility macros for zend_engine 2 * Simplify switch and fix cast in php_array_api * Add deref variant to php_array_api * Correctly handle zval references when using php_array_fetch * Adapt formatting to match rest of file * Flip test names
jmikola
reviewed
Sep 27, 2024
tests/query/bug2457-002.phpt
Outdated
| @@ -0,0 +1,34 @@ | |||
| --TEST-- | |||
| PHPC-2457: Query modifiers can be passed reference | |||
Contributor
There was a problem hiding this comment.
@alcaeus: in addition to any changes in Query.c, you'll want to remove this test.
alcaeus
approved these changes
Sep 30, 2024
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Merge new changes from v1.x into v2.x.
Commits
To resolve any conflicts, check out the temporary branch and run the following command:Resolving conflicts
To ignore from the remote branch, first reset the temporary branch to v2.x and manually merge using the `ours` merge strategy:Ignoring changes
Then, push the temporary branch to upate the pull request.