db search: fix match in context in non-regex case. #45
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
schlessera
reviewed
Aug 30, 2017
| $offset = $match_arr[1]; | ||
| // Offsets are in bytes, so need to use `strlen()` and `substr()` before using `safe_substr()`. | ||
| $before = $before_context && $offset ? \cli\safe_substr( substr( $col_val, 0, $offset ), -$before_context, null /*length*/, false /*is_width*/, $col_encoding ) : ''; | ||
| $after = $after_context ? \cli\safe_substr( substr( $col_val, $offset + strlen( $match ) ), 0, $after_context, false /*is_width*/, $col_encoding ) : ''; |
There was a problem hiding this comment.
Just a general tip for code readability:
If you have scalar arguments where it is not immediately clear what their meaning is, you can use a simple assignment to make it clearer.
So, instead of null /*length*/, false /*is_width*/, you could also do $length = null, $is_width = false.
I personally find this easier to read.
There was a problem hiding this comment.
Yes, I agree, it is easier to read - however, gasp horror it's an unnecessary assignment! Knowingly doing an unnecessary assignment is the sort of thing that keeps me from sleeping! So I'll leave it for the mo...
schlessera
approved these changes
Aug 30, 2017
|
@gitlost Please merge in latest |
danielbachhuber
pushed a commit
that referenced
this pull request
Nov 18, 2022
db search: fix match in context in non-regex case.
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.
Issue #43
Removes context regex and always uses
PREG_OFFSET_CAPTUREmode inpreg_match_all(), to avoid missing matches in contexts.Also no longer adds UTF-8 modifier
uto regex ever, as not needed without context regex and was never needed anyway in--regexcase.Also rechecks encoding when non-UTF-8 for each value of
$col_valas could getASCIIfirst time (unfortunately behat/gherkin can't handle non-UTF-8 chars in a feature file so will need aphpunittest to test this properly).