Apply changes from master's update to 3.1.3

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
index 0a9590aa3d9899a358b9249d39cc89377967780c..b235745f47b83f0760e2c1453b152b205d2ffe0e 100644 (file)
--- a/lib/private/DB/QueryBuilder/QueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/QueryBuilder.php
@@ -410,9 +410,9 @@ class QueryBuilder implements IQueryBuilder {
 
        /**
         * Gets the position of the first result the query object was set to retrieve (the "offset").
-        * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder.
+        * Returns 0 if {@link setFirstResult} was not applied to this QueryBuilder.
         *
-        * @return integer The position of the first result.
+        * @return int The position of the first result.
         */
        public function getFirstResult() {
                return $this->queryBuilder->getFirstResult();

diff --git a/lib/private/Repair/SqliteAutoincrement.php b/lib/private/Repair/SqliteAutoincrement.php
index 651a3c144f34027c5a8bca4b3707e0baaaf587da..a49a3f45348d9ff59a88999d9819c5e9833d7e0b 100644 (file)
--- a/lib/private/Repair/SqliteAutoincrement.php
+++ b/lib/private/Repair/SqliteAutoincrement.php
@@ -84,7 +84,7 @@ class SqliteAutoincrement implements IRepairStep {
                                foreach ($columnNames as $columnName) {
                                        $columnSchema = $tableSchema->getColumn($columnName);
                                        $columnDiff = new ColumnDiff($columnSchema->getName(), $columnSchema);
-                                       $tableDiff->changedColumns[] = $columnDiff;
+                                       $tableDiff->changedColumns[$columnSchema->getName()] = $columnDiff;
                                        $schemaDiff->changedTables[] = $tableDiff;
                                }
                        } catch (SchemaException $e) {

diff --git a/lib/public/DB/QueryBuilder/IQueryBuilder.php b/lib/public/DB/QueryBuilder/IQueryBuilder.php
index fcba00b92b38f087055ad59ba5c89cdfd34ca583..702216e0309424ff2def009629b77f65b344066d 100644 (file)
--- a/lib/public/DB/QueryBuilder/IQueryBuilder.php
+++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php
@@ -265,9 +265,9 @@ interface IQueryBuilder {
 
        /**
         * Gets the position of the first result the query object was set to retrieve (the "offset").
-        * Returns NULL if {@link setFirstResult} was not applied to this QueryBuilder.
+        * Returns 0 if {@link setFirstResult} was not applied to this QueryBuilder.
         *
-        * @return integer The position of the first result.
+        * @return int The position of the first result.
         * @since 8.2.0
         */
        public function getFirstResult();

diff --git a/tests/lib/DB/QueryBuilder/QueryBuilderTest.php b/tests/lib/DB/QueryBuilder/QueryBuilderTest.php
index aef1acc40c1d9c8c1e28170078bb6f7ceaf86465..1927850470743cd581dbabceea99b95e0f4b1048 100644 (file)
--- 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()
                );