From 637439c072f71af2ba719919684b5f9f939a039c Mon Sep 17 00:00:00 2001
From: Philipp Nowinski <philipp@sgalinski.de>
Date: Wed, 23 Jan 2019 13:03:45 +0100
Subject: [PATCH] [TASK] cleanup
---
Classes/Service/ConfigurationService.php | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/Classes/Service/ConfigurationService.php b/Classes/Service/ConfigurationService.php
index bdf65ee..6d97ba2 100644
--- a/Classes/Service/ConfigurationService.php
+++ b/Classes/Service/ConfigurationService.php
@@ -51,14 +51,16 @@ class ConfigurationService implements SingletonInterface {
* @throws InvalidConfigurationTypeException
* @return string
*/
- public function getConfiguration($key, $settings): string {
+ public function getConfiguration($key, array $settings): string {
if (!$this->tsConfig) {
$configurationManager = GeneralUtility::makeInstance(ConfigurationManager::class);
$this->tsConfig = $configurationManager->getConfiguration(ConfigurationManagerInterface::CONFIGURATION_TYPE_FULL_TYPOSCRIPT);
}
if ($settings[$key] === 'typoscript') {
- return $this->tsConfig['plugin.']['tx_sgnews.']['settings.'][$key];
+ $setting = $this->tsConfig['plugin.']['tx_sgnews.']['settings.'][$key];
+ } else {
+ $setting = $settings[$key];
}
- return $settings[$key];
+ return $setting;
}
}
--
GitLab