From a07175e24b9cd0fbbdb1061efe675844508cdbe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=B6ffler?= Date: Thu, 8 Aug 2019 14:28:55 +0200 Subject: [PATCH] Change deprecated code and fix dependencies --- composer.lock | 10 +-- .../TCA/tx_ter_extensiondetails.php | 2 +- .../TCA/tx_ter_extensionkeys.php | 2 +- .../TCA/tx_ter_extensionmembers.php | 2 +- .../TCA/tx_ter_extensionqueue.php | 2 +- .../Configuration/TCA/tx_ter_extensions.php | 2 +- extensions/ter/ext_emconf.php | 4 +- extensions/ter_fe2/composer.json | 3 +- extensions/ter_fe2/ext_emconf.php | 13 +-- private/typo3conf/LocalConfiguration.php | 88 ++++++++++++++----- 10 files changed, 84 insertions(+), 44 deletions(-) diff --git a/composer.lock b/composer.lock index 3248caba..524965e2 100644 --- a/composer.lock +++ b/composer.lock @@ -3113,11 +3113,11 @@ }, { "name": "t3o/gitlab_api", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://git-t3o.typo3.org/t3o/gitlab_api.git", - "reference": "89d77f24e1f5a19823e64db7b0346acda9476775" + "reference": "4eba61d5fc46bce200f44fabff25e800d69e9611" }, "replace": { "gitlab_api": "self.version", @@ -3132,7 +3132,7 @@ "keywords": [ "TYPO3 CMS" ], - "time": "2018-04-11T09:12:14+00:00" + "time": "2019-08-08T12:20:59+00:00" }, { "name": "t3o/t3olayout", @@ -3140,7 +3140,7 @@ "source": { "type": "git", "url": "https://git-t3o.typo3.org/t3o/t3olayout.git", - "reference": "d8a0598bd4e35a843888ec6dcf3add85796be2fd" + "reference": "654d258aca85468439fb797cabd3852fe0768958" }, "require": { "causal/ig_ldap_sso_auth": "^3.4", @@ -3189,7 +3189,7 @@ "keywords": [ "TYPO3 CMS" ], - "time": "2019-08-02T21:41:34+00:00" + "time": "2019-08-08T12:24:44+00:00" }, { "name": "t3o/ter-frontend", diff --git a/extensions/ter/Configuration/TCA/tx_ter_extensiondetails.php b/extensions/ter/Configuration/TCA/tx_ter_extensiondetails.php index 788028b2..24025ed7 100644 --- a/extensions/ter/Configuration/TCA/tx_ter_extensiondetails.php +++ b/extensions/ter/Configuration/TCA/tx_ter_extensiondetails.php @@ -19,7 +19,7 @@ return [ 'label_userFunc' => 'EXT:ter/class.tx_ter_tcaLabel.php:tx_ter_tcaLabel->getExtensionKey', 'default_sortby' => 'ORDER BY extensionuid', 'title' => 'LLL:EXT:ter/locallang_tca.xml:tx_ter_extensiondetails', - 'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($extensionKey) . 'tx_ter_extensiondetails.gif', + 'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($extensionKey) . 'tx_ter_extensiondetails.gif', 'dividers2tabs' => true, ], 'interface' => [ diff --git a/extensions/ter/Configuration/TCA/tx_ter_extensionkeys.php b/extensions/ter/Configuration/TCA/tx_ter_extensionkeys.php index 575a5013..2c0758ea 100644 --- a/extensions/ter/Configuration/TCA/tx_ter_extensionkeys.php +++ b/extensions/ter/Configuration/TCA/tx_ter_extensionkeys.php @@ -20,7 +20,7 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'title' => 'LLL:EXT:ter/locallang_tca.xml:tx_ter_extensionkeys', - 'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($extensionKey) . 'tx_ter_extensionkeys.gif', + 'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($extensionKey) . 'tx_ter_extensionkeys.gif', 'dividers2tabs' => true, ], 'interface' => [ diff --git a/extensions/ter/Configuration/TCA/tx_ter_extensionmembers.php b/extensions/ter/Configuration/TCA/tx_ter_extensionmembers.php index 63c6b743..2ede46c9 100644 --- a/extensions/ter/Configuration/TCA/tx_ter_extensionmembers.php +++ b/extensions/ter/Configuration/TCA/tx_ter_extensionmembers.php @@ -18,7 +18,7 @@ return [ 'label' => 'extensionkey', 'default_sortby' => 'ORDER BY extensionkey', 'title' => 'LLL:EXT:ter/locallang_tca.xml:tx_ter_extensionmembers', - 'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($extensionKey) . 'tx_ter_extensionmembers.gif', + 'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($extensionKey) . 'tx_ter_extensionmembers.gif', 'dividers2tabs' => true, ], 'interface' => [ diff --git a/extensions/ter/Configuration/TCA/tx_ter_extensionqueue.php b/extensions/ter/Configuration/TCA/tx_ter_extensionqueue.php index 2f2139d9..88baee08 100644 --- a/extensions/ter/Configuration/TCA/tx_ter_extensionqueue.php +++ b/extensions/ter/Configuration/TCA/tx_ter_extensionqueue.php @@ -21,7 +21,7 @@ return [ 'tstamp' => 'tstamp', 'delete' => 'deleted', 'title' => 'LLL:EXT:ter/locallang_tca.xml:tx_ter_extensionqueue', - 'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($extensionKey) . 'tx_ter_extensionqueue.gif', + 'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($extensionKey) . 'tx_ter_extensionqueue.gif', 'dividers2tabs' => true, ], 'interface' => [ diff --git a/extensions/ter/Configuration/TCA/tx_ter_extensions.php b/extensions/ter/Configuration/TCA/tx_ter_extensions.php index 258eb1d9..3c84f596 100644 --- a/extensions/ter/Configuration/TCA/tx_ter_extensions.php +++ b/extensions/ter/Configuration/TCA/tx_ter_extensions.php @@ -20,7 +20,7 @@ return [ 'tstamp' => 'tstamp', 'crdate' => 'crdate', 'title' => 'LLL:EXT:ter/locallang_tca.xml:tx_ter_extensions', - 'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($extensionKey) . 'tx_ter_extensions.gif', + 'iconfile' => \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($extensionKey) . 'tx_ter_extensions.gif', 'dividers2tabs' => true, ], 'interface' => [ diff --git a/extensions/ter/ext_emconf.php b/extensions/ter/ext_emconf.php index a6b6dd04..42cb4826 100755 --- a/extensions/ter/ext_emconf.php +++ b/extensions/ter/ext_emconf.php @@ -28,9 +28,7 @@ $EM_CONF[$_EXTKEY] = [ 'author_company' => 'TYPO3 Association', 'version' => '2.0.9', 'constraints' => [ - 'depends' => [ - 'saltedpasswords' => '', - ], + 'depends' => [], 'conflicts' => [], 'suggests' => [], ], diff --git a/extensions/ter_fe2/composer.json b/extensions/ter_fe2/composer.json index d9c67d83..c6965e6f 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 || ^9.5" + "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 67e1b671..2753bd95 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/private/typo3conf/LocalConfiguration.php b/private/typo3conf/LocalConfiguration.php index d75e5b91..91ba22b1 100644 --- a/private/typo3conf/LocalConfiguration.php +++ b/private/typo3conf/LocalConfiguration.php @@ -21,24 +21,76 @@ 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:4:{s:35:"useConfigurationFromClosestTemplate";s:1:"0";s:43:"useConfigurationTrackRecordsOutsideSiteroot";s:1:"1";s:29:"useConfigurationMonitorTables";s:0:"";s:27:"allowSelfSignedCertificates";s:1:"0";}', + 'ter' => 'a:1:{s:13:"repositoryDir";s:0:"";}', + ], + ], + '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' => [ + 'allowSelfSignedCertificates' => '0', + 'useConfigurationFromClosestTemplate' => '0', + 'useConfigurationMonitorTables' => '', + 'useConfigurationTrackRecordsOutsideSiteroot' => '1', + ], + 'ter' => [ + 'repositoryDir' => '', ], ], 'FE' => [ - 'cHashExcludedParameters' => 'fbclid', + 'cacheHash' => [ + 'excludedParameters' => [ + 'fbclid', + ], + ], 'debug' => true, 'loginSecurityLevel' => 'normal', 'pageNotFoundOnCHashError' => false, @@ -49,7 +101,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 +127,9 @@ return [ ], 'devIPmask' => '*', 'displayErrors' => 1, - 'enableDeprecationLog' => 'file', 'encryptionKey' => '52fd0fa7b7337befc0840fd8ad8fd8868fc9d98f60ea9b6e737ce732448e80eb35d2662bc15d04eb523171ec727c1dee', - 'exceptionalErrors' => 28674, - 'isInitialDatabaseImportDone' => true, - 'isInitialInstallationInProgress' => false, + 'exceptionalErrors' => 12290, 'sitename' => 'Extension', - 'sqlDebug' => 1, 'systemLogLevel' => 0, ], ]; -- GitLab