fix: Fix preg_match in enforceHttpEncoding #4623
Merged
Conversation
This file contains 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
`preg_match` can return `1`, `0` or `false`. In this last case, `enforceHttpEncoding` was trying to access `$matches[1]`, even if the regex wasn't matching.
Alkarex
reviewed
Sep 19, 2022
| @@ -351,7 +351,7 @@ function cleanCache(int $hours = 720) { | |||
| * @return string an HTML string with XML encoding information for DOMDocument::loadHTML() | |||
| */ | |||
| function enforceHttpEncoding(string $html, string $contentType = ''): string { | |||
| $httpCharset = preg_match('/\bcharset=([0-9a-z_-]{2,12})$/i', $contentType, $matches) === false ? '' : $matches[1]; | |||
There was a problem hiding this comment.
Ah yes, should have been == false or simply just the boolean expression
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.
Changes proposed in this pull request:
preg_matchinenforceHttpEncodingHow to test the feature manually:
charsetin its content typePull request checklist:
Additional information can be found in the documentation.