Merge pull request #8 from HimanshuRamavat07/master

[FEATURE] Added TYPO3 V13 support

Author: nhovratov

.gitignore

@@ -1,3 +1,4 @@
 .Build
 .env
 composer.lock
+.idea/

Classes/Controller/PermissionController.php

@@ -61,13 +61,7 @@ public function indexAction(): ResponseInterface
             $this->view->assign('canUpdate', $this->permissionUpdater->updateNecessary());
             $this->view->assign('updatesNeeded', $updatesNeeded);
         }
-
-        if (method_exists($moduleTemplate, 'renderResponse')) {
-            return $moduleTemplate->renderResponse('IndexNew');
-        } else {
-            $moduleTemplate->setContent($this->view->render());
-            return new HtmlResponse($moduleTemplate->renderContent());
-        }
+        return $moduleTemplate->renderResponse('Permission/IndexNew');
     }
 
     public function updateAction(): ResponseInterface

Classes/Permissions/MaskPermissions.php

@@ -21,6 +21,7 @@
 use MASK\Mask\Enumeration\FieldType;
 use MASK\Mask\Utility\AffixUtility;
 use TYPO3\CMS\Beuser\Domain\Repository\BackendUserGroupRepository;
+use TYPO3\CMS\Core\Database\Connection;
 use TYPO3\CMS\Core\Database\ConnectionPool;
 use TYPO3\CMS\Core\Database\Query\QueryBuilder;
 use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction;
@@ -186,7 +187,7 @@ protected function getMaskFields(string $table): array
         $tableDefinition = $this->tableDefinitionCollection->getTable($table);
         foreach ($tableDefinition->elements as $element) {
             foreach ($element->columns as $column) {
-                if ($this->tableDefinitionCollection->getFieldType($column, $table, $element->key)->equals(FieldType::PALETTE)) {
+                if ($this->getConditionForDifferentTypo3Version($column, $table, $element)) {
                     foreach ($tableDefinition->palettes->getPalette($column)->showitem as $item) {
                         $fields = $this->addField($fields, $item, $table);
                     }
@@ -248,7 +249,7 @@ protected function getPermissions(int $uid): array
         return $queryBuilder
             ->select('non_exclude_fields', 'tables_modify', 'explicit_allowdeny')
             ->from('be_groups')
-            ->where($queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($uid, \PDO::PARAM_INT)))
+            ->where($queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($uid, Connection::PARAM_INT)))
             ->executeQuery()
             ->fetchAssociative();
     }
@@ -262,4 +263,13 @@ protected function getBeUserGroups(): array
         }
         return $uids;
     }
+
+    protected function getConditionForDifferentTypo3Version($column, $table, $element): bool
+    {
+        $fieldType = $this->tableDefinitionCollection->getFieldType($column, $table, $element->key);
+        if (method_exists($fieldType, 'equals')) {
+            return $fieldType->equals(FieldType::PALETTE);
+        }
+        return $fieldType === FieldType::PALETTE;
+    }
 }

Resources/Private/Partials/Form.html

@@ -8,6 +8,10 @@ <h1>Mask Permissions</h1>
     .mb {
         margin-bottom: 18px;
     }
+
+    .pull-right {
+        float:right;
+    }
 </style>
 <f:flashMessages/>
 <f:if condition="{canUpdate}">

composer.json

@@ -21,8 +21,8 @@
 	},
 	"require": {
 		"php": "^7.4 || ^8.0",
-		"typo3/cms-core": "^11.5 || ^12.0",
-		"mask/mask": "^7.2 || ^8.0"
+		"typo3/cms-core": "^12.4 || ^13.4",
+		"mask/mask": "^8.0 || ^9.0"
 	},
 	"replace": {
 		"typo3-ter/mask-permissions": "self.version"

ext_emconf.php

@@ -12,8 +12,8 @@
     'version' => '3.1.0',
     'constraints' => [
         'depends' => [
-            'typo3' => '11.5.0-12.5.99',
-            'mask' => '7.2.0-8.99.99',
+            'typo3' => '12.4.0-13.4.99',
+            'mask' => '8.0.0-9.99.99',
         ],
         'conflicts' => [],
     ],