]> source.dussan.org Git - nextcloud-server.git/commitdiff
chore(db): Correctly apply query types 48724/head
authorGit'Fellow <12234510+solracsf@users.noreply.github.com>
Wed, 16 Oct 2024 08:41:21 +0000 (10:41 +0200)
committerGit'Fellow <12234510+solracsf@users.noreply.github.com>
Thu, 17 Oct 2024 07:21:07 +0000 (09:21 +0200)
fix: psalm

fix: error

fix: add batch

fix: fatal error

fix: add batch

chore: add batch

chore: add batch

fix: psalm

fix: typo

fix: psalm

fix: return bool

fix: revert Manager

28 files changed:
apps/contactsinteraction/lib/Db/CardSearchDao.php
apps/dav/lib/CalDAV/Schedule/IMipService.php
apps/dav/lib/CardDAV/CardDavBackend.php
apps/dav/lib/Migration/BuildCalendarSearchIndex.php
apps/dav/lib/Migration/RegisterBuildReminderIndexBackgroundJob.php
apps/federatedfilesharing/lib/FederatedShareProvider.php
apps/files/lib/Command/DeleteOrphanedFiles.php
apps/files_external/lib/Service/DBConfigService.php
apps/files_sharing/lib/BackgroundJob/FederatedSharesDiscoverJob.php
apps/files_sharing/lib/SharedMount.php
apps/user_ldap/lib/Mapping/AbstractMapping.php
apps/workflowengine/lib/Manager.php
apps/workflowengine/lib/Migration/PopulateNewlyIntroducedDatabaseFields.php
build/psalm-baseline.xml
core/Command/Preview/ResetRenderedTexts.php
lib/private/Accounts/AccountManager.php
lib/private/Authentication/Token/PublicKeyTokenMapper.php
lib/private/Files/Cache/Propagator.php
lib/private/Files/Cache/StorageGlobal.php
lib/private/Files/Type/Loader.php
lib/private/Group/Database.php
lib/private/Preview/BackgroundCleanupJob.php
lib/private/Repair/OldGroupMembershipShares.php
lib/private/Repair/RemoveLinkShares.php
lib/private/Repair/RepairInvalidShares.php
lib/private/Security/Bruteforce/CleanupJob.php
lib/private/SubAdmin.php
lib/private/Updater/ChangesMapper.php

