From 905cf9200348b79a48d90d8b22e6712557b32f4b Mon Sep 17 00:00:00 2001
From: Kevin Appelt <ka@f7.de>
Date: Thu, 20 Apr 2023 07:56:51 +0200
Subject: [PATCH] [TASK] Avoid usage of deprecated QueryBuilder::execute() in
 TYPO3 v12

---
 Classes/Domain/Factory/Database.php           | 48 ++++++++++++++-----
 Classes/Hooks/Datahandler/Database.php        | 48 ++++++++++++++-----
 Classes/Integrity/Database.php                | 48 ++++++++++++++-----
 Classes/Integrity/IntegrityFix.php            | 14 ++++--
 .../Service/RecordLocalizeSummaryModifier.php | 16 +++++--
 5 files changed, 131 insertions(+), 43 deletions(-)

diff --git a/Classes/Domain/Factory/Database.php b/Classes/Domain/Factory/Database.php
index 5ead2a82..b0a4d1d3 100644
--- a/Classes/Domain/Factory/Database.php
+++ b/Classes/Domain/Factory/Database.php
@@ -85,8 +85,12 @@ public function fetchRecordsByPidAndLanguage(int $pid, int $language): array
                     $queryBuilder->createNamedParameter($pid, \PDO::PARAM_INT)
                 )
             )
-            ->orderBy('sorting', 'ASC')
-            ->execute();
+            ->orderBy('sorting', 'ASC');
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             return (array)$stm->fetchAll();
         }
@@ -104,8 +108,12 @@ public function fetchOneRecord(int $uid): ?array
                     'uid',
                     $queryBuilder->createNamedParameter($uid, \PDO::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $record = $stm->fetch();
         } else {
@@ -131,8 +139,12 @@ public function fetchOneDefaultRecord(array $record): ?array
                     'sys_language_uid',
                     $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $record = $stm->fetch();
         } else {
@@ -160,8 +172,12 @@ public function fetchRecordsByParentAndLanguage(int $parent, int $language): arr
                     $queryBuilder->createNamedParameter($language, \PDO::PARAM_INT)
                 )
             )
-            ->orderBy('sorting', 'ASC')
-            ->execute();
+            ->orderBy('sorting', 'ASC');
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             return (array)$stm->fetchAll();
         }
@@ -189,8 +205,12 @@ public function fetchOverlayRecords(array $records, int $language): array
                     'sys_language_uid',
                     $queryBuilder->createNamedParameter($language, \PDO::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             return (array)$stm->fetchAll();
         }
