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.

Sign up for GitHub

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.6] Conditional load fixes #23369

Merged
merged 10 commits into from
Mar 2, 2018
Merged

[5.6] Conditional load fixes #23369

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cce3899
fix conditional loading logic for numeric keyed arrays
taylorotwell Mar 2, 2018
0a5f322
Apply fixes from StyleCI (#23368)
taylorotwell Mar 2, 2018
89b8d0d
more tests
taylorotwell Mar 2, 2018
5158714
Merge branch 'conditional-load-fixes' of github.com:laravel/framework…
taylorotwell Mar 2, 2018
a949887
Apply fixes from StyleCI (#23370)
taylorotwell Mar 2, 2018
32f6930
another test
taylorotwell Mar 2, 2018
07f6788
Merge branch 'conditional-load-fixes' of github.com:laravel/framework…
taylorotwell Mar 2, 2018
571809d
Apply fixes from StyleCI (#23371)
taylorotwell Mar 2, 2018
b25b162
complicate test more
taylorotwell Mar 2, 2018
4d8ed37
Merge branch 'conditional-load-fixes' of github.com:laravel/framework…
taylorotwell Mar 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Apply fixes from StyleCI (#23370)
  • Loading branch information
@taylorotwell
taylorotwell authored Mar 2, 2018
commit a949887b85b23621bc5347ed76978c531f4f6fae
4 changes: 2 additions & 2 deletions tests/Integration/Http/ResourceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,11 +574,11 @@ public function work()
], $results);
}


public function test_initial_merge_values_may_be_missing()
{
$filter = new class {
use ConditionallyLoadsAttributes;

public function work()
{
return $this->filter([
Expand All @@ -599,11 +599,11 @@ public function work()
], $results);
}


public function test_all_merge_values_may_be_missing()
{
$filter = new class {
use ConditionallyLoadsAttributes;

public function work()
{
return $this->filter([
Expand Down