Repository navigation
Fix bug #40459 - make all stream funcs that create object call ctor - #153
Merged
Merged
Conversation
|
[edit] Thanks for committing this fix. Any chance it will be backported to 5.3? |
heyJordanParker
added a commit
to heyJordanParker/php-sharp
that referenced
this pull request
Oct 11, 2026
Problem - master took #101, which pins Mago at #118 (90e8d64ee) and rewrites Sets.sharp:75 and Sets.inc:75 so a Set's changing method has a place. - This branch pinned php#129's head (bce91aa29). Both sides changed the pin line. php#129 merged as 82593a44b, which did not compile, and mago-sharp php#153 fixed it as 625c278f8. Solution - Take master's Sets.sharp and Sets.inc as they are. - SHARP_MAGO_COMMIT pins 625c278f8303ff004daa00d29a9a90ca4e56fd6c, the merge of php#153, which carries both #118 and php#129. The bridge sources the header is generated from are unchanged since bce91aa29, so the pin is the only line the generated header changes. Zend/tests/sharp/ Sets.sharp, Sets.inc from master: the copied Set is held in a local before add ext/sharp/ sharp_unit.h conflict: SHARP_MAGO_COMMIT is 625c278f8, the merge of mago-sharp php#153
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.
Generalized solution for bug #40459