Merge pull request #31521 from nextcloud/backport/31491/stable23

[stable23] Fix duplicated UUID detection when there are empty uuids
nextcloud · Apr 14, 2022 · e4b68e4 · e4b68e4
2 parents ea3a9ba + a737a25
commit e4b68e4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/apps/user_ldap/lib/Mapping/AbstractMapping.php b/apps/user_ldap/lib/Mapping/AbstractMapping.php
@@ -438,14 +438,14 @@ public function clearCb(callable $preCallback, callable $postCallback): bool {
 		$picker = $this->dbc->getQueryBuilder();
 		$picker->select('owncloud_name')
 			->from($this->getTableName());
-		$cursor = $picker->execute();
+		$cursor = $picker->executeQuery();
 		$result = true;
-		while ($id = $cursor->fetchOne()) {
+		while (($id = $cursor->fetchOne()) !== false) {
 			$preCallback($id);
 			if ($isUnmapped = $this->unmap($id)) {
 				$postCallback($id);
 			}
-			$result &= $isUnmapped;
+			$result = $result && $isUnmapped;
 		}
 		$cursor->closeCursor();
 		return $result;

diff --git a/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php b/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
@@ -259,7 +259,7 @@ protected function getNextcloudIdsByUuid(string $table, string $uuid): array {
 
 		$result = $select->executeQuery();
 		$idList = [];
-		while ($id = $result->fetchOne()) {
+		while (($id = $result->fetchOne()) !== false) {
 			$idList[] = $id;
 		}
 		$result->closeCursor();
@@ -278,7 +278,7 @@ protected function getDuplicatedUuids(string $table): Generator {
 			->having($select->expr()->gt($select->func()->count('owncloud_name'), $select->createNamedParameter(1)));
 
 		$result = $select->executeQuery();
-		while ($uuid = $result->fetchOne()) {
+		while (($uuid = $result->fetchOne()) !== false) {
 			yield $uuid;
 		}
 		$result->closeCursor();

diff --git a/apps/workflowengine/lib/Manager.php b/apps/workflowengine/lib/Manager.php
@@ -351,7 +351,7 @@ protected function canModify(int $id, ScopeContext $scopeContext):bool {
 		$result = $qb->execute();
 
 		$this->operationsByScope[$scopeContext->getHash()] = [];
-		while ($opId = $result->fetchOne()) {
+		while (($opId = $result->fetchOne()) !== false) {
 			$this->operationsByScope[$scopeContext->getHash()][] = (int)$opId;
 		}
 		$result->closeCursor();

diff --git a/apps/workflowengine/lib/Migration/PopulateNewlyIntroducedDatabaseFields.php b/apps/workflowengine/lib/Migration/PopulateNewlyIntroducedDatabaseFields.php
@@ -57,7 +57,7 @@ protected function populateScopeTable(IResult $ids): void {
 		$qb = $this->dbc->getQueryBuilder();
 
 		$insertQuery = $qb->insert('flow_operations_scope');
-		while ($id = $ids->fetchOne()) {
+		while (($id = $ids->fetchOne()) !== false) {
 			$insertQuery->values(['operation_id' => $qb->createNamedParameter($id), 'type' => IManager::SCOPE_ADMIN]);
 			$insertQuery->execute();
 		}