Preserve \MongoRegex on string typed identifier #1298
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
| @@ -30,7 +30,7 @@ class StringType extends Type | |||
| { | |||
| public function convertToDatabaseValue($value) | |||
| { | |||
| return $value !== null ? (string) $value : null; | |||
| return $value !== null ? $value instanceof \MongoRegex ? $value : (string) $value : null; | |||
There was a problem hiding this comment.
Can we put this new check in normal if? As much as I love ternary operator it'll more readable :)
|
@malarzm agreed, it looked nasty.. i changed it a bit, looks way more simple now ;-) |
| @@ -30,7 +30,7 @@ class StringType extends Type | |||
| { | |||
| public function convertToDatabaseValue($value) | |||
| { | |||
| return $value !== null ? (string) $value : null; | |||
| return (is_null($value) || $value instanceof \MongoRegex) ? $value : (string) $value; | |||
There was a problem hiding this comment.
Nitpicking a bit maybe, but could we use $value === null? I don't think we use function checks anywhere
|
I've left one more comment and could you also please squash the commits? |
narcoticfresh
force-pushed
the
feature/regex-on-identifier
branch
from
1feb32b to
a95f594
Compare
|
@malarzm ok, changed and squashed ;-) |
|
Manually merged in 17be5e2. Thanks! |
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.
This is a possible fix for #1294 and a unit test to avoid regression.
I'm not sure if this should be handled in the
Typeclass. It makes kinda sense as it's the culprit. But maybe it's a too much narrow check (topic wise) in theType. But I'm not sure where it could be handled elsewhere asconvertToDatabaseValue()will be called anyway and the\MongoRegexinstance would be lost(?)