Apply changes from master's update to 3.1.3

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

3 files changed, 5 insertions, 5 deletions

diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
index 0a9590aa3d9..b235745f47b 100644
--- 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 651a3c144f3..a49a3f45348 100644
--- 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 fcba00b92b3..702216e0309 100644
--- 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();