WIP|Fix PHPStan and PHPUnit findings

WIP: * Ensure language handling works (no more sys_language table?!)
werkraum-media · Dec 4, 2023 · cc2ee35 · cc2ee35
1 parent 1aa393a
commit cc2ee35
Show file tree

Hide file tree

Showing 107 changed files with 3,042 additions and 1,892 deletions.
diff --git a/Classes/Domain/Import/EntityMapper/EntityRegistry.php b/Classes/Domain/Import/EntityMapper/EntityRegistry.php
@@ -23,8 +23,6 @@
 
 namespace WerkraumMedia\ThueCat\Domain\Import\EntityMapper;
 
-use TYPO3\CMS\Core\Utility\ArrayUtility;
-
 /**
  * Registry with supported entities and their types.
  */
@@ -69,10 +67,9 @@ public function getEntityByTypes(array $types): string
             return '';
         }
 
-        $matches = ArrayUtility::sortArraysByKey(
-            $matches,
-            'priority'
-        );
+        usort($matches, static function (array $configA, array $configB): int {
+            return $configA['priority'] <=> $configB['priority'];
+        });
 
         return end($matches)['entityClassName'];
     }

diff --git a/Classes/Domain/Import/Importer/SaveData.php b/Classes/Domain/Import/Importer/SaveData.php
@@ -194,7 +194,7 @@ private function getExistingUid(Entity $entity): int
             ));
         }
 
-        $result = $queryBuilder->execute()->fetchColumn();
+        $result = $queryBuilder->executeQuery()->fetchOne();
         if (is_numeric($result)) {
             return (int)$result;
         }
@@ -217,7 +217,7 @@ private function getDefaultLanguageIdentifier(Entity $entity): int
             $queryBuilder->createNamedParameter(0)
         ));
 
-        $result = $queryBuilder->execute()->fetchColumn();
+        $result = $queryBuilder->executeQuery()->fetchOne();
         if (is_numeric($result)) {
             return (int)$result;
         }

