Merge branch '5.8' into 6.x

laravel · Dec 31, 2019 · cc3167d · cc3167d
2 parents 0760704 + 9b3ee46
commit cc3167d
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/tests/Database/DatabaseEloquentHasManyThroughIntegrationTest.php b/tests/Database/DatabaseEloquentHasManyThroughIntegrationTest.php
@@ -195,7 +195,8 @@ public function testChunkReturnsCorrectModels()
                 'email',
                 'created_at',
                 'updated_at',
-                'laravel_through_key', ], array_keys($post->getAttributes()));
+                'laravel_through_key',
+            ], array_keys($post->getAttributes()));
         });
     }
 
@@ -236,7 +237,8 @@ public function testCursorReturnsCorrectModels()
                 'email',
                 'created_at',
                 'updated_at',
-                'laravel_through_key', ], array_keys($post->getAttributes()));
+                'laravel_through_key',
+            ], array_keys($post->getAttributes()));
         }
     }
 
@@ -255,7 +257,8 @@ public function testEachReturnsCorrectModels()
                 'email',
                 'created_at',
                 'updated_at',
-                'laravel_through_key', ], array_keys($post->getAttributes()));
+                'laravel_through_key',
+            ], array_keys($post->getAttributes()));
         });
     }
 
@@ -288,9 +291,9 @@ protected function seedData()
         HasManyThroughTestCountry::create(['id' => 1, 'name' => 'United States of America', 'shortname' => 'us'])
                                  ->users()->create(['id' => 1, 'email' => '[email protected]', 'country_short' => 'us'])
                                  ->posts()->createMany([
-                ['title' => 'A title', 'body' => 'A body', 'email' => '[email protected]'],
-                ['title' => 'Another title', 'body' => 'Another body', 'email' => '[email protected]'],
-            ]);
+                                     ['title' => 'A title', 'body' => 'A body', 'email' => '[email protected]'],
+                                     ['title' => 'Another title', 'body' => 'Another body', 'email' => '[email protected]'],
+                                 ]);
     }
 
     protected function seedDataExtended()
@@ -319,11 +322,11 @@ protected function seedDataExtended()
     protected function seedDefaultData()
     {
         HasManyThroughDefaultTestCountry::create(['id' => 1, 'name' => 'United States of America'])
-                                 ->users()->create(['id' => 1, 'email' => '[email protected]'])
-                                 ->posts()->createMany([
-                ['title' => 'A title', 'body' => 'A body'],
-                ['title' => 'Another title', 'body' => 'Another body'],
-            ]);
+                                        ->users()->create(['id' => 1, 'email' => '[email protected]'])
+                                        ->posts()->createMany([
+                                            ['title' => 'A title', 'body' => 'A body'],
+                                            ['title' => 'Another title', 'body' => 'Another body'],
+                                        ]);
     }
 
     /**

diff --git a/tests/Foundation/FoundationTestResponseTest.php b/tests/Foundation/FoundationTestResponseTest.php
@@ -739,10 +739,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);
@@ -763,10 +762,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);
@@ -780,10 +778,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);