Merge pull request #126 from IchHabRecht/feature/remove-configuration

IchHabRecht · May 16, 2018 · 12d1c51 · 12d1c51
2 parents f791082 + a7b33e8
commit 12d1c51
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 24 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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