Fixes custom type comment regex #2905
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
lcobucci
suggested changes
Nov 12, 2017
| @@ -1146,4 +1146,27 @@ public function testDoesNotListIndexesImplicitlyCreatedByForeignKeys() | |||
| $this->assertArrayHasKey('explicit_fk1_idx', $indexes); | |||
| $this->assertArrayHasKey('idx_3d6c147fdc58d6c', $indexes); | |||
| } | |||
|
|
|||
| public function testExtractDoctrineTypeFromComment() | |||
| $currentType = 'current type'; | ||
|
|
||
| $result = $this->_sm->extractDoctrineTypeFromComment('(DC2Type:type.should.return)', $currentType); | ||
| self::assertEquals('type.should.return', $result); |
There was a problem hiding this comment.
assertSame() is more appropriated here
| { | ||
| $currentType = 'current type'; | ||
|
|
||
| $result = $this->_sm->extractDoctrineTypeFromComment('(DC2Type:type.should.return)', $currentType); |
There was a problem hiding this comment.
Could you use a data provider for this test? It would become much simpler 😄
|
Done @lcobucci |
lcobucci
suggested changes
Nov 14, 2017
| } | ||
|
|
||
| /** | ||
| * @return array |
| /** | ||
| * @dataProvider commentsProvider | ||
| * | ||
| * @param string $comment |
There was a problem hiding this comment.
Please drop the @param and @return annotations
| * @param string $currentType | ||
| * @return void | ||
| */ | ||
| public function testExtractDoctrineTypeFromComment($comment, $expected, $currentType) : void |
There was a problem hiding this comment.
Please add the type declarations for the parameters
| { | ||
| $currentType = 'current type'; | ||
|
|
||
| return array( |
There was a problem hiding this comment.
Please define the indexes of the array with a short description of what the set of parameters is about, in order to improve PHPUnit's messages. Like:
return [
'invalid custom type comments' => ['should.return.current.type', $currentType, $currentType],
'valid custom type with dots' => ['(DC2Type:type.should.return)', 'type.should.return', $currentType],
];
|
Done @lcobucci |
lcobucci
force-pushed
the
custom-type-comment-regex
branch
from
1b4e7f5
to
22844d3
Compare
lcobucci
approved these changes
Nov 19, 2017
|
@jeremy-smith-maco merged (with some minor changes - specially to also give credit to @PedroTroller) and backported. Thanks for your contribution! |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 the same fix as #2679 which fixes the issue #2596 but this PR has tests for the change.