From 082e9c6940c23f64e9eca7d0eccfd2adaeabbd9f Mon Sep 17 00:00:00 2001 From: Felix Hahn Date: Thu, 23 Nov 2023 23:07:57 +0100 Subject: [PATCH] code style --- models/AdvancedSettings.php | 4 ++-- models/ColorSettings.php | 4 ++-- models/Config.php | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/models/AdvancedSettings.php b/models/AdvancedSettings.php index dc4a465..6d9a16b 100644 --- a/models/AdvancedSettings.php +++ b/models/AdvancedSettings.php @@ -42,7 +42,7 @@ public function rules() ]; } - public function isValidJSON($attribute, $params, $validator) + public function isValidJSON(string $attribute, $params, $validator) { if(json_decode($this->$attribute) === null) { $this->addError($attribute, Yii::t('FlexThemeModule.admin', 'JSON could not be converted!')); @@ -58,7 +58,7 @@ public function save() return true; } - protected function getSettingsArray() + protected function getSettingsArray(): array { $config = []; $colors = []; diff --git a/models/ColorSettings.php b/models/ColorSettings.php index 9fcd0df..6c00ada 100644 --- a/models/ColorSettings.php +++ b/models/ColorSettings.php @@ -88,7 +88,7 @@ class ColorSettings extends \yii\base\Model public $warning__lighten__40; public $warning__lighten__5; - public function getColors() + public function getColors(): array { $settings = self::getSettings(); $base_theme = ThemeHelper::getThemeByName(self::BASE_THEME); @@ -147,7 +147,7 @@ public function rules() ]; } - public function validateHexColor($attribute, $params, $validator) + public function validateHexColor(string $attribute, $params, $validator) { if (!preg_match("/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/", $this->$attribute)) { $this->addError($attribute, Yii::t('FlexThemeModule.admin', 'Invalid Format') . '. ' . Yii::t('FlexThemeModule.admin', 'Must be a color in hexadecimal format, like "#00aaff" or "#FA0"')); diff --git a/models/Config.php b/models/Config.php index c45b00d..ff65e9d 100644 --- a/models/Config.php +++ b/models/Config.php @@ -26,8 +26,8 @@ class Config extends \yii\base\Model public $showTopicMenu; public $showUploadAsButtons; - public static function getSetting(string $setting_name) { - + public static function getSetting(string $setting_name): string + { // Note: return can be empty return Yii::$app->getModule('flex-theme')->settings->get($setting_name); } @@ -74,7 +74,7 @@ public function rules() { ]; } - public function validateHexColor($attribute, $params, $validator) + public function validateHexColor(string $attribute, $params, $validator) { if (!preg_match("/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/", $this->$attribute)) { $this->addError($attribute, Yii::t('FlexThemeModule.admin', 'Invalid Format') . '. ' . Yii::t('FlexThemeModule.admin', 'Must be a color in hexadecimal format, like "#00aaff" or "#FA0"'));