Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.4] Check if Collection is empty and prevent exception on fresh method. #19671

Merged
merged 6 commits into from
Jun 19, 2017

Conversation

mathieutu
Copy link
Contributor

Complement to my previous PR:
#19616

@decadence made a PR, but he made a mistake on the branch.
I also added a unit test.

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
{
$c = new Collection();
$this->assertEquals($c, $c->fresh());

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Useless empty line.

@taylorotwell taylorotwell merged commit 0ef435a into laravel:5.4 Jun 19, 2017
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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants