Skip to content

Commit

Permalink
Apply fixes from StyleCI
Browse files Browse the repository at this point in the history
  • Loading branch information
StyleCIBot committed Jun 9, 2022
1 parent 300802f commit 76faca7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/Illuminate/Database/Concerns/BuildsQueries.php
Original file line number Diff line number Diff line change
Expand Up @@ -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),
'=',
Expand All @@ -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),
Expand Down
8 changes: 6 additions & 2 deletions tests/Database/DatabaseQueryBuilderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4053,6 +4053,7 @@ public function testCursorPaginateWithUnionWheres()
$builder->toSql());
$this->assertEquals([$ts], $builder->bindings['where']);
$this->assertEquals([$ts], $builder->bindings['union']);

return $results;
});

Expand Down Expand Up @@ -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;
});

Expand Down Expand Up @@ -4145,6 +4147,7 @@ public function testCursorPaginateWithUnionWheresReverseOrder()
$builder->toSql());
$this->assertEquals([$ts], $builder->bindings['where']);
$this->assertEquals([$ts], $builder->bindings['union']);

return $results;
});

Expand All @@ -4161,8 +4164,8 @@ public function testCursorPaginateWithUnionWheresReverseOrder()
]), $result);
}

public function testCursorPaginateWithUnionWheresMultipleOrders()
{
public function testCursorPaginateWithUnionWheresMultipleOrders()
{
$ts = now()->toDateTimeString();

$perPage = 16;
Expand Down Expand Up @@ -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;
});

Expand Down

0 comments on commit 76faca7

Please sign in to comment.