diff --git a/Classes/Aggregate/BackendPreviewAggregate.php b/Classes/Aggregate/BackendPreviewAggregate.php index e3cb38b..243ae1b 100644 --- a/Classes/Aggregate/BackendPreviewAggregate.php +++ b/Classes/Aggregate/BackendPreviewAggregate.php @@ -52,11 +52,6 @@ public function __construct(array $maskConfiguration, BackendFluidCodeGenerator */ protected function process() { - $extensionConfiguration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['mask_export']); - if (empty($extensionConfiguration['backendPreview'])) { - return; - } - if (empty($this->maskConfiguration[$this->table]['elements'])) { return; } diff --git a/Classes/Aggregate/ContentElementIconAggregate.php b/Classes/Aggregate/ContentElementIconAggregate.php index f8e1112..157fbb1 100644 --- a/Classes/Aggregate/ContentElementIconAggregate.php +++ b/Classes/Aggregate/ContentElementIconAggregate.php @@ -34,11 +34,6 @@ protected function process() return; } - $extensionConfiguration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['mask_export']); - if (empty($extensionConfiguration['contentElementIcons'])) { - return; - } - $maskConfiguration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['mask']); $maskIconFolder = PATH_site . $maskConfiguration['preview']; diff --git a/Classes/Aggregate/ExtensionConfigurationAggregate.php b/Classes/Aggregate/ExtensionConfigurationAggregate.php index 95e17cd..7385efe 100644 --- a/Classes/Aggregate/ExtensionConfigurationAggregate.php +++ b/Classes/Aggregate/ExtensionConfigurationAggregate.php @@ -28,14 +28,10 @@ class ExtensionConfigurationAggregate extends AbstractAggregate implements PhpAw */ protected function process() { - $extensionConfiguration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['mask_export']); $this->addExtEmconf(); $this->addComposerJson(); $this->addExtIcon(); - - if (!empty($extensionConfiguration['maskConfiguration'])) { - $this->addMaskConfiguration(); - } + $this->addMaskConfiguration(); } /** diff --git a/Tests/Functional/Controller/AbstractExportControllerTestCase.php b/Tests/Functional/Controller/AbstractExportControllerTestCase.php index 969b494..9037256 100644 --- a/Tests/Functional/Controller/AbstractExportControllerTestCase.php +++ b/Tests/Functional/Controller/AbstractExportControllerTestCase.php @@ -39,7 +39,6 @@ abstract class AbstractExportControllerTestCase extends FunctionalTestCase 'EXT' => [ 'extConf' => [ 'mask' => 'a:2:{s:4:"json";s:83:"typo3conf/ext/mask_export/Tests/Functional/Fixtures/Configuration/mask-default.json";s:7:"preview";s:70:"typo3conf/ext/mask_export/Tests/Functional/Fixtures/Templates/Preview/";}', - 'mask_export' => 'a:3:{s:17:"maskConfiguration";s:1:"1";s:14:"backendPreview";s:1:"1";s:19:"contentElementIcons";s:1:"1";}', ], ], ]; diff --git a/ext_conf_template.txt b/ext_conf_template.txt deleted file mode 100644 index 193c7da..0000000 --- a/ext_conf_template.txt +++ /dev/null @@ -1,8 +0,0 @@ -# cat=basic/enable; type=boolean; label=LLL:EXT:mask_export/Resources/Private/Language/locallang.xlf:config.maskConfiguration -maskConfiguration = - -# cat=Experimental; type=boolean; label=LLL:EXT:mask_export/Resources/Private/Language/locallang.xlf:config.backendPreview -backendPreview = - -# cat=Experimental; type=boolean; label=LLL:EXT:mask_export/Resources/Private/Language/locallang.xlf:config.contentElementIcons -contentElementIcons =