code style

felixhahnweilheim · Nov 23, 2023 · 082e9c6 · 082e9c6
1 parent c2cb691
commit 082e9c6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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"'));