Avoid escaping of characters other than " #21
Merged
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
sgiehl
commented
Oct 26, 2022
Comment on lines
+287
to
+295
| if (preg_match('/^"(.*)"$/', $value)) { | ||
| $value = preg_replace('/^"(.*)"$/', '$1', $value); | ||
| $value = str_replace('\"', '"', $value); | ||
| } elseif (preg_match("/^'(.*)'$/", $value)) { | ||
| $value = preg_replace("/^'(.*)'$/", '$1', $value); | ||
| $value = str_replace("\'", "'", $value); | ||
| } else { | ||
| $value = trim($value, "'\""); | ||
| } |
There was a problem hiding this comment.
This actually fixes some difference between this reader implementation and parse_ini_string.
Values like key = "test \" test" or key = "' test" resulted in different results. This should be covered by the additional tests
peterhashair
approved these changes
Oct 30, 2022
There was a problem hiding this comment.
Looks good to me.
- Functional review done
- Potential edge cases thought about (behavior of the code with strange input, with strange internal state or possible interactions with other Matomo subsystems)
- Usability review done (is anything maybe unclear or think about anything that would cause people to reach out to support)
- Security review done
- Wording review done
- Code review done
- Tests were added if useful/possible
- Reviewed for breaking changes
- Developer changelog updated if needed
- Documentation added if needed
|
@peterhashair @sgiehl any reason this isn't merged if it is fully tested and reviewed? |
|
@justinvelluppillai not sure if there is any special process for this repo, but looks good to me to do a merge. |
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.
Description:
replaces #20
refs matomo-org/matomo#19899
Review