typo3/template_aide
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[TASK] Start compatibility for TYPO3 11

Browse Source
This commit is contained in:
Philipp Dieter 2024-08-29 18:16:52 +02:00
parent 94296d4a4d
commit fb54d608a6
6 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Classes/Controller/ActionController.php
View File

@ -182,7 +182,7 @@ class ActionController extends BaseController
*/ */
public function injectPropertyMapper( public function injectPropertyMapper(
PropertyMapper $propertyMapper PropertyMapper $propertyMapper
) { ): void {
$this->propertyMapper = $propertyMapper; $this->propertyMapper = $propertyMapper;
} }

16
Classes/Traits/DependencyInjectionTrait.php
View File

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

2
Classes/ViewHelpers/TranslationViewHelper.php
View File

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

3
Resources/Private/UserTSConfig/default.ts
View File

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

2
composer.json
View File

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

27
ext_tables.php
View File

@ -39,14 +39,25 @@ call_user_func(
$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms']['db_new_content_el']['wizardItemsHook'][] = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms']['db_new_content_el']['wizardItemsHook'][] =
\Cjel\TemplatesAide\Hooks\WizardItems::class; \Cjel\TemplatesAide\Hooks\WizardItems::class;
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') { if (version_compare(TYPO3_branch, '10.0', '>=')) {
$GLOBALS['TBE_STYLES']['skins']['backend']['stylesheetDirectories']['dev'] = if (\TYPO3\CMS\Core\Core\Environment::getContext()->isDevelopment()) {
'EXT:templates_aide/Resources/Public/Css/backend/production-stage'; $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'] = $GLOBALS['TBE_STYLES']['skins']['backend']['stylesheetDirectories']['templates_aide_default'] =
@ -83,4 +94,4 @@ $GLOBALS['TYPO3_USER_SETTINGS']['showitem'] = str_replace(
'recursiveDelete', 'recursiveDelete',
'recursiveDelete,disableDragModal', 'recursiveDelete,disableDragModal',
$GLOBALS['TYPO3_USER_SETTINGS']['showitem'], $GLOBALS['TYPO3_USER_SETTINGS']['showitem'],
); );