Skip to content

Commit

Permalink
Merge pull request #30985 from laravel/5.8-cs
Browse files Browse the repository at this point in the history
[5.8] Code style fixes
  • Loading branch information
taylorotwell authored Dec 31, 2019
2 parents ccf857a + bac820f commit 9b3ee46
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 deletions.
25 changes: 14 additions & 11 deletions tests/Database/DatabaseEloquentHasManyThroughIntegrationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ public function testChunkReturnsCorrectModels()
'email',
'created_at',
'updated_at',
'laravel_through_key', ], array_keys($post->getAttributes()));
'laravel_through_key',
], array_keys($post->getAttributes()));
});
}

Expand Down Expand Up @@ -233,7 +234,8 @@ public function testCursorReturnsCorrectModels()
'email',
'created_at',
'updated_at',
'laravel_through_key', ], array_keys($post->getAttributes()));
'laravel_through_key',
], array_keys($post->getAttributes()));
}
}

Expand All @@ -252,7 +254,8 @@ public function testEachReturnsCorrectModels()
'email',
'created_at',
'updated_at',
'laravel_through_key', ], array_keys($post->getAttributes()));
'laravel_through_key',
], array_keys($post->getAttributes()));
});
}

Expand Down Expand Up @@ -285,9 +288,9 @@ protected function seedData()
HasManyThroughTestCountry::create(['id' => 1, 'name' => 'United States of America', 'shortname' => 'us'])
->users()->create(['id' => 1, 'email' => 'taylorotwell@gmail.com', 'country_short' => 'us'])
->posts()->createMany([
['title' => 'A title', 'body' => 'A body', 'email' => 'taylorotwell@gmail.com'],
['title' => 'Another title', 'body' => 'Another body', 'email' => 'taylorotwell@gmail.com'],
]);
['title' => 'A title', 'body' => 'A body', 'email' => 'taylorotwell@gmail.com'],
['title' => 'Another title', 'body' => 'Another body', 'email' => 'taylorotwell@gmail.com'],
]);
}

protected function seedDataExtended()
Expand Down Expand Up @@ -316,11 +319,11 @@ protected function seedDataExtended()
protected function seedDefaultData()
{
HasManyThroughDefaultTestCountry::create(['id' => 1, 'name' => 'United States of America'])
->users()->create(['id' => 1, 'email' => 'taylorotwell@gmail.com'])
->posts()->createMany([
['title' => 'A title', 'body' => 'A body'],
['title' => 'Another title', 'body' => 'Another body'],
]);
->users()->create(['id' => 1, 'email' => 'taylorotwell@gmail.com'])
->posts()->createMany([
['title' => 'A title', 'body' => 'A body'],
['title' => 'Another title', 'body' => 'Another body'],
]);
}

/**
Expand Down
21 changes: 9 additions & 12 deletions tests/Foundation/FoundationTestResponseTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -573,10 +573,9 @@ public function testAssertJsonMissingValidationErrors()
{
$baseResponse = tap(new Response, function ($response) {
$response->setContent(json_encode(['errors' => [
'foo' => [],
'bar' => ['one', 'two'],
]]
));
'foo' => [],
'bar' => ['one', 'two'],
]]));
});

$response = TestResponse::fromBaseResponse($baseResponse);
Expand All @@ -597,10 +596,9 @@ public function testAssertJsonMissingValidationErrorsCanFail()

$baseResponse = tap(new Response, function ($response) {
$response->setContent(json_encode(['errors' => [
'foo' => [],
'bar' => ['one', 'two'],
]]
));
'foo' => [],
'bar' => ['one', 'two'],
]]));
});

$response = TestResponse::fromBaseResponse($baseResponse);
Expand All @@ -614,10 +612,9 @@ public function testAssertJsonMissingValidationErrorsCanFail2()

$baseResponse = tap(new Response, function ($response) {
$response->setContent(json_encode(['errors' => [
'foo' => [],
'bar' => ['one', 'two'],
]]
));
'foo' => [],
'bar' => ['one', 'two'],
]]));
});

$response = TestResponse::fromBaseResponse($baseResponse);
Expand Down

0 comments on commit 9b3ee46

Please sign in to comment.