From 087b68bdbca05c8995c8e104c0bf4cd9ef2f009e Mon Sep 17 00:00:00 2001 From: Matthias Adrowski <matthias.adrowski@sgalinski.de> Date: Wed, 10 Aug 2022 09:30:24 +0200 Subject: [PATCH] [TASK] Port back to fetch/fetchAll usage --- Classes/Command/MigrateNewsCommandController.php | 10 +++++----- Classes/Domain/Repository/CategoryRepository.php | 2 +- Classes/Paginator/QueryBuilderPaginator.php | 2 +- Classes/TCA/TcaProvider.php | 4 ++-- Classes/Updates/MigrateSchedulerTasks.php | 4 ++-- Classes/Updates/UpdateAuthors.php | 4 ++-- Classes/Utility/BackendNewsUtility.php | 10 +++++----- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Classes/Command/MigrateNewsCommandController.php b/Classes/Command/MigrateNewsCommandController.php index 770eba2..a9a67af 100644 --- a/Classes/Command/MigrateNewsCommandController.php +++ b/Classes/Command/MigrateNewsCommandController.php @@ -124,7 +124,7 @@ class MigrateNewsCommandController extends Command { ->where( $queryBuilder->expr()->eq('pid', $queryBuilder->createNamedParameter($pId, Connection::PARAM_INT)) ) - ->execute()->fetchAllAssociative(); + ->execute()->fetchAll(); $localDataHandler = GeneralUtility::makeInstance(DataHandler::class); Bootstrap::initializeBackendAuthentication(); $localCommandMap = [ @@ -253,7 +253,7 @@ class MigrateNewsCommandController extends Command { ) ) ) - ->execute()->fetchAssociative(); + ->execute()->fetch(); if (!$fileReferenceResult) { return NULL; } @@ -270,7 +270,7 @@ class MigrateNewsCommandController extends Command { $queryBuilder->createNamedParameter($fileReferenceResult['uid_local'], Connection::PARAM_INT) ) ) - ->execute()->fetchAssociative(); + ->execute()->fetch(); if (!$fileResult) { return NULL; } @@ -303,7 +303,7 @@ class MigrateNewsCommandController extends Command { $queryBuilder->createNamedParameter($row['uid'], Connection::PARAM_INT) ) ) - ->execute()->fetchAllAssociative(); + ->execute()->fetchAll(); foreach ($mmRows as $mmRow) { $values = [ 'uid_local' => $this->categoryMap[(int) $mmRow['uid_local']], @@ -386,7 +386,7 @@ class MigrateNewsCommandController extends Command { $queryBuilder->createNamedParameter($parentId, Connection::PARAM_INT) ) ) - ->execute()->fetchAssociative(); + ->execute()->fetch(); if ($result) { $queryBuilder->where( $queryBuilder->expr()->eq( diff --git a/Classes/Domain/Repository/CategoryRepository.php b/Classes/Domain/Repository/CategoryRepository.php index 6fffcc3..f9999d6 100644 --- a/Classes/Domain/Repository/CategoryRepository.php +++ b/Classes/Domain/Repository/CategoryRepository.php @@ -60,7 +60,7 @@ class CategoryRepository extends AbstractRepository { $queryBuilder->expr()->eq('translation.uid', $queryBuilder->createNamedParameter($uid, \PDO::PARAM_INT)) ) ->setMaxResults(1) - ->execute()->fetchAssociative(); + ->execute()->fetch(); if ($row && (int) $row['uid'] !== 0) { return current($dataMapper->map($this->objectType, [$row])); } diff --git a/Classes/Paginator/QueryBuilderPaginator.php b/Classes/Paginator/QueryBuilderPaginator.php index 405c8a5..7441096 100644 --- a/Classes/Paginator/QueryBuilderPaginator.php +++ b/Classes/Paginator/QueryBuilderPaginator.php @@ -63,7 +63,7 @@ final class QueryBuilderPaginator extends AbstractPaginator { $this->paginatedQueryResult = $this->queryBuilder ->setMaxResults($limit) ->setFirstResult($offset) - ->execute()->fetchAllAssociative(); + ->execute()->fetchAll(); } protected function getTotalAmountOfItems(): int { diff --git a/Classes/TCA/TcaProvider.php b/Classes/TCA/TcaProvider.php index 6594390..5092cbb 100644 --- a/Classes/TCA/TcaProvider.php +++ b/Classes/TCA/TcaProvider.php @@ -78,13 +78,13 @@ class TcaProvider implements SingletonInterface { ->where( $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($pagesIdentity, \PDO::PARAM_INT)) ) - ->execute()->fetchAssociative(); + ->execute()->fetch(); $workspaceOriginalId = (int) $row['t3ver_oid']; if ($workspaceOriginalId > 0) { $row = $queryBuilder->where( $queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($workspaceOriginalId, \PDO::PARAM_INT)) - )->execute()->fetchAssociative(); + )->execute()->fetch(); } // only articles diff --git a/Classes/Updates/MigrateSchedulerTasks.php b/Classes/Updates/MigrateSchedulerTasks.php index 00381f8..5720049 100644 --- a/Classes/Updates/MigrateSchedulerTasks.php +++ b/Classes/Updates/MigrateSchedulerTasks.php @@ -75,7 +75,7 @@ class MigrateSchedulerTasks implements UpgradeWizardInterface { ->from('tx_scheduler_task') ->where( $queryBuilder->expr()->eq('disable', 0) - )->execute()->fetchAllAssociative(); + )->execute()->fetchAll(); foreach ($tasks as $_task) { $task = unserialize($_task['serialized_task_object'], [\__PHP_Incomplete_Class::class]); $taskVars = $this->cleanArrayKeys((array)$task); @@ -131,7 +131,7 @@ class MigrateSchedulerTasks implements UpgradeWizardInterface { ->from('tx_scheduler_task') ->where( $queryBuilder->expr()->eq('disable', 0) - )->execute()->fetchAllAssociative(); + )->execute()->fetchAll(); foreach ($tasks as $_task) { $task = unserialize($_task['serialized_task_object'], [\__PHP_Incomplete_Class::class]); $taskVars = $this->cleanArrayKeys((array)$task); diff --git a/Classes/Updates/UpdateAuthors.php b/Classes/Updates/UpdateAuthors.php index f87a04d..394c240 100644 --- a/Classes/Updates/UpdateAuthors.php +++ b/Classes/Updates/UpdateAuthors.php @@ -100,7 +100,7 @@ class UpdateAuthors implements UpgradeWizardInterface { $newsQueryBuilder->expr()->neq('author', $newsQueryBuilder->quote('')) ) ) - ->execute()->fetchAllAssociative(); + ->execute()->fetchAll(); if (count($newsEntries) <= 0) { return TRUE; } @@ -124,7 +124,7 @@ class UpdateAuthors implements UpgradeWizardInterface { ) ) ->setMaxResults(1) - ->execute()->fetchAllAssociative(); + ->execute()->fetchAll(); if (!$author) { $authorQueryBuilder->insert('tx_sgnews_domain_model_author') ->values([ diff --git a/Classes/Utility/BackendNewsUtility.php b/Classes/Utility/BackendNewsUtility.php index 47de86a..22eaa3a 100644 --- a/Classes/Utility/BackendNewsUtility.php +++ b/Classes/Utility/BackendNewsUtility.php @@ -175,7 +175,7 @@ class BackendNewsUtility { $queryBuilder->expr()->in('uid', $queryBuilder->createNamedParameter(explode(',', $childPids), Connection::PARAM_INT_ARRAY)) ) ) - ->execute()->fetchAllAssociative(); + ->execute()->fetchAll(); $categories = []; foreach ($result as $page) { $categoryPageInfo = BackendUtility::readPageAccess( @@ -433,7 +433,7 @@ class BackendNewsUtility { $authorQueryBuilder->expr()->like('author.name', $authorSearchParameter), $authorQueryBuilder->expr()->like('author.email', $authorSearchParameter) ) - )->execute()->fetchAllAssociative(); + )->execute()->fetchAll(); if (count($authors) > 0) { foreach (array_column($authors, 'uid') as $authorUid) { @@ -451,7 +451,7 @@ class BackendNewsUtility { $queryBuilder->setMaxResults($limit); } - return [$queryBuilder->execute()->fetchAllAssociative(), $queryBuilder]; + return [$queryBuilder->execute()->fetchAll(), $queryBuilder]; } /** @@ -482,7 +482,7 @@ class BackendNewsUtility { $languageRows = $queryBuilder->select('uid', 'title', 'flag') ->from('sys_language') ->orderBy('sorting') - ->execute()->fetchAllAssociative(); + ->execute()->fetchAll(); if ($languageRows) { /** @var BackendUserAuthentication $backendUser */ $backendUser = $GLOBALS['BE_USER']; @@ -567,7 +567,7 @@ class BackendNewsUtility { } } - return $queryBuilder->execute()->fetchAllAssociative(); + return $queryBuilder->execute()->fetchAll(); } return NULL; -- GitLab