Merge pull request #31522 from nextcloud/backport/31491/stable22

[stable22] Fix duplicated UUID detection when there are empty uuids

2 files changed, 5 insertions, 5 deletions

diff --git a/apps/user_ldap/lib/Mapping/AbstractMapping.php b/apps/user_ldap/lib/Mapping/AbstractMapping.php
index 16973f76ff4..1a747cc8bfd 100644
--- a/apps/user_ldap/lib/Mapping/AbstractMapping.php
+++ b/apps/user_ldap/lib/Mapping/AbstractMapping.php
@@ -438,14 +438,14 @@ abstract class AbstractMapping {
 		$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
index 9e9554000d8..024c5801582 100644
--- a/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
+++ b/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
@@ -259,7 +259,7 @@ class Version1130Date20211102154716 extends SimpleMigrationStep {
 
 		$result = $select->executeQuery();
 		$idList = [];
-		while ($id = $result->fetchOne()) {
+		while (($id = $result->fetchOne()) !== false) {
 			$idList[] = $id;
 		}
 		$result->closeCursor();
@@ -278,7 +278,7 @@ class Version1130Date20211102154716 extends SimpleMigrationStep {
 			->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();