Upgrade to TYPO3 11.5 (#80)

* #79 Allow install in T3 11.5 and migrate labels * #79 Prepare release 1.9.0
digedag · Jan 27, 2023 · ddfc03b · ddfc03b
1 parent 099ddb7
commit ddfc03b
Show file tree

Hide file tree

Showing 12 changed files with 1,143 additions and 486 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 Changes
 -------
 
+v1.9.0 (27.01.2023)
+ * Allow install in TYPO3 11.5
+ * Some bugfixes
+
 v1.8.2 (26.06.2022)
  * Fixed dummy teams visible in league table
  * Enable automatic TER release

diff --git a/Configuration/Flexform/plugin_competition.xml b/Configuration/Flexform/plugin_competition.xml
diff --git a/Configuration/Flexform/plugin_report.xml b/Configuration/Flexform/plugin_report.xml
diff --git a/Configuration/PageTS/modWizards.ts b/Configuration/PageTS/modWizards.ts
@@ -3,17 +3,17 @@ mod.wizards {
 		elements {
 			t3sports_competition {
 				iconIdentifier = t3sports_plugin
-				title = LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:plugin.competition.label
-				description = LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:plugin.competition.description
+				title = LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.competition.label
+				description = LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.competition.description
 				tt_content_defValues {
 					CType = list
 					list_type = tx_cfcleaguefe_competition
 				}
 			}
 			t3sports_report {
 				iconIdentifier = t3sports_plugin
-				title = LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:plugin.report.label
-				description = LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:plugin.report.description
+				title = LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.report.label
+				description = LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.report.description
 				tt_content_defValues {
 					CType = list
 					list_type = tx_cfcleaguefe_report

diff --git a/Configuration/TCA/Overrides/tt_content.php b/Configuration/TCA/Overrides/tt_content.php
@@ -22,7 +22,7 @@
 
     tx_rnbase_util_Extensions::addPlugin(
         [
-            'LLL:EXT:'.$extKey.'/Resources/Private/Language/locallang_db.xml:plugin.competition.label',
+            'LLL:EXT:'.$extKey.'/Resources/Private/Language/locallang_db.xlf:plugin.competition.label',
             'tx_cfcleaguefe_competition',
         ],
         'list_type',
@@ -62,7 +62,7 @@
      */
     tx_rnbase_util_Extensions::addPlugin(
         [
-            'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:plugin.report.label',
+            'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.report.label',
             'tx_cfcleaguefe_report',
         ],
         'list_type',

diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf
diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
diff --git a/Resources/Private/Language/locallang_db.xml b/Resources/Private/Language/locallang_db.xml
diff --git a/Tests/Unit/PHP/Table/Football/TableTest.php b/Tests/Unit/PHP/Table/Football/TableTest.php
@@ -72,9 +72,9 @@ public function testLeagueTableWithDummyTeam()
         // T4 - 0:4 0:5
 
         $expected = [
-            0 => ['teamId' => 't_13', 'points' => 4, 'goals1' => 3, 'goals2' => 0, 'goals_diff' => 3,],
-            1 => ['teamId' => 't_11', 'points' => 2, 'goals1' => 3, 'goals2' => 1, 'goals_diff' => 2,],
-            2 => ['teamId' => 't_14', 'points' => 0, 'goals1' => 0, 'goals2' => 5, 'goals_diff' => -5,],
+            0 => ['teamId' => 't_13', 'points' => 4, 'goals1' => 3, 'goals2' => 0, 'goals_diff' => 3],
+            1 => ['teamId' => 't_11', 'points' => 2, 'goals1' => 3, 'goals2' => 1, 'goals_diff' => 2],
+            2 => ['teamId' => 't_14', 'points' => 0, 'goals1' => 0, 'goals2' => 5, 'goals_diff' => -5],
         ];
         foreach ($scoreLine as $idx => $score) {
             $this->assertEquals($expected[$idx]['teamId'], $score['team']->getTeamId());

diff --git a/composer.json b/composer.json
@@ -25,12 +25,11 @@
 		"typo3-ter/cfc-league-fe" : "self.version"
 	},
 	"require" : {
-		"typo3/cms-core": "^8.7 || ^9.5.17 || ^10.4.3",
-		"digedag/cfc-league" : "~1.8.0",
-		"digedag/rn-base" : "~1.15.3"
+		"typo3/cms-core": "^8.7 || ^9.5 || ^10.4 || ^11.5",
+		"digedag/cfc-league" : "~1.9.0",
+		"digedag/rn-base" : "~1.16.0"
 	},
 	"require-dev": {
-		"namelesscoder/typo3-repository-client": "^1.2",
 		"nimut/testing-framework": "^1.1 || ^2.0 || ^4.0 || ^5.0",
 		"mikey179/vfsstream": "^1.4 || ^1.6",
 		"phpunit/phpunit": "^6.5.14 || ^7.5.20",
@@ -85,7 +84,7 @@
 			]
 		},
 		"branch-alias": {
-			"dev-master": "1.8.x-dev"
+			"dev-master": "1.9.x-dev"
 		}
     }
 }
diff --git a/ext_emconf.php b/ext_emconf.php
@@ -14,7 +14,7 @@
     'title' => 'T3sports FE',
     'description' => 'FE-Plugins von T3sports. Liefert u.a. die Views Spielplan, Spielbericht, Tabellen, Team- und Spieleransicht. FE plugins for T3sports. Contains views for matchtable, leaguetable, matchreport, team and player reports and many more. Requires PHP5!',
     'category' => 'plugin',
-    'version' => '1.8.2',
+    'version' => '1.9.0',
     'dependencies' => 'rn_base,cfc_league',
     'module' => '',
     'state' => 'beta',
@@ -28,8 +28,8 @@
         'depends' => [
             'typo3' => '8.7.0-10.4.99',
             'php' => '7.1.0-8.9.99',
-            'rn_base' => '1.15.0-0.0.0',
-            'cfc_league' => '1.8.0-0.0.0',
+            'rn_base' => '1.16.0-0.0.0',
+            'cfc_league' => '1.9.0-0.0.0',
         ],
         'conflicts' => [],
         'suggests' => [],

diff --git a/ext_localconf.php b/ext_localconf.php
@@ -27,18 +27,18 @@
 $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['cfc_league_fe']['matchMarker_afterSubst'][] = \System25\T3sports\Hook\MatchHistoryHook::class.'->addMatches';
 $GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['cfc_league_fe']['matchMarker_afterSubst'][] = \System25\T3sports\Hook\MatchChartHook::class.'->addChart';
 
-System25\T3sports\Utility\Misc::registerTableStrategy('default', 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:tablestrategy_default', System25\T3sports\Table\Football\Comparator::class);
-System25\T3sports\Utility\Misc::registerTableStrategy('head2head', 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:tablestrategy_head2head', System25\T3sports\Table\Football\ComparatorH2H::class);
-System25\T3sports\Utility\Misc::registerTableStrategy('pointpermatch', 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:tablestrategy_pointpermatch', System25\T3sports\Table\ComparatorPPM::class);
-System25\T3sports\Utility\Misc::registerTableStrategy('volleyball3', 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:tablestrategy_volleyball_3point', System25\T3sports\Table\Volleyball\Comparator3Point::class);
-System25\T3sports\Utility\Misc::registerTableStrategy('volleyball2', 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:tablestrategy_volleyball_2point', System25\T3sports\Table\Volleyball\Comparator::class);
+System25\T3sports\Utility\Misc::registerTableStrategy('default', 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:tablestrategy_default', System25\T3sports\Table\Football\Comparator::class);
+System25\T3sports\Utility\Misc::registerTableStrategy('head2head', 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:tablestrategy_head2head', System25\T3sports\Table\Football\ComparatorH2H::class);
+System25\T3sports\Utility\Misc::registerTableStrategy('pointpermatch', 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:tablestrategy_pointpermatch', System25\T3sports\Table\ComparatorPPM::class);
+System25\T3sports\Utility\Misc::registerTableStrategy('volleyball3', 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:tablestrategy_volleyball_3point', System25\T3sports\Table\Volleyball\Comparator3Point::class);
+System25\T3sports\Utility\Misc::registerTableStrategy('volleyball2', 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:tablestrategy_volleyball_2point', System25\T3sports\Table\Volleyball\Comparator::class);
 
 Sys25\RnBase\Utility\Extensions::addService(
     $_EXTKEY,
     'cfcleague_statistics' /* sv type */ ,
     'tx_cfcleaguefe_sv2_PlayerStatistics' /* sv key */ ,
     [
-    'title' => 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:plugin.competition.flexform.statistics.type.player', 'description' => 'Statistical data about players', 'subtype' => 'player',
+    'title' => 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.competition.flexform.statistics.type.player', 'description' => 'Statistical data about players', 'subtype' => 'player',
     'available' => true, 'priority' => 50, 'quality' => 50,
     'os' => '', 'exec' => '',
     'className' => 'System25\T3sports\Statistics\Service\PlayerStatistics',
@@ -50,7 +50,7 @@
     'cfcleague_statistics' /* sv type */ ,
     'tx_cfcleaguefe_sv2_ScorerStatistics' /* sv key */ ,
     [
-    'title' => 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:plugin.competition.flexform.statistics.type.scorerlist', 'description' => 'A list of best scorer', 'subtype' => 'scorerlist',
+    'title' => 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.competition.flexform.statistics.type.scorerlist', 'description' => 'A list of best scorer', 'subtype' => 'scorerlist',
     'available' => true, 'priority' => 50, 'quality' => 50,
     'os' => '', 'exec' => '',
     'className' => 'System25\T3sports\Statistics\Service\ScorerStatistics',
@@ -62,7 +62,7 @@
     'cfcleague_statistics' /* sv type */ ,
     'tx_cfcleaguefe_sv2_AssistStatistics' /* sv key */ ,
     [
-    'title' => 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:plugin.competition.flexform.statistics.type.assistlist', 'description' => 'A list of best assists', 'subtype' => 'assistlist',
+    'title' => 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.competition.flexform.statistics.type.assistlist', 'description' => 'A list of best assists', 'subtype' => 'assistlist',
     'available' => true, 'priority' => 50, 'quality' => 50,
     'os' => '', 'exec' => '',
     'className' => 'System25\T3sports\Statistics\Service\AssistStatistics',
@@ -74,7 +74,7 @@
     'cfcleague_statistics' /* sv type */ ,
     'tx_cfcleaguefe_sv2_PlayerSummaryStatistics' /* sv key */ ,
     [
-    'title' => 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:plugin.competition.flexform.statistics.type.playersummary', 'description' => 'Some additional data of player statistics', 'subtype' => 'playersummary',
+    'title' => 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.competition.flexform.statistics.type.playersummary', 'description' => 'Some additional data of player statistics', 'subtype' => 'playersummary',
     'available' => true, 'priority' => 50, 'quality' => 50,
     'os' => '', 'exec' => '',
     'className' => 'System25\T3sports\Statistics\Service\PlayerSummaryStatistics',
@@ -86,7 +86,7 @@
     'cfcleague_statistics' /* sv type */ ,
     'tx_cfcleaguefe_sv2_VisitorStatistics' /* sv key */ ,
     [
-    'title' => 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xml:plugin.competition.flexform.statistics.type.visitors', 'description' => 'Count visitors of all teams', 'subtype' => 'visitors',
+    'title' => 'LLL:EXT:cfc_league_fe/Resources/Private/Language/locallang_db.xlf:plugin.competition.flexform.statistics.type.visitors', 'description' => 'Count visitors of all teams', 'subtype' => 'visitors',
     'available' => true, 'priority' => 50, 'quality' => 50,
     'os' => '', 'exec' => '',
     'className' => 'System25\T3sports\Statistics\Service\VisitorStatistics',