Skip to content

Commit 25af1b4

Browse files
committed
[TASK] Clean up and remove TYPO3 11 support
1 parent ea3ae99 commit 25af1b4

File tree

5 files changed

+8
-45
lines changed

5 files changed

+8
-45
lines changed

Classes/Controller/PermissionController.php

+1-8
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,7 @@ public function indexAction(): ResponseInterface
6161
$this->view->assign('canUpdate', $this->permissionUpdater->updateNecessary());
6262
$this->view->assign('updatesNeeded', $updatesNeeded);
6363
}
64-
65-
if (method_exists($moduleTemplate, 'renderResponse')) {
66-
return $moduleTemplate->renderResponse('Permission/IndexNew');
67-
}
68-
69-
$moduleTemplate->setContent($this->view->render());
70-
return new HtmlResponse($moduleTemplate->renderContent());
71-
64+
return $moduleTemplate->renderResponse('Permission/IndexNew');
7265
}
7366

7467
public function updateAction(): ResponseInterface

Classes/Permissions/MaskPermissions.php

+3-9
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
2828
use TYPO3\CMS\Core\Information\Typo3Version;
2929
use TYPO3\CMS\Core\Utility\GeneralUtility;
30-
use TYPO3\CMS\Core\Utility\VersionNumberUtility;
3130

3231
class MaskPermissions
3332
{
@@ -267,15 +266,10 @@ protected function getBeUserGroups(): array
267266

268267
protected function getConditionForDifferentTypo3Version($column, $table, $element): bool
269268
{
270-
$currentVersion = VersionNumberUtility::getCurrentTypo3Version();
271-
$typo3VersionArray = VersionNumberUtility::convertVersionStringToArray($currentVersion);
272269
$fieldType = $this->tableDefinitionCollection->getFieldType($column, $table, $element->key);
273-
274-
if (version_compare((string)$typo3VersionArray['version_main'], '12', '>=')) {
275-
return $fieldType->name === FieldType::PALETTE->name && $fieldType->value === FieldType::PALETTE->value;
270+
if (method_exists($fieldType, 'equals')) {
271+
return $fieldType->equals(FieldType::PALETTE);
276272
}
277-
278-
return $fieldType->equals(FieldType::PALETTE);
273+
return $fieldType === FieldType::PALETTE;
279274
}
280-
281275
}

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
},
2222
"require": {
2323
"php": "^7.4 || ^8.0",
24-
"typo3/cms-core": "^11.5 || ^12.0 || ^13.0",
25-
"mask/mask": "^7.2 || ^8.0 || ^9.0"
24+
"typo3/cms-core": "^12.4 || ^13.4",
25+
"mask/mask": "^8.0 || ^9.0"
2626
},
2727
"replace": {
2828
"typo3-ter/mask-permissions": "self.version"

ext_emconf.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
'version' => '3.1.0',
1313
'constraints' => [
1414
'depends' => [
15-
'typo3' => '11.5.0-13.5.99',
16-
'mask' => '7.2.0-9.99.99',
15+
'typo3' => '12.4.0-13.4.99',
16+
'mask' => '8.0.0-9.99.99',
1717
],
1818
'conflicts' => [],
1919
],

ext_tables.php

-24
This file was deleted.

0 commit comments

Comments
 (0)