Merge pull request #18 from dkd/TYPO3-12

[TASK] Upgrade to TYPO3 12
lochmueller · Jun 15, 2024 · e9c6d07 · e9c6d07
2 parents 7b54bfc + 4a0f4a8
commit e9c6d07
Show file tree

Hide file tree

Showing 13 changed files with 3,090 additions and 1,499 deletions.
diff --git a/Classes/Domain/Model/Country.php b/Classes/Domain/Model/Country.php
@@ -13,7 +13,7 @@ class Country extends AbstractEntity
      *
      * @var string
      */
-    protected $shortNameZh = '';
+    protected string $shortNameZh = '';
 
     /**
      * Sets the Chinese short name.

diff --git a/Classes/Domain/Model/Territory.php b/Classes/Domain/Model/Territory.php
@@ -12,7 +12,7 @@ class Territory extends AbstractEntity
      *
      * @var string
      */
-    protected $nameZh = '';
+    protected string $nameZh = '';
 
     /**
      * Sets the Chinese name of the territory

diff --git a/Configuration/Extbase/Persistence/Classes.php b/Configuration/Extbase/Persistence/Classes.php
@@ -15,7 +15,7 @@
         'tableName' => 'static_territories',
         'properties' => [
             'nameZh' => [
-                'fieldName' => 'name_zh',
+                'fieldName' => 'tr_name_zh',
             ],
         ],
     ],

diff --git a/Configuration/TCA/Overrides/static_countries.php b/Configuration/TCA/Overrides/static_countries.php
@@ -2,7 +2,7 @@
 
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
-defined('TYPO3_MODE') or die();
+defined('TYPO3') || die();
 
 $additionalFields = [
     'cn_short_en' => 'cn_short_zh'

diff --git a/Configuration/TCA/Overrides/static_territories.php b/Configuration/TCA/Overrides/static_territories.php
@@ -2,7 +2,7 @@
 
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 
-defined('TYPO3_MODE') or die();
+defined('TYPO3') || die();
 
 $additionalFields = [
 	'tr_name_en' => 'tr_name_zh'

diff --git a/Configuration/TypoScript/Extbase/setup.txt → ...ation/TypoScript/Extbase/setup.typoscript b/Configuration/TypoScript/Extbase/setup.txt → ...ation/TypoScript/Extbase/setup.typoscript
@@ -15,6 +15,6 @@ config.tx_extbase {
           }
         }
       }
-		}
-	}
-}
+    }
+  }
+}
diff --git a/README.md b/README.md
@@ -1,3 +1,8 @@
-# EXT:static_info_tables_zh
+# TYPO3 extension static_info_tables_zh
 
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/lochmueller/static_info_tables_zh/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/lochmueller/static_info_tables_zh/?branch=master)
+
+## What is does
+
+Use this extension to get the simplified chinese namings for countries and territories.
+It is an enhancement for the extension static_info_tables.
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<xliff version="1.0">
-	<file source-language="en" datatype="plaintext" original="messages" date="2014-01-26T15:19:07Z" product-name="static_info_tables_zh">
+<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
+	<file source-language="en" datatype="plaintext" original="EXT:static_info_tables_zh/Resources/Private/Language/locallang_db.xlf" date="2024-06-07T13:26:07Z" product-name="static_info_tables_zh">
 		<header/>
 		<body>
 			<trans-unit id="static_countries_item.cn_short_zh" xml:space="preserve">

diff --git a/class.ext_update.php b/class.ext_update.php
diff --git a/composer.json b/composer.json
@@ -20,9 +20,9 @@
     }
   ],
   "require": {
-    "php": "^7.2||^8.0",
-    "typo3/cms-core": "^9.5||^10.4.6||^11.5",
-    "sjbr/static-info-tables": "^6.9||^11.5"
+    "php": "^8.1",
+    "typo3/cms-core": "^12.4",
+    "sjbr/static-info-tables": "^12.4"
   },
   "replace": {
     "typo3-ter/static-info-tables-zh": "self.version"
@@ -34,7 +34,11 @@
   },
   "config": {
     "vendor-dir": ".Build/vendor",
-    "bin-dir": ".Build/bin"
+    "bin-dir": ".Build/bin",
+    "allow-plugins": {
+      "typo3/cms-composer-installers": true,
+      "typo3/class-alias-loader": true
+    }
   },
   "extra": {
     "typo3/cms": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,6 @@ config.tx_extbase { @@
               }
             }
           }
-    		}
-    	}
-    }
+        }
+      }
+    }