Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/tests/lib
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2021-10-20 19:25:30 +0300
committerChristoph Wurst <christoph@winzerhof-wurst.at>2021-10-22 10:03:45 +0300
commit130ab63ca1c163b23107389fee5bbe37456490ac (patch)
treea4f936a0d1c168e3fbd025f1ae4964d097cd649f /tests/lib
parentfb18f291488c706abcc58f365fe71e7ece2fca39 (diff)
Bump doctrine/dbal from 3.0.0 to 3.1.3
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/DB/QueryBuilder/QueryBuilderTest.php10
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()
);