diff --git a/extension/Classes/Core/Store/Config.php b/extension/Classes/Core/Store/Config.php index ad272eecfd5fa2e88631830c4276a64564ef948b..edf19b7e9b758c03a488922e9a6d9900bf434240 100644 --- a/extension/Classes/Core/Store/Config.php +++ b/extension/Classes/Core/Store/Config.php @@ -133,8 +133,7 @@ class Config { * @return array * @throws \UserReportException */ - private - static function getCustomVariable(array $config) { + private static function getCustomVariable(array $config) { for ($i = 1; $i <= 30; $i++) { if (isset($config['custom' . $i])) { @@ -163,8 +162,7 @@ class Config { * @throws \UserFormException * @throws \CodeException */ - private - static function writeConfig(array $config) { + private static function writeConfig(array $config) { $absoluteConf = Path::absoluteConf(); HelperFile::createPathRecursive($absoluteConf); HelperFile::file_put_contents(Path::join($absoluteConf, CONFIG_QFQ_JSON), json_encode($config, JSON_PRETTY_PRINT)); @@ -176,8 +174,7 @@ class Config { * @throws \CodeException * @throws \UserFormException */ - public - static function migrateConfigPhpToJson(): void { + public static function migrateConfigPhpToJson(): void { // read old config.qfq.php $absoluteOldConfigFilePath = Path::absoluteApp(Path::APP_TO_TYPO3_CONF, CONFIG_QFQ_PHP); if (!is_writeable($absoluteOldConfigFilePath)) { @@ -210,8 +207,7 @@ class Config { * @throws \UserFormException * @throws \UserReportException */ - private - static function readTypo3QfqConfig(): array { + private static function readTypo3QfqConfig(): array { $configT3qfq = array(); if (isset($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS'][EXT_KEY])) { // Typo3 version >=9 @@ -249,8 +245,7 @@ class Config { * @param array $db * @return mixed */ - private - static function getDbName(array $db) { + private static function getDbName(array $db) { // T3 7.x: $GLOBALS['TYPO3_CONF_VARS']['DB']['database'], T3 8.x: $GLOBALS['TYPO3_CONF_VARS']['DB']['Connections']['Default']['dbname'] return isset($db['database']) ? $db['database'] : $db['Connections']['Default']['dbname']; @@ -262,8 +257,7 @@ class Config { * @param array $config * @throws \UserFormException */ - private - static function checkDeprecated(array $config) { + private static function checkDeprecated(array $config) { foreach ([SYSTEM_VAR_ADD_BY_SQL] as $key) { @@ -286,8 +280,7 @@ class Config { * @throws \UserFormException * @throws \UserReportException */ - public - static function checkForAttack(array $config) { + public static function checkForAttack(array $config) { $attack = false; $key = ''; $reason = 'Problem: '; @@ -349,8 +342,7 @@ class Config { * @throws \UserFormException * @throws \UserReportException */ - public - static function attackDetectedExitNow(array $config = array(), $reason = '') { + public static function attackDetectedExitNow(array $config = array(), $reason = '') { if (count($config) == 0) { $config = self::getConfigArray(); @@ -402,8 +394,7 @@ class Config { * * @return array */ - public - static function setDefaults(array $config) { + public static function setDefaults(array $config) { $default = [ @@ -519,8 +510,7 @@ class Config { * * @return array */ - private - static function renameConfigElements(array $config) { + private static function renameConfigElements(array $config) { // oldname > newname $setting = [ @@ -562,8 +552,7 @@ class Config { * @param array $config * @return array */ - private - static function adjustConfig(array $config) { + private static function adjustConfig(array $config) { $config[SYSTEM_SHOW_DEBUG_INFO] = self::adjustConfigDebugInfoAuto($config[SYSTEM_SHOW_DEBUG_INFO], T3Info::beUserLoggedIn()); if ($config[SYSTEM_REPORT_MIN_PHP_VERSION] == SYSTEM_REPORT_MIN_PHP_VERSION_AUTO && T3Info::beUserLoggedIn()) { @@ -591,8 +580,7 @@ class Config { * @param $flag * @return string */ - public - static function adjustConfigDebugInfoAuto($value, $flag) { + public static function adjustConfigDebugInfoAuto($value, $flag) { // Check if SHOW_DEBUG_INFO contains 'auto'. Replace with appropriate. if (Support::findInSet(SYSTEM_SHOW_DEBUG_INFO_AUTO, $value) && $flag) { @@ -608,8 +596,7 @@ class Config { * @param array $config * @return array */ - private - static function setAutoConfigValue(array $config) { + private static function setAutoConfigValue(array $config) { $config[SYSTEM_DB_NAME_DATA] = $config['DB_' . $config[SYSTEM_DB_INDEX_DATA] . '_NAME'] ?? ''; $config[SYSTEM_DB_NAME_QFQ] = $config['DB_' . $config[SYSTEM_DB_INDEX_QFQ] . '_NAME'] ?? ''; @@ -624,8 +611,7 @@ class Config { * * @throws \UserFormException */ - private - static function checkMandatoryParameter(array $config) { + private static function checkMandatoryParameter(array $config) { // Check mandatory config vars. $names = array_merge([SYSTEM_SQL_LOG_MODE], @@ -643,8 +629,7 @@ class Config { * @param $index * @return array */ - private - static function dbCredentialName($index) { + private static function dbCredentialName($index) { $names = array(); $names[] = 'DB_' . $index . '_USER'; $names[] = 'DB_' . $index . '_SERVER';