Merge 2.2#2003
Merged
Merged
Conversation
…sed-trait Remove unused trait into Hydra Serializer
…thout-groups Disable eager loading when no groups are specified to avoid recursive joins
Contributor
|
Let's wait for #1993 |
…xception-annotation Remove expected exception annotations
Member
Author
|
let me add it :) |
teohhanhui
reviewed
Jun 5, 2018
| */ | ||
| public function testConstructWithInvalidAttribute() | ||
| { | ||
| $this->expectException(\ApiPlatform\Core\Exception\InvalidArgumentException::class); |
Contributor
There was a problem hiding this comment.
Should add use statement for this.
Contributor
|
#1993 is in! |
Member
Author
|
let's wait for #2004 :D |
…o-circleci Move lint jobs to CircleCI
Contributor
|
#2004 is merged. 😄 |
teohhanhui
approved these changes
Jun 6, 2018
Contributor
|
Resolving conflicts should be done in the merge commit or further commits, without rewriting history. 😛 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
No description provided.