@@ -211,8 +231,12 @@ public function fetchOneOverlayRecord(int $uid, int $language): ?array
                     'sys_language_uid',
                     $queryBuilder->createNamedParameter($language, \PDO::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $record = $stm->fetch();
         } else {
diff --git a/Classes/Hooks/Datahandler/Database.php b/Classes/Hooks/Datahandler/Database.php
index 7aba283e..e8eff946 100644
--- a/Classes/Hooks/Datahandler/Database.php
+++ b/Classes/Hooks/Datahandler/Database.php
@@ -44,8 +44,12 @@ public function fetchOneRecord(int $uid): ?array
                     'uid',
                     $queryBuilder->createNamedParameter($uid, \PDO::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $record = $stm->fetch();
         } else {
@@ -67,8 +71,12 @@ public function fetchOverlayRecords(array $record): array
                     'l18n_parent',
                     $queryBuilder->createNamedParameter((int)$record['uid'], Connection::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             return (array)$stm->fetchAll();
         }
@@ -89,8 +97,12 @@ public function fetchOneTranslatedRecordByl10nSource(int $uid, int $language): ?
                     'sys_language_uid',
                     $queryBuilder->createNamedParameter($language, \PDO::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $record = $stm->fetch();
         } else {
@@ -116,8 +128,12 @@ public function fetchOneTranslatedRecordByLocalizationParent(int $uid, int $lang
                     'sys_language_uid',
                     $queryBuilder->createNamedParameter($language, \PDO::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $record = $stm->fetch();
         } else {
@@ -148,8 +164,12 @@ public function fetchRecordsByParentAndLanguage(int $parent, int $language): arr
                     $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)
                 )
             )
-            ->orderBy('sorting', 'ASC')
-            ->execute();
+            ->orderBy('sorting', 'ASC');
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             return (array)$stm->fetchAll();
         }
@@ -178,8 +198,12 @@ public function fetchContainerRecordLocalizedFreeMode(int $defaultUid, int $lang
                     't3ver_oid',
                     $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $record = $stm->fetch();
         } else {
diff --git a/Classes/Integrity/Database.php b/Classes/Integrity/Database.php
index ff5cdb50..9749288a 100644
--- a/Classes/Integrity/Database.php
+++ b/Classes/Integrity/Database.php
@@ -46,8 +46,12 @@ public function getNonDefaultLanguageContainerRecords(array $cTypes): array
                     'sys_language_uid',
                     $queryBuilder->createNamedParameter(0, Connection::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $results = $stm->fetchAll();
         } else {
@@ -75,8 +79,12 @@ public function getNonDefaultLanguageContainerChildRecords(): array
                     'sys_language_uid',
                     $queryBuilder->createNamedParameter(0, Connection::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $results = $stm->fetchAll();
         } else {
@@ -109,8 +117,12 @@ public function getChildrenByContainerAndColPos(int $containerId, int $colPos, i
                     $queryBuilder->createNamedParameter($colPos, Connection::PARAM_INT)
                 )
             )
-            ->orderBy('sorting')
-            ->execute();
+            ->orderBy('sorting');
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             return (array)$stm->fetchAll();
         }
@@ -132,8 +144,12 @@ public function getContainerRecords(array $cTypes): array
                     'sys_language_uid',
                     $queryBuilder->createNamedParameter(0, Connection::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $results = $stm->fetchAll();
         } else {
@@ -165,8 +181,12 @@ public function getContainerRecordsFreeMode(array $cTypes): array
                     'l18n_parent',
                     $queryBuilder->createNamedParameter(0, Connection::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $results = $stm->fetchAll();
         } else {
@@ -194,8 +214,12 @@ public function getContainerChildRecords(): array
                     'sys_language_uid',
                     $queryBuilder->createNamedParameter(0, Connection::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $results = $stm->fetchAll();
         } else {
diff --git a/Classes/Integrity/IntegrityFix.php b/Classes/Integrity/IntegrityFix.php
index 58549c14..ada598e1 100644
--- a/Classes/Integrity/IntegrityFix.php
+++ b/Classes/Integrity/IntegrityFix.php
@@ -73,8 +73,12 @@ public function changeContainerParentToDefaultLanguageContainer(ChildInTranslate
                     'uid',
                     $queryBuilder->createNamedParameter($child['uid'], \PDO::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $queryBuilder->executeStatement();
+        } else {
+            $queryBuilder->execute();
+        }
     }
 
     /**
@@ -121,7 +125,11 @@ public function languageMode(array $errors): void
                             // i think this is always true
                             $stm->set('l10n_source', $defaultChildRecord['uid']);
                         }
-                        $stm->execute();
+                        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+                            $stm = $stm->executeStatement();
+                        } else {
+                            $stm = $stm->execute();
+                        }
                     }
                 }
                 // disconnect container ?
diff --git a/Classes/Service/RecordLocalizeSummaryModifier.php b/Classes/Service/RecordLocalizeSummaryModifier.php
index e751f8ea..30262c7b 100644
--- a/Classes/Service/RecordLocalizeSummaryModifier.php
+++ b/Classes/Service/RecordLocalizeSummaryModifier.php
@@ -116,8 +116,12 @@ protected function getContainerUids(array $uids): array
                     'CType',
                     $queryBuilder->createNamedParameter($containerCTypes, Connection::PARAM_STR_ARRAY)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $rows = $stm->fetchAll();
         } else {
@@ -148,8 +152,12 @@ protected function getContainerChildren(array $uids): array
                     'tx_container_parent',
                     $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)
                 )
-            )
-            ->execute();
+            );
+        if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() >= 12) {
+            $stm = $stm->executeQuery();
+        } else {
+            $stm = $stm->execute();
+        }
         if ((GeneralUtility::makeInstance(Typo3Version::class))->getMajorVersion() === 10) {
             $rows = $stm->fetchAll();
         } else {