diff --git a/Classes/Domain/Import/Typo3Converter/LanguageHandling.php b/Classes/Domain/Import/Typo3Converter/LanguageHandling.php
@@ -48,14 +48,14 @@ public function getAvailable(ImportConfiguration $configuration): array
             throw new InvalidArgumentException('Unsupported configuration, need to retrieve storage pid.', 1629710300);
         }
         return array_map(function (SiteLanguage $language) {
-            return $language->getTwoLetterIsoCode();
+            return $language->getLocale()->getLanguageCode();
         }, $this->getLanguages($configuration->getStoragePid()));
     }
 
     public function getLanguageUidForString(int $pageUid, string $isoCode): int
     {
         foreach ($this->getLanguages($pageUid) as $language) {
-            if ($language->getTwoLetterIsoCode() === $isoCode) {
+            if ($language->getLocale()->getLanguageCode() === $isoCode) {
                 return $language->getLanguageId();
             }
         }

diff --git a/Classes/Domain/Model/Backend/ImportConfiguration.php b/Classes/Domain/Model/Backend/ImportConfiguration.php
@@ -98,7 +98,7 @@ public function getLastChanged(): ?DateTimeImmutable
     public function getLastImported(): ?DateTimeImmutable
     {
         $lastImport = null;
-        $positionOfLastLog = (string)(count($this->logs) - 1);
+        $positionOfLastLog = (count($this->logs) - 1);
         if ($this->logs->offsetExists($positionOfLastLog)) {
             $lastImport = $this->logs->offsetGet($positionOfLastLog);
         }

diff --git a/Classes/Domain/Repository/Backend/ImportConfigurationRepository.php b/Classes/Domain/Repository/Backend/ImportConfigurationRepository.php
@@ -23,18 +23,16 @@
 
 namespace WerkraumMedia\ThueCat\Domain\Repository\Backend;
 
-use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
 use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
 use TYPO3\CMS\Extbase\Persistence\Repository;
 use WerkraumMedia\ThueCat\Domain\Import\ImportConfiguration;
 
 class ImportConfigurationRepository extends Repository
 {
     public function __construct(
-        ObjectManagerInterface $objectManager,
         Typo3QuerySettings $querySettings
     ) {
-        parent::__construct($objectManager);
+        parent::__construct();
 
         $querySettings->setRespectStoragePage(false);
 

diff --git a/Classes/Domain/Repository/Backend/ImportLogRepository.php b/Classes/Domain/Repository/Backend/ImportLogRepository.php
@@ -24,7 +24,6 @@
 namespace WerkraumMedia\ThueCat\Domain\Repository\Backend;
 
 use TYPO3\CMS\Core\DataHandling\DataHandler;
-use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
 use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
 use TYPO3\CMS\Extbase\Persistence\QueryInterface;
 use TYPO3\CMS\Extbase\Persistence\Repository;
@@ -38,11 +37,10 @@ class ImportLogRepository extends Repository
     private $dataHandler;
 
     public function __construct(
-        ObjectManagerInterface $objectManager,
         DataHandler $dataHandler,
         Typo3QuerySettings $querySettings
     ) {
-        parent::__construct($objectManager);
+        parent::__construct();
 
         $this->dataHandler = $dataHandler;
 

diff --git a/Classes/Domain/Repository/Backend/OrganisationRepository.php b/Classes/Domain/Repository/Backend/OrganisationRepository.php
@@ -23,7 +23,6 @@
 
 namespace WerkraumMedia\ThueCat\Domain\Repository\Backend;
 
-use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
 use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
 use TYPO3\CMS\Extbase\Persistence\Repository;
 use WerkraumMedia\ThueCat\Domain\Model\Backend\Organisation;
@@ -34,10 +33,9 @@
 class OrganisationRepository extends Repository
 {
     public function __construct(
-        ObjectManagerInterface $objectManager,
         Typo3QuerySettings $querySettings
     ) {
-        parent::__construct($objectManager);
+        parent::__construct();
 
         $querySettings->setRespectStoragePage(false);
         $this->setDefaultQuerySettings($querySettings);

diff --git a/Classes/Domain/Repository/Backend/ParkingFacilityRepository.php b/Classes/Domain/Repository/Backend/ParkingFacilityRepository.php
@@ -23,7 +23,6 @@
 
 namespace WerkraumMedia\ThueCat\Domain\Repository\Backend;
 
-use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
 use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
 use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
 use TYPO3\CMS\Extbase\Persistence\Repository;
@@ -32,10 +31,9 @@
 class ParkingFacilityRepository extends Repository
 {
     public function __construct(
-        ObjectManagerInterface $objectManager,
         Typo3QuerySettings $querySettings
     ) {
-        parent::__construct($objectManager);
+        parent::__construct();
 
         $querySettings->setRespectStoragePage(false);
 

diff --git a/Classes/Domain/Repository/Backend/TownRepository.php b/Classes/Domain/Repository/Backend/TownRepository.php
@@ -23,7 +23,6 @@
 
 namespace WerkraumMedia\ThueCat\Domain\Repository\Backend;
 
-use TYPO3\CMS\Extbase\Object\ObjectManagerInterface;
 use TYPO3\CMS\Extbase\Persistence\Generic\Typo3QuerySettings;
 use TYPO3\CMS\Extbase\Persistence\Repository;
 use WerkraumMedia\ThueCat\Domain\Import\ResolveForeignReference;
@@ -32,10 +31,9 @@
 class TownRepository extends Repository
 {
     public function __construct(
-        ObjectManagerInterface $objectManager,
         Typo3QuerySettings $querySettings
     ) {
-        parent::__construct($objectManager);
+        parent::__construct();
 
         $querySettings->setRespectStoragePage(false);
 

diff --git a/Classes/Frontend/DataProcessing/ResolveEntities.php b/Classes/Frontend/DataProcessing/ResolveEntities.php
@@ -93,7 +93,7 @@ private function resolveEntities(string $tableName, array $uids): array
         ));
 
         $rows = [];
-        foreach ($queryBuilder->execute() as $row) {
+        foreach ($queryBuilder->executeQuery()->iterateAssociative() as $row) {
             $row = $this->tsfe->sys_page->getLanguageOverlay($tableName, $row);
             if (is_array($row)) {
                 $rows[] = $row;

diff --git a/Classes/Updates/BackendModuleUserPermission.php b/Classes/Updates/BackendModuleUserPermission.php
@@ -63,7 +63,7 @@ public function updateNecessary(): bool
         $qb->from('be_users');
         $qb->where($qb->expr()->like('userMods', $qb->createNamedParameter('%site_ThuecatThuecat%')));
 
-        return $qb->execute()->fetchOne() > 0;
+        return $qb->executeQuery()->fetchOne() > 0;
     }
 
     public function executeUpdate(): bool
@@ -73,14 +73,14 @@ public function executeUpdate(): bool
         $qb->select('uid', 'userMods');
         $qb->from('be_users');
         $qb->where($qb->expr()->like('userMods', $qb->createNamedParameter('%site_ThuecatThuecat%')));
-        $result = $qb->execute();
+        $result = $qb->executeQuery()->iterateAssociative();
 
         foreach ($result as $backendUser) {
             $qb = $this->connectionPool->getQueryBuilderForTable('be_users');
             $qb->update('be_users');
             $qb->set('userMods', $this->updateMods($backendUser['userMods']));
             $qb->where($qb->expr()->eq('uid', $qb->createNamedParameter($backendUser['uid'])));
-            $qb->execute();
+            $qb->executeStatement();
         }
 
         return true;

diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php
@@ -49,9 +49,9 @@
         $tableName,
         'module',
         [
-            0 => $languagePath . '.module.thuecat',
-            1 => 'thuecat',
-            2 => 'pages_module_thuecat',
+            'label' => $languagePath . '.module.thuecat',
+            'value' => 'thuecat',
+            'icon' => 'pages_module_thuecat',
         ]
     );
 })(

diff --git a/Configuration/TCA/Overrides/pages_tourist_attraction.php b/Configuration/TCA/Overrides/pages_tourist_attraction.php
@@ -64,10 +64,10 @@
         $tableName,
         'doktype',
         [
-            $languagePath,
-            $doktype,
-            Extension::getIconPath() . $tableName . '_' . $pageIdentifier . '.svg',
-            Extension::TCA_SELECT_GROUP_IDENTIFIER,
+            'label' => $languagePath,
+            'value' => $doktype,
+            'icon' => Extension::getIconPath() . $tableName . '_' . $pageIdentifier . '.svg',
+            'group' => Extension::TCA_SELECT_GROUP_IDENTIFIER,
         ]
     );
 })(

diff --git a/Configuration/TCA/Overrides/tt_content_tourist_attraction.php b/Configuration/TCA/Overrides/tt_content_tourist_attraction.php
@@ -58,10 +58,10 @@
         $tableName,
         'CType',
         [
-            $languagePath,
-            $cType,
-            Extension::getIconPath() . 'tt_content_' . $cType . '.svg',
-            Extension::TCA_SELECT_GROUP_IDENTIFIER,
+            'label' => $languagePath,
+            'value' => $cType,
+            'icon' => Extension::getIconPath() . 'tt_content_' . $cType . '.svg',
+            'group' => Extension::TCA_SELECT_GROUP_IDENTIFIER,
         ]
     );
 })(

diff --git a/Configuration/TCA/tx_thuecat_import_configuration.php b/Configuration/TCA/tx_thuecat_import_configuration.php
@@ -71,9 +71,8 @@
             ],
             'tstamp' => [
                 'config' => [
-                    'type' => 'input',
-                    'renderType' => 'inputDateTime',
-                    'eval' => 'datetime',
+                    'type' => 'datetime',
+                    'format' => 'datetime',
                     'readOnly' => true,
                 ],
             ],

diff --git a/Configuration/TCA/tx_thuecat_import_log.php b/Configuration/TCA/tx_thuecat_import_log.php
@@ -47,9 +47,8 @@
             'crdate' => [
                 'label' => $languagePath . '.crdate',
                 'config' => [
-                    'type' => 'input',
-                    'renderType' => 'inputDateTime',
-                    'eval' => 'datetime',
+                    'type' => 'datetime',
+                    'format' => 'datetime',
                     'readOnly' => true,
                 ],
             ],

diff --git a/Configuration/TCA/tx_thuecat_import_log_entry.php b/Configuration/TCA/tx_thuecat_import_log_entry.php
@@ -101,9 +101,8 @@
             'crdate' => [
                 'label' => $languagePath . '.crdate',
                 'config' => [
-                    'type' => 'input',
-                    'renderType' => 'inputDateTime',
-                    'eval' => 'datetime',
+                    'type' => 'datetime',
+                    'format' => 'datetime',
                     'readOnly' => true,
                 ],
             ],

diff --git a/Configuration/TCA/tx_thuecat_organisation.php b/Configuration/TCA/tx_thuecat_organisation.php
@@ -76,9 +76,8 @@
             'tstamp' => [
                 'label' => $languagePath . '.tstamp',
                 'config' => [
-                    'type' => 'input',
-                    'renderType' => 'inputDateTime',
-                    'eval' => 'datetime',
+                    'type' => 'datetime',
+                    'format' => 'datetime',
                     'readOnly' => true,
                 ],
             ],

diff --git a/Configuration/TCA/tx_thuecat_tourist_attraction.php b/Configuration/TCA/tx_thuecat_tourist_attraction.php
@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use WerkraumMedia\ThueCat\Extension;
 
 defined('TYPO3') or die();
@@ -304,11 +303,10 @@
             'editorial_images' => [
                 'label' => $languagePath . '.editorial_images',
                 'l10n_mode' => 'exclude',
-                'config' => ExtensionManagementUtility::getFileFieldTCAConfig(
-                    'editorial_images',
-                    [],
-                    $GLOBALS['TYPO3_CONF_VARS']['GFX']['imagefile_ext']
-                ),
+                'config' => [
+                    'type' => 'file',
+                    'allowed' => 'common-image-types',
+                ],
             ],
         ],
         'palettes' => [

diff --git a/Tests/Acceptance/Data/BasicDatabase.csv b/Tests/Acceptance/Data/BasicDatabase.csv