PHPC-1956: Remove disabled __wakeup function in non-serializable classes #1513
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
…methods These have been obsolete since the PHONGO_DISABLED_CONSTRUCTOR and PHONGO_DISABLED_WAKEUP macros were introduced in 6887226.
This function was not necessary since PHP 7.0 allowed disabling serialization via object handlers. The PHONGO_DISABLED_WAKEUP macro is no longer used and has been removed.
This is superseded by the new manager-serialization_error tests.
alcaeus
approved these changes
Jan 26, 2024
| @@ -56,27 +56,28 @@ zend_object_handlers* phongo_get_std_object_handlers(void) | |||
| /* }}} */ | |||
|
|
|||
| /* {{{ Memory allocation wrappers */ | |||
| static void* php_phongo_malloc(size_t num_bytes) /* {{{ */ | |||
There was a problem hiding this comment.
I thought I had removed all of these, but I guess I haven't. Thanks for cleaning this up!
There was a problem hiding this comment.
Is "these" referring to the foldmarkers (i.e. {{{ and }}})? There are a bunch more, so I can go through and clean those up separately if we like. None of us are using vim to work on this project, so I don't have to worry about @bjori yelling at me.
| } | ||
|
|
||
| /* Shared function entries for disabling constructors and unserialize() */ | ||
| PHP_FUNCTION(MongoDB_disabled___construct); |
There was a problem hiding this comment.
Noted that I added the macros in 6887226 but forgot to remove the shared functions below. Thanks for cleaning up my mess!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
https://jira.mongodb.org/browse/PHPC-1956