summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorChristoph Wurst <christoph@winzerhof-wurst.at>2021-10-20 18:25:30 +0200
committerChristoph Wurst <christoph@winzerhof-wurst.at>2021-10-22 09:03:45 +0200
commit130ab63ca1c163b23107389fee5bbe37456490ac (patch)
treea4f936a0d1c168e3fbd025f1ae4964d097cd649f /lib
parentfb18f291488c706abcc58f365fe71e7ece2fca39 (diff)
downloadnextcloud-server-130ab63ca1c163b23107389fee5bbe37456490ac.tar.gz
nextcloud-server-130ab63ca1c163b23107389fee5bbe37456490ac.zip
Bump doctrine/dbal from 3.0.0 to 3.1.3
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/DB/QueryBuilder/QueryBuilder.php4
-rw-r--r--lib/private/Repair/SqliteAutoincrement.php2
-rw-r--r--lib/public/DB/QueryBuilder/IQueryBuilder.php4
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/DB/QueryBuilder/QueryBuilder.php b/lib/private/DB/QueryBuilder/QueryBuilder.php
index 3b1c48306a6..e1f74f5327c 100644
--- a/lib/private/DB/QueryBuilder/QueryBuilder.php
+++ b/lib/private/DB/QueryBuilder/QueryBuilder.php
@@ -462,9 +462,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 9bd8fa36deb..4a8b2a45d3f 100644
--- a/lib/private/Repair/SqliteAutoincrement.php
+++ b/lib/private/Repair/SqliteAutoincrement.php
@@ -83,7 +83,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 e3daf4b3b46..5d1116075d8 100644
--- a/lib/public/DB/QueryBuilder/IQueryBuilder.php
+++ b/lib/public/DB/QueryBuilder/IQueryBuilder.php
@@ -289,9 +289,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();