Merge pull request josefglatz#13 from lochmueller/master

Add TYPO3 v11 support
helmutstrasser · May 16, 2023 · c829648 · c829648
2 parents 4d08af2 + 2a0d7ee
commit c829648
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 5 deletions.
diff --git a/Classes/Domain/Model/Dto/ExtensionConfiguration.php b/Classes/Domain/Model/Dto/ExtensionConfiguration.php
@@ -31,7 +31,7 @@ public function __construct()
         if (VersionService::isVersion8()) {
             $settings = (array)unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['iconcheck'], [ false ]);
         }
-        if (VersionService::isVersion9() || VersionService::isVersion10()) {
+        if (VersionService::isVersion9() || VersionService::isVersion10() || VersionService::isVersion11()) {
             $settings = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class)->get('iconcheck');
         }
 

diff --git a/Classes/Service/VersionService.php b/Classes/Service/VersionService.php
@@ -35,6 +35,15 @@ public static function isVersion10(): bool
 
     }
 
+    public static function isVersion11(): bool
+    {
+        $constraintVersionMax = 11999999;
+        $constraintVersionMin = 11000000;
+
+        return static::evaluateCondition($constraintVersionMin, $constraintVersionMax);
+
+    }
+
     /**
      * @param int $min
      * @param int $max

diff --git a/composer.json b/composer.json
@@ -26,8 +26,8 @@
 		"GPL-3.0"
 	],
 	"require": {
-		"php":"^7.0 || ^7.1 || ^7.2 || ^7.3 || ^7.4",
-		"typo3/cms-core": "^8.7 || ^9.5 || ^10.4"
+		"php":"^7.0 || ^7.1 || ^7.2 || ^7.3 || ^7.4 || ^8.0",
+		"typo3/cms-core": "^8.7 || ^9.5 || ^10.4 || ^11.5"
 	},
 	"require-dev": {
 		"namelesscoder/typo3-repository-client": "^2.0",

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -12,7 +12,7 @@
         [
             'depends' =>
                 [
-                    'typo3' => '8.7.17-10.4.99',
+                    'typo3' => '8.7.17-11.5.99',
                 ],
             'conflicts' =>
                 [

diff --git a/ext_tables.php b/ext_tables.php
@@ -23,6 +23,12 @@
     $isEnableModuleForEverybody = $extConfIconcheck->isEnableModuleForEverybody();
 }
 
+if (\TYPO3\CMS\Core\Utility\VersionNumberUtility::convertVersionNumberToInteger($typo3Version) >= 11000000) {
+    $controller = \JosefGlatz\Iconcheck\Controller\IconcheckController::class;
+} else {
+    $controller = 'Iconcheck';
+}
+
 // Register backend module if it is not disabled
 if (!$isDisableModule) {
     \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule(
@@ -31,7 +37,7 @@
         'tx_iconcheck_m1',
         '',
         [
-            'Iconcheck' => 'index'
+            $controller => 'index'
         ],
         [
             'access' => $isEnableModuleForEverybody ? 'user,group' : 'admin',