Skip to content

Commit b7d7ca4

Browse files
committed
Fix conflicted test
1 parent 140b72d commit b7d7ca4

1 file changed

Lines changed: 8 additions & 8 deletions

File tree

tests/Database/DatabaseQueryBuilderTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1393,9 +1393,9 @@ public function testChunkPaginatesUsingIdWithLastChunkComplete(): void
13931393
$builder = $this->getMockQueryBuilder();
13941394
$builder->orders[] = ['column' => 'foobar', 'direction' => 'asc'];
13951395

1396-
$chunk1 = Collection::make([(object) ['someIdField' => 1], (object) ['someIdField' => 2]]);
1397-
$chunk2 = Collection::make([(object) ['someIdField' => 10], (object) ['someIdField' => 11]]);
1398-
$chunk3 = Collection::make([]);
1396+
$chunk1 = [(object) ['someIdField' => 1], (object) ['someIdField' => 2]];
1397+
$chunk2 = [(object) ['someIdField' => 10], (object) ['someIdField' => 11]];
1398+
$chunk3 = [];
13991399
$builder->shouldReceive('forPageAfterId')->once()->with(2, 0, 'someIdField')->andReturnSelf();
14001400
$builder->shouldReceive('forPageAfterId')->once()->with(2, 2, 'someIdField')->andReturnSelf();
14011401
$builder->shouldReceive('forPageAfterId')->once()->with(2, 11, 'someIdField')->andReturnSelf();
@@ -1416,8 +1416,8 @@ public function testChunkPaginatesUsingIdWithLastChunkPartial(): void
14161416
$builder = $this->getMockQueryBuilder();
14171417
$builder->orders[] = ['column' => 'foobar', 'direction' => 'asc'];
14181418

1419-
$chunk1 = Collection::make([(object) ['someIdField' => 1], (object) ['someIdField' => 2]]);
1420-
$chunk2 = Collection::make([(object) ['someIdField' => 10]]);
1419+
$chunk1 = [(object) ['someIdField' => 1], (object) ['someIdField' => 2]];
1420+
$chunk2 = [(object) ['someIdField' => 10]];
14211421
$builder->shouldReceive('forPageAfterId')->once()->with(2, 0, 'someIdField')->andReturnSelf();
14221422
$builder->shouldReceive('forPageAfterId')->once()->with(2, 2, 'someIdField')->andReturnSelf();
14231423
$builder->shouldReceive('get')->times(2)->andReturn($chunk1, $chunk2);
@@ -1436,7 +1436,7 @@ public function testChunkPaginatesUsingIdWithCountZero(): void
14361436
$builder = $this->getMockQueryBuilder();
14371437
$builder->orders[] = ['column' => 'foobar', 'direction' => 'asc'];
14381438

1439-
$chunk = Collection::make([]);
1439+
$chunk = [];
14401440
$builder->shouldReceive('forPageAfterId')->once()->with(0, 0, 'someIdField')->andReturnSelf();
14411441
$builder->shouldReceive('get')->times(1)->andReturn($chunk);
14421442

@@ -1453,8 +1453,8 @@ public function testChunkPaginatesUsingIdWithAlias(): void
14531453
$builder = $this->getMockQueryBuilder();
14541454
$builder->orders[] = ['column' => 'foobar', 'direction' => 'asc'];
14551455

1456-
$chunk1 = Collection::make([(object) ['table_id' => 1], (object) ['table_id' => 10]]);
1457-
$chunk2 = Collection::make([]);
1456+
$chunk1 = [(object) ['table_id' => 1], (object) ['table_id' => 10]];
1457+
$chunk2 = [];
14581458
$builder->shouldReceive('forPageAfterId')->once()->with(2, 0, 'table.id')->andReturnSelf();
14591459
$builder->shouldReceive('forPageAfterId')->once()->with(2, 10, 'table.id')->andReturnSelf();
14601460
$builder->shouldReceive('get')->times(2)->andReturn($chunk1, $chunk2);

0 commit comments

Comments
 (0)