diff --git a/extensions/ter_fe2/Tests/Unit/Utility/ArchiveUtilityTest.php b/extensions/ter_fe2/Tests/Unit/Utility/ArchiveUtilityTest.php
index 79df7e28adc381dccc929b3e2fe5506807bb51fa..c77881c249ce71ca6854b0c67a4ea7e3d1377e38 100644
--- a/extensions/ter_fe2/Tests/Unit/Utility/ArchiveUtilityTest.php
+++ b/extensions/ter_fe2/Tests/Unit/Utility/ArchiveUtilityTest.php
@@ -73,10 +73,9 @@ class ArchiveUtilityTest extends \Nimut\TestingFramework\TestCase\UnitTestCase
/**
* @test
*/
- public function extractEmConfReturnsSaveArrayOnlyForInvalidNodeFunction()
+ public function extractEmConfReturnsNullForInvalidNodeFunction()
{
$code = ' \'baz\'); function foo() {} ?>';
- $expected = ['bar' => 'baz'];
$subject = $this->getAccessibleMock(
\T3o\TerFe2\Utility\ArchiveUtility::class,
@@ -84,8 +83,7 @@ class ArchiveUtilityTest extends \Nimut\TestingFramework\TestCase\UnitTestCase
);
$emConf = $subject->_call('extractEmConf', $code);
- $this->assertNotNull($emConf);
- $this->assertSame($expected, $emConf);
+ $this->assertNull($emConf);
}
/**
diff --git a/extensions/ter_fe2/composer.json b/extensions/ter_fe2/composer.json
index 102b830055e4acea2e36f38091ad4bbaf586f794..c6965e6ff80737aab45d557939ed6a845121ba6c 100644
--- a/extensions/ter_fe2/composer.json
+++ b/extensions/ter_fe2/composer.json
@@ -19,7 +19,8 @@
},
"license": "GPL-2.0+",
"require": {
- "typo3/cms-core": ">= 8.7.0, <= 8.7.99"
+ "typo3/cms-core": "^8.7 || ^9.5",
+ "apache-solr-for-typo3/solr": "^9.0"
},
"autoload": {
"psr-4": {
diff --git a/extensions/ter_fe2/ext_emconf.php b/extensions/ter_fe2/ext_emconf.php
index 67e1b67157767ea0087cc46904a8810980283f66..2753bd95121d058fefc76ab7518b4dbf5a2a76a8 100644
--- a/extensions/ter_fe2/ext_emconf.php
+++ b/extensions/ter_fe2/ext_emconf.php
@@ -31,16 +31,9 @@ $EM_CONF[$_EXTKEY] = [
'lockType' => '',
'version' => '0.4.0',
'constraints' => [
- 'depends' => [
- 'extbase' => '',
- 'fluid' => '',
- ],
- 'conflicts' => [
- ],
- 'suggests' => [
- 'em' => '',
- 'paginate' => '',
- ],
+ 'depends' => [],
+ 'conflicts' => [],
+ 'suggests' => [],
],
'suggests' => [
],
diff --git a/extensions/ter_fe2/ext_tables.php b/extensions/ter_fe2/ext_tables.php
index 0a6375cc190a4d302f1699f0c5274658aa9eeba2..48f421633033167d2b20a7ee067bfd6e9882413c 100644
--- a/extensions/ter_fe2/ext_tables.php
+++ b/extensions/ter_fe2/ext_tables.php
@@ -30,7 +30,7 @@ call_user_func(function () {
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('
mod.wizards.newContentElement.wizardItems.special {\n
elements.' . $extIdent . ' {\n
- icon = ' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('ter_fe2') . 'Resources/Public/Images/Wizard.gif\n
+ icon = ' . \TYPO3\CMS\Core\Utility\PathUtility::stripPathSitePrefix(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('ter_fe2')) . 'Resources/Public/Images/Wizard.gif\n
title = LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:newContentElement.wizardItem.title\n
description = LLL:EXT:ter_fe2/Resources/Private/Language/locallang_db.xlf:newContentElement.wizardItem.description\n\n
tt_content_defValues {\n
diff --git a/extensions/ter_layout/Configuration/TypoScript/Default/setup.txt b/extensions/ter_layout/Configuration/TypoScript/Default/setup.txt
index 12f7757442bc30b0955181342e4253f38e29b47f..245ece95bb6ead32ed6f914c09e3f1a47e01b2d6 100644
--- a/extensions/ter_layout/Configuration/TypoScript/Default/setup.txt
+++ b/extensions/ter_layout/Configuration/TypoScript/Default/setup.txt
@@ -1,8 +1,8 @@
# Include required static setup
-
-
-
-
+@import 'EXT:fluid_styled_content/Configuration/TypoScript/setup.typoscript'
+@import 'EXT:solr/Configuration/TypoScript/Solr/setup.txt'
+@import 'EXT:ter/resources/static/setup.txt'
+@import 'EXT:ter_fe2/Configuration/TypoScript/Default/setup.txt'
-
-
+@import 'EXT:ter_layout/Configuration/TypoScript/Page.typoscript'
+@import 'EXT:ter_layout/Configuration/TypoScript/Ext/'
diff --git a/extensions/ter_layout/Configuration/TypoScript/Ext/Piwik.typoscript b/extensions/ter_layout/Configuration/TypoScript/Ext/Piwik.typoscript
index 956863ec6431aa8c4d2ce1a9590c4f80d74805bb..a9ce225b06e3a43eecbd79f211285ae478a522b1 100644
--- a/extensions/ter_layout/Configuration/TypoScript/Ext/Piwik.typoscript
+++ b/extensions/ter_layout/Configuration/TypoScript/Ext/Piwik.typoscript
@@ -1,3 +1,5 @@
+[backend.user.isLoggedIn]
+[else]
page {
headerData {
1501157682 = TEXT
@@ -24,3 +26,4 @@ page {
)
}
}
+[global]
\ No newline at end of file
diff --git a/extensions/ter_layout/composer.json b/extensions/ter_layout/composer.json
index 34c31f0bc18530c7d8f94076c02b72b62fede1fd..845fe14cc64507340e2ce0da9c64f348ff90d77f 100644
--- a/extensions/ter_layout/composer.json
+++ b/extensions/ter_layout/composer.json
@@ -19,7 +19,7 @@
},
"license": "GPL-2.0+",
"require": {
- "typo3/cms-core": ">= 8.7.0, <= 8.7.99"
+ "typo3/cms-core": "^8.7 || ^9.5"
},
"replace": {
"ter_layout": "self.version"
diff --git a/private/typo3conf/LocalConfiguration.php b/private/typo3conf/LocalConfiguration.php
index d75e5b91110446b5d06e2991530ba60513f48031..c10af46f5af74998c5b455ab51db3006101c99b3 100644
--- a/private/typo3conf/LocalConfiguration.php
+++ b/private/typo3conf/LocalConfiguration.php
@@ -21,24 +21,82 @@ return [
],
'EXT' => [
'extConf' => [
- 'backend' => 'a:5:{s:9:"loginLogo";s:0:"";s:19:"loginHighlightColor";s:0:"";s:20:"loginBackgroundImage";s:0:"";s:11:"backendLogo";s:0:"";s:14:"backendFavicon";s:0:"";}',
+ 'backend' => 'a:6:{s:9:"loginLogo";s:0:"";s:19:"loginHighlightColor";s:0:"";s:20:"loginBackgroundImage";s:0:"";s:13:"loginFootnote";s:0:"";s:11:"backendLogo";s:0:"";s:14:"backendFavicon";s:0:"";}',
'extensionmanager' => 'a:2:{s:21:"automaticInstallation";s:1:"1";s:11:"offlineMode";s:1:"0";}',
- 'gridelements' => 'a:3:{s:20:"additionalStylesheet";s:0:"";s:19:"nestingInListModule";s:1:"0";s:26:"overlayShortcutTranslation";s:1:"0";}',
- 'ig_ldap_sso_auth' => 'a:18:{s:18:"checkConfiguration";s:1:"0";s:21:"throwExceptionAtLogin";s:1:"1";s:22:"forceLowerCaseUsername";s:1:"1";s:26:"enableBELDAPAuthentication";s:1:"0";s:17:"TYPO3BEGroupExist";s:1:"0";s:16:"TYPO3BEUserExist";s:1:"0";s:10:"BEfailsafe";s:1:"0";s:27:"TYPO3BEGroupsNotSynchronize";s:1:"0";s:12:"keepBEGroups";s:1:"0";s:11:"enableBESSO";s:1:"0";s:26:"enableFELDAPAuthentication";s:1:"1";s:31:"TYPO3FEDeleteUserIfNoLDAPGroups";s:1:"0";s:32:"TYPO3FEDeleteUserIfNoTYPO3Groups";s:1:"0";s:17:"TYPO3FEGroupExist";s:1:"0";s:16:"TYPO3FEUserExist";s:1:"0";s:27:"TYPO3FEGroupsNotSynchronize";s:1:"1";s:12:"keepFEGroups";s:1:"1";s:11:"enableFESSO";s:1:"0";}',
- 'realurl' => 'a:6:{s:10:"configFile";s:34:"typo3conf/RealurlConfiguration.php";s:14:"enableAutoConf";s:1:"1";s:14:"autoConfFormat";s:1:"0";s:17:"segTitleFieldList";s:0:"";s:12:"enableDevLog";s:1:"0";s:10:"moduleIcon";s:1:"0";}',
- 'rsaauth' => 'a:1:{s:18:"temporaryDirectory";s:0:"";}',
- 'rte_ckeditor' => 'a:1:{s:15:"ckeditorVersion";s:1:"1";}',
- 'saltedpasswords' => 'a:2:{s:3:"BE.";a:4:{s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt";s:11:"forceSalted";i:0;s:15:"onlyAuthService";i:0;s:12:"updatePasswd";i:1;}s:3:"FE.";a:5:{s:7:"enabled";i:1;s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\PhpassSalt";s:11:"forceSalted";i:0;s:15:"onlyAuthService";i:0;s:12:"updatePasswd";i:1;}}',
- 'scheduler' => 'a:4:{s:11:"maxLifetime";s:4:"1440";s:11:"enableBELog";s:1:"1";s:15:"showSampleTasks";s:1:"1";s:11:"useAtdaemon";s:1:"0";}',
- 'solr' => 'a:0:{}',
- 't3olayout' => 'a:0:{}',
- 'ter' => 'a:1:{s:13:"repositoryDir";s:28:"/var/www/html/fileadmin/ter/";}',
- 'ter_fe2' => 'a:0:{}',
- 'ter_layout' => 'a:0:{}',
+ 'gridelements' => 'a:6:{s:20:"additionalStylesheet";s:0:"";s:19:"nestingInListModule";s:1:"0";s:26:"overlayShortcutTranslation";s:1:"0";s:19:"disableDragInWizard";s:1:"0";s:25:"disableCopyFromPageButton";s:1:"0";s:38:"disableAutomaticUnusedColumnCorrection";s:1:"0";}',
+ 'ig_ldap_sso_auth' => 'a:18:{s:21:"throwExceptionAtLogin";s:1:"1";s:22:"forceLowerCaseUsername";s:1:"0";s:23:"useExtConfConfiguration";s:1:"0";s:26:"enableBELDAPAuthentication";s:1:"0";s:17:"TYPO3BEGroupExist";s:1:"0";s:16:"TYPO3BEUserExist";s:1:"0";s:10:"BEfailsafe";s:1:"0";s:27:"TYPO3BEGroupsNotSynchronize";s:1:"0";s:12:"keepBEGroups";s:1:"0";s:11:"enableBESSO";s:1:"0";s:26:"enableFELDAPAuthentication";s:1:"0";s:31:"TYPO3FEDeleteUserIfNoLDAPGroups";s:1:"0";s:32:"TYPO3FEDeleteUserIfNoTYPO3Groups";s:1:"0";s:17:"TYPO3FEGroupExist";s:1:"0";s:16:"TYPO3FEUserExist";s:1:"0";s:27:"TYPO3FEGroupsNotSynchronize";s:1:"0";s:12:"keepFEGroups";s:1:"0";s:11:"enableFESSO";s:1:"0";}',
+ 'scheduler' => 'a:2:{s:11:"maxLifetime";s:4:"1440";s:15:"showSampleTasks";s:1:"1";}',
+ 'solr' => 'a:5:{s:35:"useConfigurationFromClosestTemplate";s:1:"0";s:43:"useConfigurationTrackRecordsOutsideSiteroot";s:1:"1";s:29:"useConfigurationMonitorTables";s:0:"";s:27:"allowSelfSignedCertificates";s:1:"0";s:19:"allowLegacySiteMode";s:1:"0";}',
+ 'ter' => 'a:1:{s:13:"repositoryDir";s:0:"";}',
+ ],
+ ],
+ 'EXTCONF' => [
+ 'helhum-typo3-console' => [
+ 'initialUpgradeDone' => '9.5',
+ ],
+ ],
+ 'EXTENSIONS' => [
+ 'backend' => [
+ 'backendFavicon' => '',
+ 'backendLogo' => '',
+ 'loginBackgroundImage' => '',
+ 'loginFootnote' => '',
+ 'loginHighlightColor' => '',
+ 'loginLogo' => '',
+ ],
+ 'extensionmanager' => [
+ 'automaticInstallation' => '1',
+ 'offlineMode' => '0',
+ ],
+ 'gridelements' => [
+ 'additionalStylesheet' => '',
+ 'disableAutomaticUnusedColumnCorrection' => '0',
+ 'disableCopyFromPageButton' => '0',
+ 'disableDragInWizard' => '0',
+ 'nestingInListModule' => '0',
+ 'overlayShortcutTranslation' => '0',
+ ],
+ 'ig_ldap_sso_auth' => [
+ 'BEfailsafe' => '0',
+ 'TYPO3BEGroupExist' => '0',
+ 'TYPO3BEGroupsNotSynchronize' => '0',
+ 'TYPO3BEUserExist' => '0',
+ 'TYPO3FEDeleteUserIfNoLDAPGroups' => '0',
+ 'TYPO3FEDeleteUserIfNoTYPO3Groups' => '0',
+ 'TYPO3FEGroupExist' => '0',
+ 'TYPO3FEGroupsNotSynchronize' => '0',
+ 'TYPO3FEUserExist' => '0',
+ 'enableBELDAPAuthentication' => '0',
+ 'enableBESSO' => '0',
+ 'enableFELDAPAuthentication' => '0',
+ 'enableFESSO' => '0',
+ 'forceLowerCaseUsername' => '0',
+ 'keepBEGroups' => '0',
+ 'keepFEGroups' => '0',
+ 'throwExceptionAtLogin' => '1',
+ 'useExtConfConfiguration' => '0',
+ ],
+ 'scheduler' => [
+ 'maxLifetime' => '1440',
+ 'showSampleTasks' => '1',
+ ],
+ 'solr' => [
+ 'allowLegacySiteMode' => '0',
+ 'allowSelfSignedCertificates' => '0',
+ 'useConfigurationFromClosestTemplate' => '0',
+ 'useConfigurationMonitorTables' => '',
+ 'useConfigurationTrackRecordsOutsideSiteroot' => '1',
+ ],
+ 'ter' => [
+ 'repositoryDir' => '',
],
],
'FE' => [
- 'cHashExcludedParameters' => 'fbclid',
+ 'cacheHash' => [
+ 'excludedParameters' => [
+ 'fbclid',
+ ],
+ ],
'debug' => true,
'loginSecurityLevel' => 'normal',
'pageNotFoundOnCHashError' => false,
@@ -49,7 +107,7 @@ return [
'processor' => 'ImageMagick',
'processor_allowTemporaryMasksAsPng' => false,
'processor_colorspace' => 'sRGB',
- 'processor_effects' => 1,
+ 'processor_effects' => true,
'processor_enabled' => 1,
'processor_path' => '/usr/bin/',
'processor_path_lzw' => '/usr/bin/',
@@ -75,13 +133,9 @@ return [
],
'devIPmask' => '*',
'displayErrors' => 1,
- 'enableDeprecationLog' => 'file',
'encryptionKey' => '52fd0fa7b7337befc0840fd8ad8fd8868fc9d98f60ea9b6e737ce732448e80eb35d2662bc15d04eb523171ec727c1dee',
- 'exceptionalErrors' => 28674,
- 'isInitialDatabaseImportDone' => true,
- 'isInitialInstallationInProgress' => false,
+ 'exceptionalErrors' => 12290,
'sitename' => 'Extension',
- 'sqlDebug' => 1,
'systemLogLevel' => 0,
],
];