Fix reset occ commandbugfix/noid/occ

Signed-off-by: Julius Härtl <jus@bitgrid.net>

2 files changed, 5 insertions, 6 deletions

diff --git a/lib/Db/StepMapper.php b/lib/Db/StepMapper.php
index 472f28183..ed510ce59 100644
--- a/lib/Db/StepMapper.php
+++ b/lib/Db/StepMapper.php
@@ -55,7 +55,7 @@ class StepMapper extends QBMapper {
 		$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 @@ class StepMapper extends QBMapper {
 		$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 84f3b1a0b..765b687e7 100644
--- a/lib/Service/DocumentService.php
+++ b/lib/Service/DocumentService.php
@@ -335,7 +335,7 @@ class DocumentService {
 	 * @param bool $force
 	 * @throws DocumentHasUnsavedChangesException
 	 */
-	public function resetDocument($documentId, $force = false): void {
+	public function resetDocument(int $documentId, $force = false): void {
 		try {
 			$this->unlock($documentId);