index 09fa4711adb29bd73077f8fad81edbcc57a1930f..b1dadd6cfbcaaead7128299e5f68d42c0ccd7a49 100644 (file)
@@ -15,10 +15,10 @@ use function is_resource;
 use function stream_get_contents;
 
 class CardSearchDao {
-       private IDBConnection $db;
 
-       public function __construct(IDBConnection $db) {
-               $this->db = $db;
+       public function __construct(
+               private IDBConnection $db,
+       ) {
        }
 
        public function findExisting(IUser $user,
@@ -65,7 +65,7 @@ class CardSearchDao {
                        ->where($cardQuery->expr()->in('id', $cardQuery->createFunction($propQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
                        ->andWhere($cardQuery->expr()->in('addressbookid', $cardQuery->createFunction($addressbooksQuery->getSQL()), IQueryBuilder::PARAM_INT_ARRAY))
                        ->setMaxResults(1);
-               $result = $cardQuery->execute();
+               $result = $cardQuery->executeQuery();
                /** @var string|resource|false $card */
                $card = $result->fetchOne();
 
index a101cb05db3023d0d75007273c8de8ce55be9d38..5b6efba9909119121f03d0f601a5dc16a7187947 100644 (file)
@@ -27,13 +27,7 @@ use Sabre\VObject\Recur\EventIterator;
 
 class IMipService {
 
-       private URLGenerator $urlGenerator;
-       private IConfig $config;
-       private IDBConnection $db;
-       private ISecureRandom $random;
-       private L10NFactory $l10nFactory;
        private IL10N $l10n;
-       private ITimeFactory $timeFactory;
 
        /** @var string[] */
        private const STRING_DIFF = [
@@ -43,20 +37,16 @@ class IMipService {
                'meeting_location' => 'LOCATION'
        ];
 
-       public function __construct(URLGenerator $urlGenerator,
-               IConfig $config,
-               IDBConnection $db,
-               ISecureRandom $random,
-               L10NFactory $l10nFactory,
-               ITimeFactory $timeFactory) {
-               $this->urlGenerator = $urlGenerator;
-               $this->config = $config;
-               $this->db = $db;
-               $this->random = $random;
-               $this->l10nFactory = $l10nFactory;
+       public function __construct(
+               private URLGenerator $urlGenerator,
+               private IConfig $config,
+               private IDBConnection $db,
+               private ISecureRandom $random,
+               private L10NFactory $l10nFactory,
+               private ITimeFactory $timeFactory,
+       ) {
                $default = $this->l10nFactory->findGenericLanguage();
                $this->l10n = $this->l10nFactory->get('dav', $default);
-               $this->timeFactory = $timeFactory;
        }
 
        /**
@@ -912,7 +902,7 @@ class IMipService {
                                'expiration' => $query->createNamedParameter($lastOccurrence),
                                'uid' => $query->createNamedParameter($uid)
                        ])
-                       ->execute();
+                       ->executeStatement();
 
                return $token;
        }
index b94da9fa7ed1a2adefb3ab5689b7b55bf0c09bcd..f7d0a888efd79d35292e45a22b816edb2de44881 100644 (file)
@@ -200,7 +200,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 
                $addressBooks = [];
 
-               $result = $query->execute();
+               $result = $query->executeQuery();
                while ($row = $result->fetch()) {
                        $addressBooks[$row['id']] = [
                                'id' => $row['id'],
@@ -395,7 +395,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
                                        'synctoken' => $query->createParameter('synctoken'),
                                ])
                                ->setParameters($values)
-                               ->execute();
+                               ->executeStatement();
 
                        $addressBookId = $query->getLastInsertId();
                        return [
@@ -479,7 +479,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 
                $cards = [];
 
-               $result = $query->execute();
+               $result = $query->executeQuery();
                while ($row = $result->fetch()) {
                        $row['etag'] = '"' . $row['etag'] . '"';
 
@@ -516,7 +516,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
                        ->andWhere($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
                        ->setMaxResults(1);
 
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $row = $result->fetch();
                if (!$row) {
                        return false;
@@ -560,7 +560,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
 
                foreach ($chunks as $uris) {
                        $query->setParameter('uri', $uris, IQueryBuilder::PARAM_STR_ARRAY);
-                       $result = $query->execute();
+                       $result = $query->executeQuery();
 
                        while ($row = $result->fetch()) {
                                $row['etag'] = '"' . $row['etag'] . '"';
@@ -634,7 +634,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
                                        'etag' => $query->createNamedParameter($etag),
                                        'uid' => $query->createNamedParameter($uid),
                                ])
-                               ->execute();
+                               ->executeStatement();
 
                        $etagCacheKey = "$addressBookId#$cardUri";
                        $this->etagCache[$etagCacheKey] = $etag;
@@ -697,7 +697,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
                                ->set('uid', $query->createNamedParameter($uid))
                                ->where($query->expr()->eq('uri', $query->createNamedParameter($cardUri)))
                                ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)))
-                               ->execute();
+                               ->executeStatement();
 
                        $this->etagCache[$etagCacheKey] = $etag;
 
@@ -1165,7 +1165,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
                         */
                }
 
-               $result = $query2->execute();
+               $result = $query2->executeQuery();
                $matches = $result->fetchAll();
                $result->closeCursor();
                $matches = array_map(function ($match) {
@@ -1207,7 +1207,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
                        ->from($this->dbCardsPropertiesTable)
                        ->where($query->expr()->eq('name', $query->createNamedParameter($name)))
                        ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($bookId)))
-                       ->execute();
+                       ->executeQuery();
 
                $all = $result->fetchAll(PDO::FETCH_COLUMN);
                $result->closeCursor();
@@ -1227,7 +1227,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
                        ->where($query->expr()->eq('id', $query->createParameter('id')))
                        ->setParameter('id', $id);
 
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $uri = $result->fetch();
                $result->closeCursor();
 
@@ -1251,7 +1251,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
                $query->select('*')->from($this->dbCardsTable)
                        ->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
                        ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
-               $queryResult = $query->execute();
+               $queryResult = $query->executeQuery();
                $contact = $queryResult->fetch();
                $queryResult->closeCursor();
 
@@ -1324,7 +1324,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
                                $query->setParameter('name', $property->name);
                                $query->setParameter('value', mb_strcut($property->getValue(), 0, 254));
                                $query->setParameter('preferred', $preferred);
-                               $query->execute();
+                               $query->executeStatement();
                        }
                }, $this->db);
        }
@@ -1350,7 +1350,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
                $query->delete($this->dbCardsPropertiesTable)
                        ->where($query->expr()->eq('cardid', $query->createNamedParameter($cardId)))
                        ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
-               $query->execute();
+               $query->executeStatement();
        }
 
        /**
@@ -1362,7 +1362,7 @@ class CardDavBackend implements BackendInterface, SyncSupport {
                        ->where($query->expr()->eq('uri', $query->createNamedParameter($uri)))
                        ->andWhere($query->expr()->eq('addressbookid', $query->createNamedParameter($addressBookId)));
 
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $cardIds = $result->fetch();
                $result->closeCursor();
 
index 592a6f85bdc73a86c2a55c2136349fcad5afa52c..b157934a1ff95f81b79d1232502da6f160932ac1 100644 (file)
@@ -13,26 +13,11 @@ use OCP\Migration\IRepairStep;
 
 class BuildCalendarSearchIndex implements IRepairStep {
 
-       /** @var IDBConnection */
-       private $db;
-
-       /** @var IJobList */
-       private $jobList;
-
-       /** @var IConfig */
-       private $config;
-
-       /**
-        * @param IDBConnection $db
-        * @param IJobList $jobList
-        * @param IConfig $config
-        */
-       public function __construct(IDBConnection $db,
-               IJobList $jobList,
-               IConfig $config) {
-               $this->db = $db;
-               $this->jobList = $jobList;
-               $this->config = $config;
+       public function __construct(
+               private IDBConnection $db,
+               private IJobList $jobList,
+               private IConfig $config,
+       ) {
        }
 
        /**
@@ -55,7 +40,7 @@ class BuildCalendarSearchIndex implements IRepairStep {
                $query = $this->db->getQueryBuilder();
                $query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
                        ->from('calendarobjects');
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $maxId = (int)$result->fetchOne();
                $result->closeCursor();
 
index f9a12ecbfae8ae670eb0f2ddec6b3a2ceff889f5..7f74390f88386191bd024ad965064e7963853d85 100644 (file)
@@ -22,15 +22,6 @@ use OCP\Migration\IRepairStep;
  */
 class RegisterBuildReminderIndexBackgroundJob implements IRepairStep {
 
-       /** @var IDBConnection */
-       private $db;
-
-       /** @var IJobList */
-       private $jobList;
-
-       /** @var IConfig */
-       private $config;
-
        /** @var string */
        private const CONFIG_KEY = 'buildCalendarReminderIndex';
 
@@ -39,12 +30,11 @@ class RegisterBuildReminderIndexBackgroundJob implements IRepairStep {
         * @param IJobList $jobList
         * @param IConfig $config
         */
-       public function __construct(IDBConnection $db,
-               IJobList $jobList,
-               IConfig $config) {
-               $this->db = $db;
-               $this->jobList = $jobList;
-               $this->config = $config;
+       public function __construct(
+               private IDBConnection $db,
+               private IJobList $jobList,
+               private IConfig $config,
+       ) {
        }
 
        /**
@@ -67,7 +57,7 @@ class RegisterBuildReminderIndexBackgroundJob implements IRepairStep {
                $query = $this->db->getQueryBuilder();
                $query->select($query->createFunction('MAX(' . $query->getColumnName('id') . ')'))
                        ->from('calendarobjects');
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $maxId = (int)$result->fetchOne();
                $result->closeCursor();
 
index f349bb2a6fc361a2ea8c8c0fb88b348a222d219e..da55b9a03d75cf151a51c5adde6318ee40e77cc1 100644 (file)
@@ -267,7 +267,7 @@ class FederatedShareProvider implements IShareProvider {
                $query->select('*')->from($this->externalShareTable)
                        ->where($query->expr()->eq('user', $query->createNamedParameter($share->getShareOwner())))
                        ->andWhere($query->expr()->eq('mountpoint', $query->createNamedParameter($share->getTarget())));
-               $qResult = $query->execute();
+               $qResult = $query->executeQuery();
                $result = $qResult->fetchAll();
                $qResult->closeCursor();
 
@@ -313,7 +313,7 @@ class FederatedShareProvider implements IShareProvider {
                 */
                $qb->setValue('file_target', $qb->createNamedParameter(''));
 
-               $qb->execute();
+               $qb->executeStatement();
                return $qb->getLastInsertId();
        }
 
@@ -334,7 +334,7 @@ class FederatedShareProvider implements IShareProvider {
                        ->set('uid_owner', $qb->createNamedParameter($share->getShareOwner()))
                        ->set('uid_initiator', $qb->createNamedParameter($share->getSharedBy()))
                        ->set('expiration', $qb->createNamedParameter($share->getExpirationDate(), IQueryBuilder::PARAM_DATE))
-                       ->execute();
+                       ->executeStatement();
 
                // send the updated permission to the owner/initiator, if they are not the same
                if ($share->getShareOwner() !== $share->getSharedBy()) {
@@ -374,7 +374,7 @@ class FederatedShareProvider implements IShareProvider {
                $query->update('share')
                        ->where($query->expr()->eq('id', $query->createNamedParameter($shareId)))
                        ->set('token', $query->createNamedParameter($token))
-                       ->execute();
+                       ->executeStatement();
        }
 
        /**
@@ -392,7 +392,7 @@ class FederatedShareProvider implements IShareProvider {
                                        'remote_id' => $query->createNamedParameter($remoteId),
                                ]
                        );
-               $query->execute();
+               $query->executeStatement();
        }
 
        /**
@@ -406,7 +406,7 @@ class FederatedShareProvider implements IShareProvider {
                $query = $this->dbConnection->getQueryBuilder();
                $query->select('remote_id')->from('federated_reshares')
                        ->where($query->expr()->eq('share_id', $query->createNamedParameter((int)$share->getId())));
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $data = $result->fetch();
                $result->closeCursor();
 
@@ -444,7 +444,7 @@ class FederatedShareProvider implements IShareProvider {
                        ->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)))
                        ->orderBy('id');
 
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
                while ($data = $cursor->fetch()) {
                        $children[] = $this->createShareObject($data);
                }
@@ -524,12 +524,12 @@ class FederatedShareProvider implements IShareProvider {
                $qb->delete('share')
                        ->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)))
                        ->andWhere($qb->expr()->neq('share_type', $qb->createNamedParameter(IShare::TYPE_CIRCLE)));
-               $qb->execute();
+               $qb->executeStatement();
 
                $qb = $this->dbConnection->getQueryBuilder();
                $qb->delete('federated_reshares')
                        ->where($qb->expr()->eq('share_id', $qb->createNamedParameter($shareId)));
-               $qb->execute();
+               $qb->executeStatement();
        }
 
        /**
@@ -583,7 +583,7 @@ class FederatedShareProvider implements IShareProvider {
 
                $qb->orderBy('id');
 
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
                $shares = [];
                while ($data = $cursor->fetch()) {
                        $shares[$data['fileid']][] = $this->createShareObject($data);
@@ -639,7 +639,7 @@ class FederatedShareProvider implements IShareProvider {
                $qb->setFirstResult($offset);
                $qb->orderBy('id');
 
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
                $shares = [];
                while ($data = $cursor->fetch()) {
                        $shares[] = $this->createShareObject($data);
@@ -660,7 +660,7 @@ class FederatedShareProvider implements IShareProvider {
                        ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
                        ->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)));
 
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
                $data = $cursor->fetch();
                $cursor->closeCursor();
 
@@ -691,7 +691,7 @@ class FederatedShareProvider implements IShareProvider {
                        ->from('share')
                        ->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
                        ->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)))
-                       ->execute();
+                       ->executeQuery();
 
                $shares = [];
                while ($data = $cursor->fetch()) {
@@ -731,7 +731,7 @@ class FederatedShareProvider implements IShareProvider {
                        $qb->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($node->getId())));
                }
 
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
 
                while ($data = $cursor->fetch()) {
                        $shares[] = $this->createShareObject($data);
@@ -756,7 +756,7 @@ class FederatedShareProvider implements IShareProvider {
                        ->from('share')
                        ->where($qb->expr()->in('share_type', $qb->createNamedParameter($this->supportedShareType, IQueryBuilder::PARAM_INT_ARRAY)))
                        ->andWhere($qb->expr()->eq('token', $qb->createNamedParameter($token)))
-                       ->execute();
+                       ->executeQuery();
 
                $data = $cursor->fetch();
 
@@ -787,7 +787,7 @@ class FederatedShareProvider implements IShareProvider {
                        ->from('share')
                        ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
 
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
                $data = $cursor->fetch();
                $cursor->closeCursor();
 
@@ -884,7 +884,7 @@ class FederatedShareProvider implements IShareProvider {
                $qb->delete('share')
                        ->where($qb->expr()->eq('share_type', $qb->createNamedParameter(IShare::TYPE_REMOTE)))
                        ->andWhere($qb->expr()->eq('uid_owner', $qb->createNamedParameter($uid)))
-                       ->execute();
+                       ->executeStatement();
        }
 
        /**
@@ -1015,7 +1015,7 @@ class FederatedShareProvider implements IShareProvider {
                                $qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
                                $qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
                        ));
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
 
                if ($currentAccess === false) {
                        $remote = $cursor->fetch() !== false;
@@ -1048,7 +1048,7 @@ class FederatedShareProvider implements IShareProvider {
                                )
                        );
 
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
                while ($data = $cursor->fetch()) {
                        try {
                                $share = $this->createShareObject($data);
index 4bbee0b45f4f295f06145fb3dfa5d2a6d42f16e9..966351e4da0628fe0af56249cc9327b868c79d8a 100644 (file)
@@ -147,11 +147,11 @@ class DeleteOrphanedFiles extends Command {
                $deletedInLastChunk = self::CHUNK_SIZE;
                while ($deletedInLastChunk === self::CHUNK_SIZE) {
                        $deletedInLastChunk = 0;
-                       $result = $query->execute();
+                       $result = $query->executeQuery();
                        while ($row = $result->fetch()) {
                                $deletedInLastChunk++;
                                $deletedEntries += $deleteQuery->setParameter('storageid', (int)$row['storage_id'])
-                                       ->execute();
+                                       ->executeStatement();
                        }
                        $result->closeCursor();
                }
index 6fb7e01271e3e3a17178bf05315a27a723309407..3820f6b0d96a2ce356aa298e210aaa4bd599511d 100644 (file)
@@ -24,25 +24,10 @@ class DBConfigService {
        public const APPLICABLE_TYPE_GROUP = 2;
        public const APPLICABLE_TYPE_USER = 3;
 
-       /**
-        * @var IDBConnection
-        */
-       private $connection;
-
-       /**
-        * @var ICrypto
-        */
-       private $crypto;
-
-       /**
-        * DBConfigService constructor.
-        *
-        * @param IDBConnection $connection
-        * @param ICrypto $crypto
-        */
-       public function __construct(IDBConnection $connection, ICrypto $crypto) {
-               $this->connection = $connection;
-               $this->crypto = $crypto;
+       public function __construct(
+               private IDBConnection $connection,
+               private ICrypto $crypto,
+       ) {
        }
 
        public function getMountById(int $mountId): ?array {
@@ -112,7 +97,7 @@ class DBConfigService {
                        )
                        )
                        ->groupBy(['a.mount_id']);
-               $stmt = $query->execute();
+               $stmt = $query->executeQuery();
                $result = $stmt->fetchAll();
                $stmt->closeCursor();
 
@@ -243,7 +228,7 @@ class DBConfigService {
                                'priority' => $builder->createNamedParameter($priority, IQueryBuilder::PARAM_INT),
                                'type' => $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT)
                        ]);
-               $query->execute();
+               $query->executeStatement();
                return $query->getLastInsertId();
        }
 
@@ -256,22 +241,22 @@ class DBConfigService {
                $builder = $this->connection->getQueryBuilder();
                $query = $builder->delete('external_mounts')
                        ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-               $query->execute();
+               $query->executeStatement();
 
                $builder = $this->connection->getQueryBuilder();
                $query = $builder->delete('external_applicable')
                        ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-               $query->execute();
+               $query->executeStatement();
 
                $builder = $this->connection->getQueryBuilder();
                $query = $builder->delete('external_config')
                        ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-               $query->execute();
+               $query->executeStatement();
 
                $builder = $this->connection->getQueryBuilder();
                $query = $builder->delete('external_options')
                        ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
-               $query->execute();
+               $query->executeStatement();
        }
 
        /**
@@ -285,7 +270,7 @@ class DBConfigService {
                        ->set('mount_point', $builder->createNamedParameter($newMountPoint))
                        ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
 
-               $query->execute();
+               $query->executeStatement();
        }
 
        /**
@@ -299,7 +284,7 @@ class DBConfigService {
                        ->set('auth_backend', $builder->createNamedParameter($newAuthBackend))
                        ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)));
 
-               $query->execute();
+               $query->executeStatement();
        }
 
        /**
@@ -325,7 +310,7 @@ class DBConfigService {
                                ->set('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR))
                                ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
                                ->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
-                       $query->execute();
+                       $query->executeStatement();
                }
        }
 
@@ -348,7 +333,7 @@ class DBConfigService {
                                ->set('value', $builder->createNamedParameter(json_encode($value), IQueryBuilder::PARAM_STR))
                                ->where($builder->expr()->eq('mount_id', $builder->createNamedParameter($mountId, IQueryBuilder::PARAM_INT)))
                                ->andWhere($builder->expr()->eq('key', $builder->createNamedParameter($key, IQueryBuilder::PARAM_STR)));
-                       $query->execute();
+                       $query->executeStatement();
                }
        }
 
@@ -377,11 +362,11 @@ class DBConfigService {
                        $query = $query->andWhere($builder->expr()->eq('value', $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR)));
                }
 
-               $query->execute();
+               $query->executeStatement();
        }
 
        private function getMountsFromQuery(IQueryBuilder $query) {
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $mounts = $result->fetchAll();
                $uniqueMounts = [];
                foreach ($mounts as $mount) {
@@ -432,7 +417,7 @@ class DBConfigService {
                        ->from($table)
                        ->where($builder->expr()->in('mount_id', $placeHolders));
 
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $rows = $result->fetchAll();
                $result->closeCursor();
 
index 44b473ac64d619c4b834dc5cf97167fa249a3cd0..ca4c82c03d75689d49e93826c1f6bb60f72aa314 100644 (file)
@@ -36,7 +36,7 @@ class FederatedSharesDiscoverJob extends TimedJob {
                $qb->selectDistinct('remote')
                        ->from('share_external');
 
-               $result = $qb->execute();
+               $result = $qb->executeQuery();
                while ($row = $result->fetch()) {
                        $this->discoveryService->discover($row['remote'], 'FEDERATED_SHARING', true);
                        try {
index 420de6889bf366ee5df428cd43f06990be4d3bb7..6a5a55abed26ec40b24c00ea994bb074384b0b60 100644 (file)
@@ -32,39 +32,23 @@ class SharedMount extends MountPoint implements MoveableMount, ISharedMountPoint
         */
        protected $storage = null;
 
-       /**
-        * @var \OC\Files\View
-        */
-       private $recipientView;
-
-       private IUser $user;
-
        /** @var \OCP\Share\IShare */
        private $superShare;
 
        /** @var \OCP\Share\IShare[] */
        private $groupedShares;
 
-       private IEventDispatcher $eventDispatcher;
-
-       private ICache $cache;
-
        public function __construct(
                $storage,
                array $mountpoints,
                $arguments,
                IStorageFactory $loader,
-               View $recipientView,
+               private View $recipientView,
                CappedMemoryCache $folderExistCache,
-               IEventDispatcher $eventDispatcher,
-               IUser $user,
-               ICache $cache,
+               private IEventDispatcher $eventDispatcher,
+               private IUser $user,
+               private ICache $cache,
        ) {
-               $this->user = $user;
-               $this->recipientView = $recipientView;
-               $this->eventDispatcher = $eventDispatcher;
-               $this->cache = $cache;
-
                $this->superShare = $arguments['superShare'];
                $this->groupedShares = $arguments['groupedShares'];
 
@@ -271,7 +255,7 @@ class SharedMount extends MountPoint implements MoveableMount, ISharedMountPoint
                                ->from('filecache')
                                ->where($builder->expr()->eq('fileid', $builder->createNamedParameter($this->getStorageRootId())));
 
-                       $result = $query->execute();
+                       $result = $query->executeQuery();
                        $row = $result->fetch();
                        $result->closeCursor();
                        if ($row) {
index a8f0cf84d76101a91b443c950566ce02741a6e20..673789f946b21687d48c7540f3404470ba556224 100644 (file)
@@ -435,7 +435,7 @@ abstract class AbstractMapping {
                $query = $this->dbc->getQueryBuilder();
                $query->select($query->func()->count('ldap_dn_hash'))
                        ->from($this->getTableName());
-               $res = $query->execute();
+               $res = $query->executeQuery();
                $count = $res->fetchOne();
                $res->closeCursor();
                return (int)$count;
@@ -446,7 +446,7 @@ abstract class AbstractMapping {
                $query->select($query->func()->count('ldap_dn_hash'))
                        ->from($this->getTableName())
                        ->where($query->expr()->like('directory_uuid', $query->createNamedParameter('invalidated_%')));
-               $res = $query->execute();
+               $res = $query->executeQuery();
                $count = $res->fetchOne();
                $res->closeCursor();
                return (int)$count;
index f03f84a33c01d29b87d83259f70149896932df99..7d14fc834491e39b47c66947a70c5b5ebb0d31cb 100644 (file)
@@ -99,7 +99,7 @@ class Manager implements IManager {
                        ->where($query->expr()->neq('events', $query->createNamedParameter('[]'), IQueryBuilder::PARAM_STR))
                        ->groupBy('class', 'entity', $query->expr()->castColumn('events', IQueryBuilder::PARAM_STR));
 
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $operations = [];
                while ($row = $result->fetch()) {
                        $eventNames = \json_decode($row['events']);
@@ -145,7 +145,7 @@ class Manager implements IManager {
                        ->where($query->expr()->eq('o.class', $query->createParameter('operationClass')));
 
                $query->setParameters(['operationClass' => $operationClass]);
-               $result = $query->execute();
+               $result = $query->executeQuery();
 
                $scopesByOperation[$operationClass] = [];
                while ($row = $result->fetch()) {
@@ -180,7 +180,7 @@ class Manager implements IManager {
                }
 
                $query->setParameters(['scope' => $scopeContext->getScope(), 'scopeId' => $scopeContext->getScopeId()]);
-               $result = $query->execute();
+               $result = $query->executeQuery();
 
                $this->operations[$scopeContext->getHash()] = [];
                while ($row = $result->fetch()) {
@@ -221,7 +221,7 @@ class Manager implements IManager {
                $query->select('*')
                        ->from('flow_operations')
                        ->where($query->expr()->eq('id', $query->createNamedParameter($id)));
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $row = $result->fetch();
                $result->closeCursor();
 
@@ -250,7 +250,7 @@ class Manager implements IManager {
                                'entity' => $query->createNamedParameter($entity),
                                'events' => $query->createNamedParameter(json_encode($events))
                        ]);
-               $query->execute();
+               $query->executeStatement();
 
                $this->cacheFactory->createDistributed('flow')->remove('events');
 
@@ -313,7 +313,7 @@ class Manager implements IManager {
                }
 
                $qb->setParameters(['scope' => $scopeContext->getScope(), 'scopeId' => $scopeContext->getScopeId()]);
-               $result = $qb->execute();
+               $result = $qb->executeQuery();
 
                $operations = [];
                while (($opId = $result->fetchOne()) !== false) {
@@ -393,12 +393,12 @@ class Manager implements IManager {
                        $this->connection->beginTransaction();
                        $result = (bool)$query->delete('flow_operations')
                                ->where($query->expr()->eq('id', $query->createNamedParameter($id)))
-                               ->execute();
+                               ->executeStatement();
                        if ($result) {
                                $qb = $this->connection->getQueryBuilder();
                                $result &= (bool)$qb->delete('flow_operations_scope')
                                        ->where($qb->expr()->eq('operation_id', $qb->createNamedParameter($id)))
-                                       ->execute();
+                                       ->executeStatement();
                        }
                        $this->connection->commit();
                } catch (Exception $e) {
@@ -537,7 +537,7 @@ class Manager implements IManager {
                $query->select('*')
                        ->from('flow_checks')
                        ->where($query->expr()->in('id', $query->createNamedParameter($checkIds, IQueryBuilder::PARAM_INT_ARRAY)));
-               $result = $query->execute();
+               $result = $query->executeQuery();
 
                while ($row = $result->fetch()) {
                        $this->checks[(int)$row['id']] = $row;
@@ -568,7 +568,7 @@ class Manager implements IManager {
                $query->select('id')
                        ->from('flow_checks')
                        ->where($query->expr()->eq('hash', $query->createNamedParameter($hash)));
-               $result = $query->execute();
+               $result = $query->executeQuery();
 
                if ($row = $result->fetch()) {
                        $result->closeCursor();
@@ -583,7 +583,7 @@ class Manager implements IManager {
                                'value' => $query->createNamedParameter($value),
                                'hash' => $query->createNamedParameter($hash),
                        ]);
-               $query->execute();
+               $query->executeStatement();
 
                return $query->getLastInsertId();
        }
@@ -597,7 +597,7 @@ class Manager implements IManager {
                        'type' => $query->createNamedParameter($scope->getScope()),
                        'value' => $query->createNamedParameter($scope->getScopeId()),
                ]);
-               $insertQuery->execute();
+               $insertQuery->executeStatement();
        }
 
        public function formatOperation(array $operation): array {
index 0bc380f8fc683644e6375dae7426a86de215b76e..633d946cd7e405cf95d94371900902d4ff202dcd 100644 (file)
@@ -16,11 +16,9 @@ use OCP\WorkflowEngine\IManager;
 
 class PopulateNewlyIntroducedDatabaseFields implements IRepairStep {
 
-       /** @var IDBConnection */
-       private $dbc;
-
-       public function __construct(IDBConnection $dbc) {
-               $this->dbc = $dbc;
+       public function __construct(
+               private IDBConnection $dbc,
+       ) {
        }
 
        public function getName() {
@@ -41,7 +39,7 @@ class PopulateNewlyIntroducedDatabaseFields implements IRepairStep {
                $insertQuery = $qb->insert('flow_operations_scope');
                while (($id = $ids->fetchOne()) !== false) {
                        $insertQuery->values(['operation_id' => $qb->createNamedParameter($id), 'type' => IManager::SCOPE_ADMIN]);
-                       $insertQuery->execute();
+                       $insertQuery->executeStatement();
                }
        }
 
@@ -55,7 +53,7 @@ class PopulateNewlyIntroducedDatabaseFields implements IRepairStep {
                // in case the repair step is executed multiple times for whatever reason.
 
                /** @var IResult $result */
-               $result = $selectQuery->execute();
+               $result = $selectQuery->executeQuery();
                return $result;
        }
 }
index 628c307cae771f118eb7db522b36e4b87e683da7..22ecf47ec8e3dcb83b0ddfcfe03d0226349582e6 100644 (file)
       <code><![CDATA[$mimetype]]></code>
     </ParamNameMismatch>
   </file>
-  <file src="lib/private/Files/Type/Loader.php">
-    <InvalidReturnStatement>
-      <code><![CDATA[$update->execute()]]></code>
-    </InvalidReturnStatement>
-    <InvalidReturnType>
-      <code><![CDATA[int]]></code>
-    </InvalidReturnType>
-  </file>
   <file src="lib/private/Files/Utils/Scanner.php">
     <LessSpecificReturnStatement>
       <code><![CDATA[$mounts]]></code>
index 12f7d237d8f34c8f3fc082373239f1e9b512296b..4cae315e48b6730db8f1b53d1b03efcb25148064 100644 (file)
@@ -120,7 +120,7 @@ class ResetRenderedTexts extends Command {
                $qb->select('path', 'mimetype')
                        ->from('filecache')
                        ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($this->previewFolder->getId())));
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
                $data = $cursor->fetch();
                $cursor->closeCursor();
 
@@ -153,7 +153,7 @@ class ResetRenderedTexts extends Command {
                                )
                        );
 
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
 
                while ($row = $cursor->fetch()) {
                        yield $row;
index 2ab2beb6d3ea9e31357e41d809204099e32c181b..0d091786cd69fe9a65d40064726974d4c34931a7 100644 (file)
@@ -243,7 +243,7 @@ class AccountManager implements IAccountManager {
                $query = $this->connection->getQueryBuilder();
                $query->delete($this->table)
                        ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-                       ->execute();
+                       ->executeStatement();
 
                $this->deleteUserData($user);
        }
@@ -256,7 +256,7 @@ class AccountManager implements IAccountManager {
                $query = $this->connection->getQueryBuilder();
                $query->delete($this->dataTable)
                        ->where($query->expr()->eq('uid', $query->createNamedParameter($uid)))
-                       ->execute();
+                       ->executeStatement();
        }
 
        /**
index b1341fe1898e7e32ce96a460ce8bd2d7e74b8ae7..9aabd69e57a12e516ba827db5fc38f5503f9b29a 100644 (file)
@@ -31,7 +31,7 @@ class PublicKeyTokenMapper extends QBMapper {
                $qb->delete($this->tableName)
                        ->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
                        ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-                       ->execute();
+                       ->executeStatement();
        }
 
        /**
@@ -73,7 +73,7 @@ class PublicKeyTokenMapper extends QBMapper {
                        ->from($this->tableName)
                        ->where($qb->expr()->eq('token', $qb->createNamedParameter($token)))
                        ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-                       ->execute();
+                       ->executeQuery();
 
                $data = $result->fetch();
                $result->closeCursor();
@@ -95,7 +95,7 @@ class PublicKeyTokenMapper extends QBMapper {
                        ->from($this->tableName)
                        ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)))
                        ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
-                       ->execute();
+                       ->executeQuery();
 
                $data = $result->fetch();
                $result->closeCursor();
@@ -122,7 +122,7 @@ class PublicKeyTokenMapper extends QBMapper {
                        ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
                        ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)))
                        ->setMaxResults(1000);
-               $result = $qb->execute();
+               $result = $qb->executeQuery();
                $data = $result->fetchAll();
                $result->closeCursor();
 
@@ -154,7 +154,7 @@ class PublicKeyTokenMapper extends QBMapper {
                $qb->delete($this->tableName)
                        ->where($qb->expr()->eq('name', $qb->createNamedParameter($name), IQueryBuilder::PARAM_STR))
                        ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
-               $qb->execute();
+               $qb->executeStatement();
        }
 
        public function deleteTempToken(PublicKeyToken $except) {
@@ -166,7 +166,7 @@ class PublicKeyTokenMapper extends QBMapper {
                        ->andWhere($qb->expr()->neq('id', $qb->createNamedParameter($except->getId())))
                        ->andWhere($qb->expr()->eq('version', $qb->createNamedParameter(PublicKeyToken::VERSION, IQueryBuilder::PARAM_INT)));
 
-               $qb->execute();
+               $qb->executeStatement();
        }
 
        public function hasExpiredTokens(string $uid): bool {
@@ -177,7 +177,7 @@ class PublicKeyTokenMapper extends QBMapper {
                        ->andWhere($qb->expr()->eq('password_invalid', $qb->createNamedParameter(true), IQueryBuilder::PARAM_BOOL))
                        ->setMaxResults(1);
 
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
                $data = $cursor->fetchAll();
                $cursor->closeCursor();
 
index bbeb8c42075892a59c7de03c85e2efb66b6921a3..cdf9ca9991a1f53789e581a9d26b57569f38ed75 100644 (file)
@@ -45,7 +45,6 @@ class Propagator implements IPropagator {
                $this->ignore = $ignore;
        }
 
-
        /**
         * @param string $internalPath
         * @param int $time
@@ -200,13 +199,13 @@ class Propagator implements IPropagator {
                        $query->setParameter('time', $item['time'], IQueryBuilder::PARAM_INT);
                        $query->setParameter('hash', $item['hash']);
 
-                       $query->execute();
+                       $query->executeStatement();
 
                        if ($item['size']) {
                                $sizeQuery->setParameter('size', $item['size'], IQueryBuilder::PARAM_INT);
                                $sizeQuery->setParameter('hash', $item['hash']);
 
-                               $sizeQuery->execute();
+                               $sizeQuery->executeStatement();
                        }
                }
 
index b55c0fcdb91a0f633b5ba5d3aeb60715c11b0b98..bab31b1db9115e60dad5d129db8e3aef6fb64517 100644 (file)
@@ -21,16 +21,14 @@ use OCP\IDBConnection;
  * @package OC\Files\Cache
  */
 class StorageGlobal {
-       /** @var IDBConnection */
-       private $connection;
-
        /** @var array<string, array> */
        private $cache = [];
        /** @var array<int, array> */
        private $numericIdCache = [];
 
-       public function __construct(IDBConnection $connection) {
-               $this->connection = $connection;
+       public function __construct(
+               private IDBConnection $connection,
+       ) {
        }
 
        /**
@@ -42,7 +40,7 @@ class StorageGlobal {
                        ->from('storages')
                        ->where($builder->expr()->in('id', $builder->createNamedParameter(array_values($storageIds), IQueryBuilder::PARAM_STR_ARRAY)));
 
-               $result = $query->execute();
+               $result = $query->executeQuery();
                while ($row = $result->fetch()) {
                        $this->cache[$row['id']] = $row;
                }
@@ -60,7 +58,7 @@ class StorageGlobal {
                                ->from('storages')
                                ->where($builder->expr()->eq('id', $builder->createNamedParameter($storageId)));
 
-                       $result = $query->execute();
+                       $result = $query->executeQuery();
                        $row = $result->fetch();
                        $result->closeCursor();
 
@@ -83,7 +81,7 @@ class StorageGlobal {
                                ->from('storages')
                                ->where($builder->expr()->eq('numeric_id', $builder->createNamedParameter($numericId)));
 
-                       $result = $query->execute();
+                       $result = $query->executeQuery();
                        $row = $result->fetch();
                        $result->closeCursor();
 
index 407df59b2e2983267301c4cb981b35e89cedf82c..5fbe4139759bee6501a88b8a778313bdfa915240 100644 (file)
@@ -21,8 +21,6 @@ use OCP\IDBConnection;
 class Loader implements IMimeTypeLoader {
        use TTransactional;
 
-       private IDBConnection $dbConnection;
-
        /** @psalm-var array<int, string> */
        protected array $mimetypes;
 
@@ -32,8 +30,9 @@ class Loader implements IMimeTypeLoader {
        /**
         * @param IDBConnection $dbConnection
         */
-       public function __construct(IDBConnection $dbConnection) {
-               $this->dbConnection = $dbConnection;
+       public function __construct(
+               private IDBConnection $dbConnection,
+       ) {
                $this->mimetypes = [];
                $this->mimetypeIds = [];
        }
@@ -161,6 +160,6 @@ class Loader implements IMimeTypeLoader {
                                $update->func()->lower('name'),
                                $update->createNamedParameter('%' . $this->dbConnection->escapeLikeParameter('.' . $ext))
                        ));
-               return $update->execute();
+               return $update->executeStatement();
        }
 }
index 72cd0ea4a9143efafbb51a79b114998a79b34071..095cbe24316a6648ea4f2e2226bee971b802a1c6 100644 (file)
@@ -44,15 +44,15 @@ class Database extends ABackend implements
        INamedBackend {
        /** @var array<string, array{gid: string, displayname: string}> */
        private $groupCache = [];
-       private ?IDBConnection $dbConn;
 
        /**
         * \OC\Group\Database constructor.
         *
         * @param IDBConnection|null $dbConn
         */
-       public function __construct(?IDBConnection $dbConn = null) {
-               $this->dbConn = $dbConn;
+       public function __construct(
+               private ?IDBConnection $dbConn = null,
+       ) {
        }
 
        /**
@@ -102,19 +102,19 @@ class Database extends ABackend implements
                $qb = $this->dbConn->getQueryBuilder();
                $qb->delete('groups')
                        ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
-                       ->execute();
+                       ->executeStatement();
 
                // Delete the group-user relation
                $qb = $this->dbConn->getQueryBuilder();
                $qb->delete('group_user')
                        ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
-                       ->execute();
+                       ->executeStatement();
 
                // Delete the group-groupadmin relation
                $qb = $this->dbConn->getQueryBuilder();
                $qb->delete('group_admin')
                        ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
-                       ->execute();
+                       ->executeStatement();
 
                // Delete from cache
                unset($this->groupCache[$gid]);
@@ -139,7 +139,7 @@ class Database extends ABackend implements
                        ->from('group_user')
                        ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
                        ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
-                       ->execute();
+                       ->executeQuery();
 
                $result = $cursor->fetch();
                $cursor->closeCursor();
@@ -164,7 +164,7 @@ class Database extends ABackend implements
                        $qb->insert('group_user')
                                ->setValue('uid', $qb->createNamedParameter($uid))
                                ->setValue('gid', $qb->createNamedParameter($gid))
-                               ->execute();
+                               ->executeStatement();
                        return true;
                } else {
                        return false;
@@ -186,7 +186,7 @@ class Database extends ABackend implements
                $qb->delete('group_user')
                        ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
                        ->andWhere($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
-                       ->execute();
+                       ->executeStatement();
 
                return true;
        }
@@ -213,7 +213,7 @@ class Database extends ABackend implements
                        ->from('group_user', 'gu')
                        ->leftJoin('gu', 'groups', 'g', $qb->expr()->eq('gu.gid', 'g.gid'))
                        ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
-                       ->execute();
+                       ->executeQuery();
 
                $groups = [];
                while ($row = $cursor->fetch()) {
@@ -260,7 +260,7 @@ class Database extends ABackend implements
                if ($offset > 0) {
                        $query->setFirstResult($offset);
                }
-               $result = $query->execute();
+               $result = $query->executeQuery();
 
                $groups = [];
                while ($row = $result->fetch()) {
@@ -292,7 +292,7 @@ class Database extends ABackend implements
                $cursor = $qb->select('gid', 'displayname')
                        ->from('groups')
                        ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
-                       ->execute();
+                       ->executeQuery();
                $result = $cursor->fetch();
                $cursor->closeCursor();
 
@@ -423,7 +423,7 @@ class Database extends ABackend implements
                        )));
                }
 
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $count = $result->fetchOne();
                $result->closeCursor();
 
@@ -455,7 +455,7 @@ class Database extends ABackend implements
                        ->andWhere($query->expr()->eq('configvalue', $query->createNamedParameter('false'), IQueryBuilder::PARAM_STR))
                        ->andWhere($query->expr()->eq('gid', $query->createNamedParameter($gid), IQueryBuilder::PARAM_STR));
 
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $count = $result->fetchOne();
                $result->closeCursor();
 
@@ -484,7 +484,7 @@ class Database extends ABackend implements
                        ->from('groups')
                        ->where($query->expr()->eq('gid', $query->createNamedParameter($gid)));
 
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $displayName = $result->fetchOne();
                $result->closeCursor();
 
@@ -555,7 +555,7 @@ class Database extends ABackend implements
                $query->update('groups')
                        ->set('displayname', $query->createNamedParameter($displayName))
                        ->where($query->expr()->eq('gid', $query->createNamedParameter($gid)));
-               $query->execute();
+               $query->executeStatement();
 
                return true;
        }
index ad5e793474b91861ce52f6bc870607a51ca83c84..e816ae2274303c1afae4b412585f24b86b5af165 100644 (file)
@@ -18,32 +18,18 @@ use OCP\Files\NotPermittedException;
 use OCP\IDBConnection;
 
 class BackgroundCleanupJob extends TimedJob {
-       /** @var IDBConnection */
-       private $connection;
 
-       /** @var Root */
-       private $previewFolder;
-
-       /** @var bool */
-       private $isCLI;
-
-       /** @var IMimeTypeLoader */
-       private $mimeTypeLoader;
-
-       public function __construct(ITimeFactory $timeFactory,
-               IDBConnection $connection,
-               Root $previewFolder,
-               IMimeTypeLoader $mimeTypeLoader,
-               bool $isCLI) {
+       public function __construct(
+               ITimeFactory $timeFactory,
+               private IDBConnection $connection,
+               private Root $previewFolder,
+               private IMimeTypeLoader $mimeTypeLoader,
+               private bool $isCLI,
+       ) {
                parent::__construct($timeFactory);
                // Run at most once an hour
                $this->setInterval(60 * 60);
                $this->setTimeSensitivity(self::TIME_INSENSITIVE);
-
-               $this->connection = $connection;
-               $this->previewFolder = $previewFolder;
-               $this->isCLI = $isCLI;
-               $this->mimeTypeLoader = $mimeTypeLoader;
        }
 
        public function run($argument) {
@@ -90,7 +76,7 @@ class BackgroundCleanupJob extends TimedJob {
                        $qb->setMaxResults(10);
                }
 
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
 
                while ($row = $cursor->fetch()) {
                        yield $row['name'];
@@ -104,7 +90,7 @@ class BackgroundCleanupJob extends TimedJob {
                $qb->select('path', 'mimetype')
                        ->from('filecache')
                        ->where($qb->expr()->eq('fileid', $qb->createNamedParameter($this->previewFolder->getId())));
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
                $data = $cursor->fetch();
                $cursor->closeCursor();
 
@@ -162,7 +148,7 @@ class BackgroundCleanupJob extends TimedJob {
                        $qb->setMaxResults(10);
                }
 
-               $cursor = $qb->execute();
+               $cursor = $qb->executeQuery();
 
                while ($row = $cursor->fetch()) {
                        yield $row['name'];
index 027f179596c4acfc9b8ada4a999e69d1afeceb7c..003c15cfb888748b43814b444c22b930e9744dc2 100644 (file)
@@ -14,12 +14,6 @@ use OCP\Migration\IRepairStep;
 use OCP\Share\IShare;
 
 class OldGroupMembershipShares implements IRepairStep {
-       /** @var \OCP\IDBConnection */
-       protected $connection;
-
-       /** @var \OCP\IGroupManager */
-       protected $groupManager;
-
        /**
         * @var array [gid => [uid => (bool)]]
         */
@@ -29,9 +23,10 @@ class OldGroupMembershipShares implements IRepairStep {
         * @param IDBConnection $connection
         * @param IGroupManager $groupManager
         */
-       public function __construct(IDBConnection $connection, IGroupManager $groupManager) {
-               $this->connection = $connection;
-               $this->groupManager = $groupManager;
+       public function __construct(
+               protected IDBConnection $connection,
+               protected IGroupManager $groupManager,
+       ) {
        }
 
        /**
@@ -66,11 +61,11 @@ class OldGroupMembershipShares implements IRepairStep {
                $deleteQuery->delete('share')
                        ->where($query->expr()->eq('id', $deleteQuery->createParameter('share')));
 
-               $result = $query->execute();
+               $result = $query->executeQuery();
                while ($row = $result->fetch()) {
                        if (!$this->isMember($row['group'], $row['user'])) {
                                $deletedEntries += $deleteQuery->setParameter('share', (int)$row['id'])
-                                       ->execute();
+                                       ->executeStatement();
                        }
                }
                $result->closeCursor();
index 634494acb2f593baca76e15da3cab98747d05425..a07ebdb72c39e642763f807faaae8c54ac57961d 100644 (file)
@@ -19,31 +19,17 @@ use OCP\Migration\IRepairStep;
 use OCP\Notification\IManager;
 
 class RemoveLinkShares implements IRepairStep {
-       /** @var IDBConnection */
-       private $connection;
-       /** @var IConfig */
-       private $config;
        /** @var string[] */
        private $userToNotify = [];
-       /** @var IGroupManager */
-       private $groupManager;
-       /** @var IManager */
-       private $notificationManager;
-       /** @var ITimeFactory */
-       private $timeFactory;
-
-       public function __construct(IDBConnection $connection,
-               IConfig $config,
-               IGroupManager $groupManager,
-               IManager $notificationManager,
-               ITimeFactory $timeFactory) {
-               $this->connection = $connection;
-               $this->config = $config;
-               $this->groupManager = $groupManager;
-               $this->notificationManager = $notificationManager;
-               $this->timeFactory = $timeFactory;
-       }
 
+       public function __construct(
+               private IDBConnection $connection,
+               private IConfig $config,
+               private IGroupManager $groupManager,
+               private IManager $notificationManager,
+               private ITimeFactory $timeFactory,
+       ) {
+       }
 
        public function getName(): string {
                return 'Remove potentially over exposing share links';
@@ -74,7 +60,7 @@ class RemoveLinkShares implements IRepairStep {
                $qb = $this->connection->getQueryBuilder();
                $qb->delete('share')
                        ->where($qb->expr()->eq('id', $qb->createNamedParameter($id)));
-               $qb->execute();
+               $qb->executeStatement();
        }
 
        /**
@@ -107,7 +93,7 @@ class RemoveLinkShares implements IRepairStep {
                        ->from('share')
                        ->where($query->expr()->in('id', $query->createFunction($subQuery->getSQL())));
 
-               $result = $query->execute();
+               $result = $query->executeQuery();
                $data = $result->fetch();
                $result->closeCursor();
 
@@ -137,7 +123,7 @@ class RemoveLinkShares implements IRepairStep {
                        ))
                        ->andWhere($query->expr()->eq('s1.item_source', 's2.item_source'));
                /** @var IResult $result */
-               $result = $query->execute();
+               $result = $query->executeQuery();
                return $result;
        }
 
index 71e6359da5b5445033761308d92ddc09ae1348a9..9553f25ee70e7c80db383810833195547e3e6a17 100644 (file)
@@ -7,6 +7,8 @@
  */
 namespace OC\Repair;
 
+use OCP\IConfig;
+use OCP\IDBConnection;
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
 
@@ -16,19 +18,10 @@ use OCP\Migration\IRepairStep;
 class RepairInvalidShares implements IRepairStep {
        public const CHUNK_SIZE = 200;
 
-       /** @var \OCP\IConfig */
-       protected $config;
-
-       /** @var \OCP\IDBConnection */
-       protected $connection;
-
-       /**
-        * @param \OCP\IConfig $config
-        * @param \OCP\IDBConnection $connection
-        */
-       public function __construct($config, $connection) {
-               $this->connection = $connection;
-               $this->config = $config;
+       public function __construct(
+               protected IConfig $config,
+               protected IDBConnection $connection,
+       ) {
        }
 
        public function getName() {
@@ -49,7 +42,7 @@ class RepairInvalidShares implements IRepairStep {
                        ->where($builder->expr()->eq('item_type', $builder->expr()->literal('file')))
                        ->andWhere($builder->expr()->neq('permissions', $permsFunc));
 
-               $updatedEntries = $builder->execute();
+               $updatedEntries = $builder->executeStatement();
                if ($updatedEntries > 0) {
                        $out->info('Fixed file share permissions for ' . $updatedEntries . ' shares');
                }
@@ -77,11 +70,11 @@ class RepairInvalidShares implements IRepairStep {
                $deletedInLastChunk = self::CHUNK_SIZE;
                while ($deletedInLastChunk === self::CHUNK_SIZE) {
                        $deletedInLastChunk = 0;
-                       $result = $query->execute();
+                       $result = $query->executeQuery();
                        while ($row = $result->fetch()) {
                                $deletedInLastChunk++;
                                $deletedEntries += $deleteQuery->setParameter('parent', (int)$row['parent'])
-                                       ->execute();
+                                       ->executeStatement();
                        }
                        $result->closeCursor();
                }
index fdf7fb97d3188050fd5e71b5fc56cef876bce926..f07e4dbacbdda4176b4cd783091ab35d87976758 100644 (file)
@@ -32,6 +32,6 @@ class CleanupJob extends TimedJob {
                $qb = $this->connection->getQueryBuilder();
                $qb->delete('bruteforce_attempts')
                        ->where($qb->expr()->lt('occurred', $qb->createNamedParameter($time), IQueryBuilder::PARAM_INT));
-               $qb->execute();
+               $qb->executeStatement();
        }
 }
index 335e901a321b6e0ba6d0b7bbf27d2d76203f14bd..90756e2d3fdc6ee644b3038cf82055f7817f9138 100644 (file)
@@ -19,32 +19,12 @@ use OCP\IUser;
 use OCP\IUserManager;
 
 class SubAdmin extends PublicEmitter implements ISubAdmin {
-       /** @var IUserManager */
-       private $userManager;
-
-       /** @var IGroupManager */
-       private $groupManager;
-
-       /** @var IDBConnection */
-       private $dbConn;
-
-       /** @var IEventDispatcher */
-       private $eventDispatcher;
-
-       /**
-        * @param IUserManager $userManager
-        * @param IGroupManager $groupManager
-        * @param IDBConnection $dbConn
-        */
-       public function __construct(IUserManager $userManager,
-               IGroupManager $groupManager,
-               IDBConnection $dbConn,
-               IEventDispatcher $eventDispatcher) {
-               $this->userManager = $userManager;
-               $this->groupManager = $groupManager;
-               $this->dbConn = $dbConn;
-               $this->eventDispatcher = $eventDispatcher;
-
+       public function __construct(
+               private IUserManager $userManager,
+               private IGroupManager $groupManager,
+               private IDBConnection $dbConn,
+               private IEventDispatcher $eventDispatcher,
+       ) {
                $this->userManager->listen('\OC\User', 'postDelete', function ($user) {
                        $this->post_deleteUser($user);
                });
@@ -66,7 +46,7 @@ class SubAdmin extends PublicEmitter implements ISubAdmin {
                                'gid' => $qb->createNamedParameter($group->getGID()),
                                'uid' => $qb->createNamedParameter($user->getUID())
                        ])
-                       ->execute();
+                       ->executeStatement();
 
                /** @deprecated 21.0.0 - use type SubAdminAddedEvent instead  */
                $this->emit('\OC\SubAdmin', 'postCreateSubAdmin', [$user, $group]);
@@ -85,7 +65,7 @@ class SubAdmin extends PublicEmitter implements ISubAdmin {
                $qb->delete('group_admin')
                        ->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
                        ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-                       ->execute();
+                       ->executeStatement();
 
                /** @deprecated 21.0.0 - use type SubAdminRemovedEvent instead  */
                $this->emit('\OC\SubAdmin', 'postDeleteSubAdmin', [$user, $group]);
@@ -123,7 +103,7 @@ class SubAdmin extends PublicEmitter implements ISubAdmin {
                $result = $qb->select('gid')
                        ->from('group_admin')
                        ->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-                       ->execute();
+                       ->executeQuery();
 
                $groups = [];
                while ($row = $result->fetch()) {
@@ -156,7 +136,7 @@ class SubAdmin extends PublicEmitter implements ISubAdmin {
                $result = $qb->select('uid')
                        ->from('group_admin')
                        ->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
-                       ->execute();
+                       ->executeQuery();
 
                $users = [];
                while ($row = $result->fetch()) {
@@ -179,7 +159,7 @@ class SubAdmin extends PublicEmitter implements ISubAdmin {
 
                $result = $qb->select('*')
                        ->from('group_admin')
-                       ->execute();
+                       ->executeQuery();
 
                $subadmins = [];
                while ($row = $result->fetch()) {
@@ -213,7 +193,7 @@ class SubAdmin extends PublicEmitter implements ISubAdmin {
                        ->from('group_admin')
                        ->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
                        ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-                       ->execute();
+                       ->executeQuery();
 
                $fetch = $result->fetch();
                $result->closeCursor();
@@ -244,7 +224,7 @@ class SubAdmin extends PublicEmitter implements ISubAdmin {
                        ->from('group_admin')
                        ->andWhere($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
                        ->setMaxResults(1)
-                       ->execute();
+                       ->executeQuery();
 
                $isSubAdmin = $result->fetch();
                $result->closeCursor();
@@ -284,7 +264,7 @@ class SubAdmin extends PublicEmitter implements ISubAdmin {
 
                $qb->delete('group_admin')
                        ->where($qb->expr()->eq('uid', $qb->createNamedParameter($user->getUID())))
-                       ->execute();
+                       ->executeStatement();
        }
 
        /**
@@ -296,6 +276,6 @@ class SubAdmin extends PublicEmitter implements ISubAdmin {
 
                $qb->delete('group_admin')
                        ->where($qb->expr()->eq('gid', $qb->createNamedParameter($group->getGID())))
-                       ->execute();
+                       ->executeStatement();
        }
 }
index 5583cf5a1a6060f8e49dabeffda36f86fd7c0899..c399948ff10fe3e85fadb0107d617854c15e6725 100644 (file)
@@ -32,7 +32,7 @@ class ChangesMapper extends QBMapper {
                $result = $qb->select('*')
                        ->from(self::TABLE_NAME)
                        ->where($qb->expr()->eq('version', $qb->createNamedParameter($version)))
-                       ->execute();
+                       ->executeQuery();
 
                $data = $result->fetch();
                $result->closeCursor();