Request #73088: str_check_encoding and str_scrub #2129
Closed
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
…harset from static to PHPAPI
krakjoe
reviewed
Oct 17, 2016
| @@ -98,7 +98,7 @@ static char *get_default_charset(void) { | |||
|
|
|||
| /* {{{ get_next_char | |||
| */ | |||
| static inline unsigned int get_next_char( | |||
| PHPAPI unsigned int get_next_char( | |||
There was a problem hiding this comment.
This is not a good symbol name to export.
krakjoe
reviewed
Oct 17, 2016
| @@ -373,7 +373,7 @@ static inline unsigned int get_next_char( | |||
| /* {{{ entity_charset determine_charset | |||
| * returns the charset identifier based on current locale or a hint. | |||
| * defaults to UTF-8 */ | |||
| static enum entity_charset determine_charset(char *charset_hint) | |||
| PHPAPI enum entity_charset determine_charset(char *charset_hint) | |||
There was a problem hiding this comment.
Again, not a good name for export.
krakjoe
reviewed
Oct 17, 2016
| PHPAPI zend_string *php_escape_html_entities(unsigned char *old, size_t oldlen, int all, int flags, char *hint_charset); | ||
| PHPAPI zend_string *php_escape_html_entities_ex(unsigned char *old, size_t oldlen, int all, int flags, char *hint_charset, zend_bool double_encode); | ||
| PHPAPI zend_string *php_unescape_html_entities(unsigned char *old, size_t oldlen, int all, int flags, char *hint_charset); | ||
| PHPAPI unsigned int php_next_utf8_char(const unsigned char *str, size_t str_len, size_t *cursor, int *status); | ||
| PHPAPI unsigned int get_next_char(enum entity_charset charset, const unsigned char *str, size_t str_len, size_t *cursor, int *status); | ||
| PHPAPI enum entity_charset determine_charset(char *charset_hint); |
There was a problem hiding this comment.
Take your lead on naming from the prototypes above these.
krakjoe
reviewed
Oct 17, 2016
| /* {{{ proto bool str_check_encoding([string str[, string encoding]]) */ | ||
| PHP_FUNCTION(str_check_encoding) | ||
| { | ||
| zend_string *str, *enc = NULL; |
|
I'm -1 on this. Porting functions from ext/mbstring to ext/standard because some people don't have mbstring installed makes no sense to me. We can't just duplicate our entire extension functionality into ext/standard because that's always available. |
|
Since we cannot merge this patch in it's current form because it's not satisfactory quality, and it has merge conflicts, and the author seems to have abandoned working on it, I'm closing this PR. |
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.
Both
str_check_encodingandstr_scrubhave same feature asmb_check_encodingandmb_scrub:fallback functions can be implemented by
htmlspecialcharsandhtmlspecialchars_decodesince PHP 5.4.0.