Classes/Controller/ActionController.php

@@ -170,6 +170,22 @@ class ActionController extends BaseController
         $this->environmentService = $environmentService;
     }
 
+    /**
+     * propertyMapper
+     *
+     * @var PropertyMapper
+     */
+    protected $propertyMapper;
+
+    /**
+     * @param
+     */
+    public function injectPropertyMapper(
+        PropertyMapper $propertyMapper
+    ) {
+        $this->propertyMapper = $propertyMapper;
+    }
+
     /**
      * propertyMappingConfigurationBuilder
      *
@@ -760,37 +776,12 @@ class ActionController extends BaseController
         }
         if ($this->pageType) {
             if (is_array($this->responseStatus)) {
-                if (version_compare(TYPO3_branch, '10.0', '>=')) {
-                    $response =  $this
-                        ->responseFactory
-                        ->createResponse()
-                        ->withHeader(
-                            'Content-Type',
-                            'application/json; charset=utf-8'
-                        )
-                        ->withStatus(
-                            array_key_first($this->responseStatus),
-                            ''
-                        );
-                } else {
                 $this->response->setStatus(
                     array_key_first($this->responseStatus)
                 );
-                }
-            } else {
-                if (version_compare(TYPO3_branch, '10.0', '>=')) {
-                    $response =  $this
-                        ->responseFactory
-                        ->createResponse()
-                        ->withHeader(
-                            'Content-Type',
-                            'application/json; charset=utf-8'
-                        )
-                        ->withStatus($this->responseStatus, '');
             } else {
                 $this->response->setStatus($this->responseStatus);
             }
-            }
             if ($this->pageType == $this->ajaxPageType) {
                 if ($this->environmentService->isEnvironmentInBackendMode()) {
                     header('Content-Type: application/json');

Classes/Controller/TranslationController.php

@@ -41,14 +41,9 @@ class TranslationController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionCont
             $languageFactory = GeneralUtility::makeInstance(
                 LocalizationFactory::class
             );
-            $language = $this->request->getAttribute('language');
-            $locale = $language->getLocale();
-            //\TYPO3\CMS\Extbase\Utility\DebuggerUtility::var_dump(
-            //    $locale, '$locale', 3, true, false
-            //);
             $langfileContent = $languageFactory->getParsedData(
                 $langfilePath,
-                $locale
+                $GLOBALS['LANG']->lang
             );
             $langfileResult = [];
             foreach (reset($langfileContent) as $key => $row) {

Classes/Traits/DependencyInjectionTrait.php

@@ -102,17 +102,11 @@ trait DependencyInjectionTrait
                 $frameworkConfiguration['persistence']['storagePid']
             )
         );
-        if (version_compare(TYPO3_branch, '10.0', '>=')) {
-            $this->reflectionService = GeneralUtility::makeInstance(
-                ReflectionService::class
-            );
-        } else {
         $this->reflectionService = GeneralUtility::makeInstance(
             ReflectionService::class, GeneralUtility::makeInstance(
                 CacheManager::class
             )
         );
-        }
         $classInfo = $this->reflectionService->getClassSchema(
             get_class($this)
         );

Classes/ViewHelpers/TranslationViewHelper.php

@@ -66,7 +66,7 @@ class TranslationViewHelper extends AbstractViewHelper
         $translation = LocalizationUtility::translate(
             $arguments['key'],
             $arguments['extensionKey'],
-            (array) $arguments['arguments']
+            $arguments['arguments']
         );
         if ($translation) {
             return $translation;

Configuration/TCA/Overrides/tt_content.php

@@ -1,14 +0,0 @@
-<?php
-defined('TYPO3') || die();
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'TemplatesAide',
-    'Dummy',
-    'dummy'
-);
-
-\TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerPlugin(
-    'TemplatesAide',
-    'Translationplugin',
-    'translation'
-);

Resources/Private/Partials/Mails/DefaultHtml.html

@@ -18,16 +18,6 @@
     <f:variable name="buttonBackgroundcolor" value="#8ABF6F" />
   </f:else>
 </f:if>
-<f:if condition="{styleH1}">
-  <f:else>
-    <f:variable name="styleH1" value="" />
-  </f:else>
-</f:if>
-<f:if condition="{styleButton}">
-  <f:else>
-    <f:variable name="styleButton" value="padding: 10px 15px; border-radius: 3px;" />
-  </f:else>
-</f:if>
 <f:variable name="widthPadded" value="{width - padding - padding}" />
 <f:variable name="widthTableColumn" value="{widthPadded / 2}" />
 
@@ -91,7 +81,7 @@
                                   <div style="font-family:Arial, sans-serif;font-size:16px;line-height:1.4;text-align:{align};color:#000000;">
                                     <f:switch expression="{row.type}">
                                       <f:case value="headline">
-                                        <h1 style="{styleH1}">{row.data -> f:format.nl2br() -> f:format.raw()}</h1>
+                                        <h1>{row.data -> f:format.nl2br() -> f:format.raw()}</h1>
                                       </f:case>
                                       <f:case value="headline2">
                                         <h2>{row.data -> f:format.nl2br() -> f:format.raw()}</h2>
@@ -113,7 +103,7 @@
                                         <span style="display: inline-block;" class="buttonwrapper">
                                           <f:variable name="rowData">{row.data -> v:format.json.decode()}</f:variable>
                                           <a style="display: inline-block; color: {buttonColor}" target="_blank" href="{rowData.0}">
-                                            <span style="display: inline-block; background-color: {buttonBackgroundcolor}; {styleButton}">
+                                            <span style="display: inline-block; padding: 10px 15px; border-radius: 3px; background-color: {buttonBackgroundcolor};">
                                               {rowData.1}
                                             </span>
                                           </a>

Resources/Private/UserTSConfig/default.ts

@@ -1,3 +1,6 @@
+#options.pageTree.showPageIdWithTitle = 1
+options.pageTree.showNavTitle = 1
+
 options {
     folderTree {
         uploadFieldsInLinkBrowser = 0

composer.json

@@ -9,7 +9,7 @@
         }
     ],
     "require": {
-        "typo3/cms-core": "8.7.0 - 11.99.99",
+        "typo3/cms-core": "8.7.0 - 10.99.99",
         "sarhan/php-flatten": "^4.0"
     },
     "autoload": {

ext_emconf.php

@@ -23,6 +23,7 @@ $EM_CONF[$_EXTKEY] = [
     'version' => '0.0.1',
     'constraints' => [
         'depends' => [
+            'typo3' => '8.7.0-10.99.99',
         ],
         'conflicts' => [],
         'suggests' => [],

ext_localconf.php

@@ -1,30 +1,9 @@
 <?php
 defined('TYPO3_MODE') || die('Access denied.');
 
-
-(static function() {
-
-
-})();
-
 call_user_func(
     function()
     {
-        if (version_compare(TYPO3_branch, '10.0', '>=')) {
-
-            \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
-                'TemplatesAide',
-                'Translationplugin',
-                [
-                    \Cjel\TemplatesAide\Controller\TranslationController::class => 'translations'
-                ],
-                // non-cacheable actions
-                [
-                    \Cjel\TemplatesAide\Controller\TranslationController::class => ''
-                ]
-            );
-
-        } else {
 
         \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
             'Cjel.TemplatesAide',
@@ -53,8 +32,6 @@ call_user_func(
             ]
         );
 
-        }
-
         // wizards
         \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig(
             'mod {

ext_tables.php

@@ -39,26 +39,15 @@ call_user_func(
         $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms']['db_new_content_el']['wizardItemsHook'][] =
             \Cjel\TemplatesAide\Hooks\WizardItems::class;
 
-
-        if (version_compare(TYPO3_branch, '10.0', '>=')) {
-            if (\TYPO3\CMS\Core\Core\Environment::getContext()->isDevelopment()) {
-                $GLOBALS['TBE_STYLES']['skins']['backend']['stylesheetDirectories']['dev'] =
-                    'EXT:templates_aide/Resources/Public/Css/backend/dev';
-            }
-            if(\TYPO3\CMS\Core\Core\Environment::getContext()->__toString() === 'Production/Stage') {
-                $GLOBALS['TBE_STYLES']['skins']['backend']['stylesheetDirectories']['dev'] =
-                    'EXT:templates_aide/Resources/Public/Css/backend/production-stage';
-            }
-        } else {
         if(\TYPO3\CMS\Core\Utility\GeneralUtility::getApplicationContext()->isDevelopment()) {
             $GLOBALS['TBE_STYLES']['skins']['backend']['stylesheetDirectories']['dev'] =
                 'EXT:templates_aide/Resources/Public/Css/backend/dev';
         }
+
         if(\TYPO3\CMS\Core\Utility\GeneralUtility::getApplicationContext()->__toString() === 'Production/Stage') {
             $GLOBALS['TBE_STYLES']['skins']['backend']['stylesheetDirectories']['dev'] =
                 'EXT:templates_aide/Resources/Public/Css/backend/production-stage';
         }
-        }
 
         $GLOBALS['TBE_STYLES']['skins']['backend']['stylesheetDirectories']['templates_aide_default'] =
             'EXT:templates_aide/Resources/Public/Css/backend/default';