diff --git a/typo3/sysext/core/Configuration/DefaultConfiguration.php b/typo3/sysext/core/Configuration/DefaultConfiguration.php index 818ff56f36961a0dc0b8d15d314620763f6e8db3..2eb7f92b31788cf735f445cc3f4e422dd42fb82e 100644 --- a/typo3/sysext/core/Configuration/DefaultConfiguration.php +++ b/typo3/sysext/core/Configuration/DefaultConfiguration.php @@ -87,7 +87,6 @@ return [ 'mediafile_ext' => 'gif,jpg,jpeg,bmp,png,pdf,svg,ai,mp3,wav,mp4,ogg,flac,opus,webm,youtube,vimeo', 'binPath' => '', 'binSetup' => '', - 'setDBinit' => '', 'setMemoryLimit' => 0, 'phpTimeZone' => '', 'systemLog' => false, diff --git a/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml b/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml index 0bfe8bd8d2840d04439d0984902c5f91ad2a26f7..66f1dede20a9d275d405151cfe064ac9f0d9bc1a 100644 --- a/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml +++ b/typo3/sysext/core/Configuration/DefaultConfigurationDescription.yaml @@ -135,9 +135,6 @@ SYS: binSetup: type: multiline description: 'List of programs (separated by newline or comma). By default programs will be searched in default paths and the special paths defined by <code>binPath</code>. When PHP has openbasedir enabled the programs can not be found and have to be configured here. Example: <code>perl=/usr/bin/perl,unzip=/usr/local/bin/unzip</code>' - setDBinit: - type: multiline - description: 'These commands are executed after the database connection was established. Hint: The previous default "SET NAMES utf8;" is not required any more and will be removed automatically if set!' setMemoryLimit: type: int description: 'Integer: memory_limit in MB: If more than 16, TYPO3 will try to use ini_set() to set the memory limit of PHP to the value. This works only if the function ini_set() is not disabled by your sysadmin.' diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-82421-DroppedOldDBRelatedConfigurationOptions.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-82421-DroppedOldDBRelatedConfigurationOptions.rst index 02c1a261750ea91999d6fedea3f3502bb71b1fa0..d955f74dcb8bbb97a959bc22eb2541c2b412d7ab 100644 --- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-82421-DroppedOldDBRelatedConfigurationOptions.rst +++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-82421-DroppedOldDBRelatedConfigurationOptions.rst @@ -13,6 +13,7 @@ Some configuration options related to pre-doctrine era have been removed from :php:`$GLOBALS['TYPO3_CONF_VARS']`: * `SYS/sqlDebug` - Obsolete since version 8, no substitution +* `SYS/setDBinit` - Obsolete since core version 8 and migrated automatically * `SYS/no_pconnect` - Obsolete since core version 8 and migrated automatically * `SYS/dbClientCompress` - Obsolete since core version 8 and migrated automatically diff --git a/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php b/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php index 70648c6a592d8f9f3ad3a511fd10b362f1b8224f..a5f98827efb7d8ff61275a9d7980bddc3870dfb4 100644 --- a/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php +++ b/typo3/sysext/install/Classes/Service/SilentConfigurationUpgradeService.php @@ -105,6 +105,7 @@ class SilentConfigurationUpgradeService // #82421 'SYS/sqlDebug', 'SYS/no_pconnect', + 'SYS/setDBinit', 'SYS/dbClientCompress', // #82430 'SYS/syslogErrorReporting', diff --git a/typo3/sysext/install/Classes/SystemEnvironment/DatabasePlatform/MySqlCheck.php b/typo3/sysext/install/Classes/SystemEnvironment/DatabasePlatform/MySqlCheck.php index 7cccd7d32d4b3938891a01d2e52c8fc9c707ee89..40c0d37d3c85f2d32850864d4dde271cf9ab845f 100644 --- a/typo3/sysext/install/Classes/SystemEnvironment/DatabasePlatform/MySqlCheck.php +++ b/typo3/sysext/install/Classes/SystemEnvironment/DatabasePlatform/MySqlCheck.php @@ -89,7 +89,7 @@ class MySqlCheck implements CheckInterface . ' ' . implode(', ', $detectedIncompatibleSqlModes) . '.' . ' The listed modes are not compatible with TYPO3 CMS.' . ' You have to change that setting in your MySQL environment' - . ' or in $GLOBALS[\'TYPO3_CONF_VARS\'][\'SYS\'][\'setDBinit\']', + . ' or in $GLOBALS[\'TYPO3_CONF_VARS\'][\'DB\'][\'Connections\'][\'Default\'][\'initCommands\']', 'Incompatible SQL modes found!', FlashMessage::ERROR )); diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/ArrayDimensionMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/ArrayDimensionMatcher.php index 507e3de57b9e1a3a058bd63be07202a3ecdab4ea..ea6be089675113fc95f401d67e3cf6830f3bb9ef 100644 --- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/ArrayDimensionMatcher.php +++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/ArrayDimensionMatcher.php @@ -39,6 +39,11 @@ return [ 'Breaking-82421-DroppedOldDBRelatedConfigurationOptions.rst', ], ], + '$GLOBALS[\'TYPO3_CONF_VARS\'][\'SYS\'][\'setDBinit\']' => [ + 'restFiles' => [ + 'Breaking-82421-DroppedOldDBRelatedConfigurationOptions.rst', + ], + ], '$GLOBALS[\'TYPO3_CONF_VARS\'][\'SYS\'][\'no_pconnect\']' => [ 'restFiles' => [ 'Breaking-82421-DroppedOldDBRelatedConfigurationOptions.rst',