Use clearer names for variables

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

diff --git a/apps/user_ldap/lib/Migration/Version1120Date20210917155206.php b/apps/user_ldap/lib/Migration/Version1120Date20210917155206.php
index d46107733dc5c22fe5a1c66c1a10fc0c5423827b..3ab069679ef00597b831889a3c62071188c689f4 100644 (file)
--- a/apps/user_ldap/lib/Migration/Version1120Date20210917155206.php
+++ b/apps/user_ldap/lib/Migration/Version1120Date20210917155206.php
@@ -70,19 +70,19 @@ class Version1120Date20210917155206 extends SimpleMigrationStep {
        }
 
        protected function handleIDs(string $table, bool $emitHooks) {
-               $q = $this->getSelectQuery($table);
-               $u = $this->getUpdateQuery($table);
+               $select = $this->getSelectQuery($table);
+               $update = $this->getUpdateQuery($table);
 
-               $r = $q->executeQuery();
-               while ($row = $r->fetch()) {
+               $result = $select->executeQuery();
+               while ($row = $result->fetch()) {
                        $newId = hash('sha256', $row['owncloud_name'], false);
                        if ($emitHooks) {
                                $this->emitUnassign($row['owncloud_name'], true);
                        }
-                       $u->setParameter('uuid', $row['directory_uuid']);
-                       $u->setParameter('newId', $newId);
+                       $update->setParameter('uuid', $row['directory_uuid']);
+                       $update->setParameter('newId', $newId);
                        try {
-                               $u->executeStatement();
+                               $update->executeStatement();
                                if ($emitHooks) {
                                        $this->emitUnassign($row['owncloud_name'], false);
                                        $this->emitAssign($newId);
@@ -100,23 +100,23 @@ class Version1120Date20210917155206 extends SimpleMigrationStep {
                                );
                        }
                }
-               $r->closeCursor();
+               $result->closeCursor();
        }
 
        protected function getSelectQuery(string $table): IQueryBuilder {
-               $q = $this->dbc->getQueryBuilder();
-               $q->select('owncloud_name', 'directory_uuid')
+               $qb = $this->dbc->getQueryBuilder();
+               $qb->select('owncloud_name', 'directory_uuid')
                        ->from($table)
-                       ->where($q->expr()->like('owncloud_name', $q->createNamedParameter(str_repeat('_', 65) . '%'), Types::STRING));
-               return $q;
+                       ->where($qb->expr()->like('owncloud_name', $qb->createNamedParameter(str_repeat('_', 65) . '%'), Types::STRING));
+               return $qb;
        }
 
        protected function getUpdateQuery(string $table): IQueryBuilder {
-               $q = $this->dbc->getQueryBuilder();
-               $q->update($table)
-                       ->set('owncloud_name', $q->createParameter('newId'))
-                       ->where($q->expr()->eq('directory_uuid', $q->createParameter('uuid')));
-               return $q;
+               $qb = $this->dbc->getQueryBuilder();
+               $qb->update($table)
+                       ->set('owncloud_name', $qb->createParameter('newId'))
+                       ->where($qb->expr()->eq('directory_uuid', $qb->createParameter('uuid')));
+               return $qb;
        }
 
        protected function emitUnassign(string $oldId, bool $pre): void {

diff --git a/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php b/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
index 144efad0eadcd6b214ef688e46915352d2d11b09..b79dbabd5a0ae8eada1593feeb3f1df7bf46d321 100644 (file)
--- a/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
+++ b/apps/user_ldap/lib/Migration/Version1130Date20211102154716.php
@@ -103,16 +103,16 @@ class Version1130Date20211102154716 extends SimpleMigrationStep {
        }
 
        protected function handleDNHashes(string $table): void {
-               $q = $this->getSelectQuery($table);
-               $u = $this->getUpdateQuery($table);
+               $select = $this->getSelectQuery($table);
+               $update = $this->getUpdateQuery($table);
 
-               $r = $q->executeQuery();
-               while ($row = $r->fetch()) {
+               $result = $select->executeQuery();
+               while ($row = $result->fetch()) {
                        $dnHash = hash('sha256', $row['ldap_dn'], false);
-                       $u->setParameter('name', $row['owncloud_name']);
-                       $u->setParameter('dn_hash', $dnHash);
+                       $update->setParameter('name', $row['owncloud_name']);
+                       $update->setParameter('dn_hash', $dnHash);
                        try {
-                               $u->executeStatement();
+                               $update->executeStatement();
                        } catch (Exception $e) {
                                $this->logger->error('Failed to add hash "{dnHash}" ("{name}" of {table})',
                                        [
@@ -125,22 +125,22 @@ class Version1130Date20211102154716 extends SimpleMigrationStep {
                                );
                        }
                }
-               $r->closeCursor();
+               $result->closeCursor();
        }
 
        protected function getSelectQuery(string $table): IQueryBuilder {
-               $q = $this->dbc->getQueryBuilder();
-               $q->select('owncloud_name', 'ldap_dn', 'ldap_dn_hash')
+               $qb = $this->dbc->getQueryBuilder();
+               $qb->select('owncloud_name', 'ldap_dn', 'ldap_dn_hash')
                        ->from($table)
-                       ->where($q->expr()->isNull('ldap_dn_hash'));
-               return $q;
+                       ->where($qb->expr()->isNull('ldap_dn_hash'));
+               return $qb;
        }
 
        protected function getUpdateQuery(string $table): IQueryBuilder {
-               $q = $this->dbc->getQueryBuilder();
-               $q->update($table)
-                       ->set('ldap_dn_hash', $q->createParameter('dn_hash'))
-                       ->where($q->expr()->eq('owncloud_name', $q->createParameter('name')));
-               return $q;
+               $qb = $this->dbc->getQueryBuilder();
+               $qb->update($table)
+                       ->set('ldap_dn_hash', $qb->createParameter('dn_hash'))
+                       ->where($qb->expr()->eq('owncloud_name', $qb->createParameter('name')));
+               return $qb;
        }
 }