Allow Escaped % in Format String Matches #2914
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
Add a test file for the StringMatchesFormatDescription constraint, and add a simple test case for each format specifier.
For example, the format '%%d' should match the string literal '%d'. We achieve this by using negative lookbehind (http://php.net/manual/en/regexp.reference.assertions.php) when constructing the regex pattern that we will match against.
On Windows-based machines, the DIRECTORY_SEPARATOR is '\'. Make sure %e
can handle either a backslash or a forward slash in that position.
We ran into problems here because preg_replace allows its own
replacement strings to use \0, \1, etc to replace certain matches. Thus,
the string '\\\\' in code turns into a single '\' in our output string.
The fix is simple - just str_replace('\\', '\\\\', ...).
This problem does not affect any of our other arguments to preg_replace
because none of those contain backslashes followed by a number or
another backslash.
|
I'm certainly open to thoughts, criticism, or suggestions 😄 |
Codecov Report
@@ Coverage Diff @@
## master #2914 +/- ##
============================================
+ Coverage 79.62% 79.62% +<.01%
Complexity 2849 2849
============================================
Files 105 105
Lines 7519 7520 +1
============================================
+ Hits 5987 5988 +1
Misses 1532 1532
Continue to review full report at Codecov.
|
sebastianbergmann
pushed a commit
that referenced
this pull request
Aug 31, 2018
sebastianbergmann
pushed a commit
to sebastianbergmann/phpunit-documentation-english
that referenced
this pull request
Sep 2, 2018
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.
When using the StringMatchesFormatDescription constraint, define the '%%' format specifier to be interpreted as a literal '%', which allows for things like the following:
This addresses #2907.