diff --git a/lib/Db/StepMapper.php b/lib/Db/StepMapper.php index 472f281833b..ed510ce59f5 100644 --- a/lib/Db/StepMapper.php +++ b/lib/Db/StepMapper.php @@ -55,7 +55,7 @@ public function deleteAll($documentId): void { $qb = $this->db->getQueryBuilder(); $qb->delete($this->getTableName()) ->where($qb->expr()->eq('document_id', $qb->createNamedParameter($documentId))) - ->execute(); + ->executeStatement(); } public function deleteBeforeVersion($documentId, $version): void { @@ -63,15 +63,14 @@ public function deleteBeforeVersion($documentId, $version): void { $qb->delete($this->getTableName()) ->where($qb->expr()->eq('document_id', $qb->createNamedParameter($documentId))) ->andWhere($qb->expr()->lte('version', $qb->createNamedParameter($version))) - ->execute(); + ->executeStatement(); } public function deleteAfterVersion($documentId, $version): int { $qb = $this->db->getQueryBuilder(); - $result = $qb->delete($this->getTableName()) + return $qb->delete($this->getTableName()) ->where($qb->expr()->eq('document_id', $qb->createNamedParameter($documentId))) ->andWhere($qb->expr()->gt('version', $qb->createNamedParameter($version))) - ->execute(); - return $result->rowCount(); + ->executeStatement(); } } diff --git a/lib/Service/DocumentService.php b/lib/Service/DocumentService.php index 84f3b1a0be9..765b687e70f 100644 --- a/lib/Service/DocumentService.php +++ b/lib/Service/DocumentService.php @@ -335,7 +335,7 @@ public function autosave($file, $documentId, $version, $autoaveDocument, $force * @param bool $force * @throws DocumentHasUnsavedChangesException */ - public function resetDocument($documentId, $force = false): void { + public function resetDocument(int $documentId, $force = false): void { try { $this->unlock($documentId);