[5.4] Check if Collection is empty and prevent exception on fresh method.#19671
Merged
taylorotwell merged 6 commits intoJun 19, 2017
Merged
Conversation
Add full tests for Model::fresh() and Collection::fresh() methods.
* commit '05060b183dd09cee6dce498da5afde9e66fd1a29': Apply fixes from StyleCI (laravel#19659) [5.4] Add ability to remove a global scope with another global scope (laravel#19657) [5.4] Add fresh method on Eloquent\Collection. (laravel#19616) support multiple fields to validateDifferent (laravel#19637) escape default value of yield blade directive (laravel#19643) [5.4] Add "avg" and "average" to higher order proxy. (laravel#19628) tagged v5.4.27 release notes version Add missing dependency. (laravel#19623) update timestamp on soft delete only when its used (laravel#19627) Add new `diffAssoc()` method to collection (laravel#19604) Fix tests code coverage config. (laravel#19609) # Conflicts: # src/Illuminate/Database/Eloquent/Collection.php
lucasmichot
reviewed
Jun 19, 2017
| { | ||
| $c = new Collection(); | ||
| $this->assertEquals($c, $c->fresh()); | ||
|
|
chrishardinge
pushed a commit
to chrishardinge/framework
that referenced
this pull request
Jun 21, 2017
…hod. (laravel#19671) * Add fresh method on Eloquent/Collection. * Rewrite completely the method to avoid multiple database calls. Add full tests for Model::fresh() and Collection::fresh() methods. * Update tests for php5.6 and Carbon v1.20.0 * Check if collection is empty and prevent exception. * styleCI
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
3 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.
Complement to my previous PR:
#19616
@decadence made a PR, but he made a mistake on the branch.
I also added a unit test.