From 76faca7a1118ebdf475e94f11e2bc23f57225e8c Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Thu, 9 Jun 2022 15:57:30 +0000 Subject: [PATCH] Apply fixes from StyleCI --- src/Illuminate/Database/Concerns/BuildsQueries.php | 4 ++-- tests/Database/DatabaseQueryBuilderTest.php | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Illuminate/Database/Concerns/BuildsQueries.php b/src/Illuminate/Database/Concerns/BuildsQueries.php index 6201084dfd1a..7a49d77461d4 100644 --- a/src/Illuminate/Database/Concerns/BuildsQueries.php +++ b/src/Illuminate/Database/Concerns/BuildsQueries.php @@ -348,7 +348,7 @@ protected function paginateUsingCursor($perPage, $columns = ['*'], $cursorName = $cursor->parameter($previousColumn) ); - $unionBuilders->each(function ($unionBuilder) use($previousColumn, $cursor) { + $unionBuilders->each(function ($unionBuilder) use ($previousColumn, $cursor) { $unionBuilder->where( $this->getOriginalColumnNameForCursorPagination($this, $previousColumn), '=', @@ -374,7 +374,7 @@ protected function paginateUsingCursor($perPage, $columns = ['*'], $cursorName = }); } - $unionBuilders->each(function ($unionBuilder) use ($column, $direction, $cursor, $i, $orders, $addCursorConditions){ + $unionBuilders->each(function ($unionBuilder) use ($column, $direction, $cursor, $i, $orders, $addCursorConditions) { $unionBuilder->where(function ($unionBuilder) use ($column, $direction, $cursor, $i, $orders, $addCursorConditions) { $unionBuilder->where( $this->getOriginalColumnNameForCursorPagination($this, $column), diff --git a/tests/Database/DatabaseQueryBuilderTest.php b/tests/Database/DatabaseQueryBuilderTest.php index 4b19bb7378fe..6c29eaa8efa5 100755 --- a/tests/Database/DatabaseQueryBuilderTest.php +++ b/tests/Database/DatabaseQueryBuilderTest.php @@ -4053,6 +4053,7 @@ public function testCursorPaginateWithUnionWheres() $builder->toSql()); $this->assertEquals([$ts], $builder->bindings['where']); $this->assertEquals([$ts], $builder->bindings['union']); + return $results; }); @@ -4099,6 +4100,7 @@ public function testCursorPaginateWithUnionWheresWithRawOrderExpression() $builder->toSql()); $this->assertEquals([true, $ts], $builder->bindings['where']); $this->assertEquals([true, $ts], $builder->bindings['union']); + return $results; }); @@ -4145,6 +4147,7 @@ public function testCursorPaginateWithUnionWheresReverseOrder() $builder->toSql()); $this->assertEquals([$ts], $builder->bindings['where']); $this->assertEquals([$ts], $builder->bindings['union']); + return $results; }); @@ -4161,8 +4164,8 @@ public function testCursorPaginateWithUnionWheresReverseOrder() ]), $result); } - public function testCursorPaginateWithUnionWheresMultipleOrders() - { + public function testCursorPaginateWithUnionWheresMultipleOrders() + { $ts = now()->toDateTimeString(); $perPage = 16; @@ -4191,6 +4194,7 @@ public function testCursorPaginateWithUnionWheresMultipleOrders() $builder->toSql()); $this->assertEquals([$ts, $ts, 1], $builder->bindings['where']); $this->assertEquals([$ts, $ts, 1], $builder->bindings['union']); + return $results; });