[TASK] Upgrade to work with TYPO3 11

studiomitte · Jan 25, 2022 · 5de1fdc · 5de1fdc
1 parent 39f7634
commit 5de1fdc
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 35 deletions.
diff --git a/Classes/Command/CountryNameMigrationCommand.php b/Classes/Command/CountryNameMigrationCommand.php
@@ -17,15 +17,15 @@ class CountryNameMigrationCommand extends Command
     /**
      * @inheritdoc
      */
-    protected function configure()
+    protected function configure(): void
     {
         $this->setDescription('Migrate tt_address country field');
     }
 
     /**
      * @inheritdoc
      */
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): void
     {
         $service = GeneralUtility::makeInstance(MigrationService::class);
         $count = $service->run();

diff --git a/Classes/Domain/Model/Address.php → Classes/Extending/Domain/Model/Address.php b/Classes/Domain/Model/Address.php → Classes/Extending/Domain/Model/Address.php
@@ -1,19 +1,21 @@
 <?php
 
-namespace StudioMitte\TtaddressCountryRelation\Domain\Model;
+declare(strict_types=1);
+
+namespace StudioMitte\TtaddressCountryRelation\Extending\Domain\Model;
 
 class Address extends \FriendsOfTYPO3\TtAddress\Domain\Model\Address
 {
 
     /**
      * @var \SJBR\StaticInfoTables\Domain\Model\Country
      */
-    protected $countryRelation = null;
+    protected $countryRelation;
 
     /**
      * @var \SJBR\StaticInfoTables\Domain\Model\CountryZone
      */
-    protected $regionRelation = null;
+    protected $regionRelation;
 
     /**
      * @return \SJBR\StaticInfoTables\Domain\Model\Country

diff --git a/Classes/Migration/MigrationService.php b/Classes/Migration/MigrationService.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace StudioMitte\TtaddressCountryRelation\Migration;
@@ -8,7 +9,6 @@
 
 class MigrationService
 {
-
     public function run(): int
     {
         $count = 0;
@@ -20,7 +20,7 @@ public function run(): int
             ->where(
                 $queryBuilder->expr()->eq('country_relation', $queryBuilder->createNamedParameter(0, \PDO::PARAM_INT)),
                 $queryBuilder->expr()->neq('country', $queryBuilder->createNamedParameter('', \PDO::PARAM_STR)),
-                )
+            )
             ->execute()
             ->fetchAll();
         foreach ($rows as $row) {
@@ -43,10 +43,10 @@ protected function updateSingleRow(string $countryName, int $addressUid): bool
         $connection->update(
             'tt_address',
             [
-                'country_relation' => $staticCountryId
+                'country_relation' => $staticCountryId,
             ],
             [
-                'uid' => $addressUid
+                'uid' => $addressUid,
             ]
         );
 
@@ -78,4 +78,4 @@ protected function getStaticCountryRow(string $countryName): int
 
         return 0;
     }
-}
+}
diff --git a/Configuration/Commands.php b/Configuration/Commands.php
@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * Commands to be executed by typo3, where the key of the array
  * is the name of the command (to be called as the first argument after typo3).

diff --git a/Configuration/TCA/Overrides/tt_address.php b/Configuration/TCA/Overrides/tt_address.php
@@ -1,8 +1,10 @@
 <?php
+
+declare(strict_types=1);
 defined('TYPO3_MODE') || die('Access denied.');
 
 call_user_func(
-    function ($extKey) {
+    function ($extKey): void {
         $fields = [
             'country_relation' => [
                 'label' => 'LLL:EXT:core/Resources/Private/Language/locallang_general.xlf:LGL.country',
@@ -18,16 +20,16 @@ function ($extKey) {
                     'suggestOptions' => [
                         'default' => [
                             'pidList' => '0',
-                            'additionalSearchFields' => 'cn_short_de'
-                        ]
+                            'additionalSearchFields' => 'cn_short_de',
+                        ],
                     ],
                     'fieldWizard' => [
                         'recordsOverview' => [
-                            'disabled' => true
+                            'disabled' => true,
                         ],
                         'tableList' => [
-                            'disabled' => true
-                        ]
+                            'disabled' => true,
+                        ],
                     ],
                 ],
             ],
@@ -45,16 +47,16 @@ function ($extKey) {
                     'suggestOptions' => [
                         'default' => [
                             'pidList' => '0',
-                            'additionalSearchFields' => 'zn_name_local'
-                        ]
+                            'additionalSearchFields' => 'zn_name_local',
+                        ],
                     ],
                     'fieldWizard' => [
                         'recordsOverview' => [
-                            'disabled' => true
+                            'disabled' => true,
                         ],
                         'tableList' => [
-                            'disabled' => true
-                        ]
+                            'disabled' => true,
+                        ],
                     ],
                 ],
             ],

diff --git a/composer.json b/composer.json
@@ -17,11 +17,11 @@
   ],
   "license": "GPL-2.0-or-later",
   "require": {
-    "typo3/cms-core": "^9.5 || ^10.0",
-    "php": ">=7.2",
-    "friendsoftypo3/tt-address": "^5",
-    "evoweb/extender": "^6 || ^7",
-    "sjbr/static-info-tables": "^6"
+    "typo3/cms-core": "^11.0",
+    "php": ">=7.4",
+    "friendsoftypo3/tt-address": "^5.3",
+    "evoweb/extender": "^8.1",
+    "sjbr/static-info-tables": "^11.5"
   },
   "extra": {
     "typo3/cms": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 $EM_CONF[$_EXTKEY] = [
     'title' => 'Country relation for tt_address',
     'description' => 'Use a relation to static_info_tables for the country field',
@@ -8,13 +10,13 @@
     'clearCacheOnLoad' => true,
     'author' => 'Georg Ringer',
     'author_email' => 'gr@studiomitte.com',
-    'version' => '1.0.0',
+    'version' => '2.0.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '9.5.9-9.5.99',
-            'tt_address' => '5.0.0-6.9.99',
-            'static_info_tables' => '6.7.5-6.9.99',
-            'extender' => '6.6.1-6.6.99',
+            'typo3' => '11.5.0-11.5.99',
+            'tt_address' => '5.3.0-5.3.99',
+            'static_info_tables' => '11.5.1-11.5.99',
+            'extender' => '8.1.0-8.9.99',
         ],
         'conflicts' => [
         ],

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -1,11 +1,14 @@
 <?php
+
+declare(strict_types=1);
 defined('TYPO3_MODE') || die('Access denied.');
 
 call_user_func(
-    function ($extKey) {
-
-        $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['tt_address']['extender'][\FriendsOfTYPO3\TtAddress\Domain\Model\Address::class][$extKey]
-            = 'EXT:ttaddress_country_relation/Classes/Domain/Model/Address.php';
+    static function ($extKey): void {
+        $GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS']['tt_address']['extender'][
+       \FriendsOfTYPO3\TtAddress\Domain\Model\Address::class
+        ][$extKey] = 'EXT:'. $extKey . '/Classes/Extending/Domain/Model/Address.php';
+//        $GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS'][$extKey]['extender'][\FriendsOfTYPO3\TtAddress\Domain\Model\Address::class][$extKey] = 'Domain/Model/Address';
     },
     'ttaddress_country_relation'
 );