diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2021-10-22 11:35:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-22 11:35:02 +0200 |
| commit | 7e3b6e70882e53aee660892ed377020d1c577578 (patch) | |
| tree | cc9924ffe21d6995dfe94dc3c33eee83ed2aa799 /tests/lib | |
| parent | 867579ced2c6bc4e79584c61ff1ca1063bfcc143 (diff) | |
| parent | 130ab63ca1c163b23107389fee5bbe37456490ac (diff) | |
| download | nextcloud-server-7e3b6e70882e53aee660892ed377020d1c577578.tar.gz nextcloud-server-7e3b6e70882e53aee660892ed377020d1c577578.zip | |
Merge pull request #29344 from nextcloud/dependabot/composer/doctrine/dbal-3.1.3
Diffstat (limited to 'tests/lib')
| -rw-r--r-- | tests/lib/DB/QueryBuilder/QueryBuilderTest.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php index aef1acc40c1..19278504707 100644 --- a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php +++ b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php @@ -102,7 +102,7 @@ class QueryBuilderTest extends \Test\TestCase { public function dataFirstResult() { return [ - [null, [99, 98, 97, 96, 95, 94, 93, 92, 91]], + [0, [99, 98, 97, 96, 95, 94, 93, 92, 91]], [0, [99, 98, 97, 96, 95, 94, 93, 92, 91]], [1, [98, 97, 96, 95, 94, 93, 92, 91]], [5, [94, 93, 92, 91]], @@ -112,7 +112,7 @@ class QueryBuilderTest extends \Test\TestCase { /** * @dataProvider dataFirstResult * - * @param int $firstResult + * @param int|null $firstResult * @param array $expectedSet */ public function testFirstResult($firstResult, $expectedSet) { @@ -121,14 +121,10 @@ class QueryBuilderTest extends \Test\TestCase { if ($firstResult !== null) { $this->queryBuilder->setFirstResult($firstResult); - - // FIXME Remove this once Doctrine/DBAL is >2.5.1: - // FIXME See https://github.com/doctrine/dbal/pull/782 - $this->queryBuilder->setMaxResults(100); } $this->assertSame( - $firstResult, + $firstResult ?? 0, $this->queryBuilder->getFirstResult() ); |