OXDEV-7557 Improve readability and fix some phpstan reported issues

Signed-off-by: Anton Fedurtsya <[email protected]>
OXID-eSales · Nov 14, 2023 · 04ea2f1 · 04ea2f1
1 parent 0aa210a
commit 04ea2f1
Show file tree

Hide file tree

Showing 7 changed files with 69 additions and 11 deletions.
diff --git a/src/Setting/Infrastructure/ModuleSettingRepositoryInterface.php b/src/Setting/Infrastructure/ModuleSettingRepositoryInterface.php
@@ -12,14 +12,23 @@
 interface ModuleSettingRepositoryInterface
 {
     public function getIntegerSetting(ID $name, string $moduleId): IntegerSetting;
+
     public function getFloatSetting(ID $name, string $moduleId): FloatSetting;
+
     public function getBooleanSetting(ID $name, string $moduleId): BooleanSetting;
+
     public function getStringSetting(ID $name, string $moduleId): StringSetting;
+
     public function getCollectionSetting(ID $name, string $moduleId): StringSetting;
+
     public function saveIntegerSetting(ID $name, int $value, string $moduleId): void;
+
     public function saveFloatSetting(ID $name, float $value, string $moduleId): void;
+
     public function saveBooleanSetting(ID $name, bool $value, string $moduleId): void;
+
     public function saveStringSetting(ID $name, string $value, string $moduleId): void;
+
     public function saveCollectionSetting(ID $name, array $value, string $moduleId): void;
 
     /**

diff --git a/src/Setting/Infrastructure/ShopSettingRepositoryInterface.php b/src/Setting/Infrastructure/ShopSettingRepositoryInterface.php
@@ -2,21 +2,27 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure;
 
+use OxidEsales\GraphQL\ConfigurationAccess\Setting\Enum\FieldType;
 use TheCodingMachine\GraphQLite\Types\ID;
 
 interface ShopSettingRepositoryInterface
 {
     public function getInteger(ID $name): int;
+
     public function getFloat(ID $name): float;
+
     public function getBoolean(ID $name): bool;
+
     public function getString(ID $name): string;
+
     public function getSelect(ID $name): string;
+
     public function getCollection(ID $name): array;
+
     public function getAssocCollection(ID $name): array;
+
     /**
-     * @return [
-     * string $name => FieldType $type
-     * ]
+     * @return array<string, FieldType>
      */
     public function getSettingsList(): array;
 }
diff --git a/src/Setting/Infrastructure/ThemeSettingRepositoryInterface.php b/src/Setting/Infrastructure/ThemeSettingRepositoryInterface.php
@@ -2,28 +2,41 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure;
 
+use OxidEsales\GraphQL\ConfigurationAccess\Setting\Enum\FieldType;
 use TheCodingMachine\GraphQLite\Types\ID;
 
 interface ThemeSettingRepositoryInterface
 {
     public function getInteger(ID $name, string $themeId): int;
+
     public function getFloat(ID $name, string $themeId): float;
+
     public function getBoolean(ID $name, string $themeId): bool;
+
     public function getString(ID $name, string $themeId): string;
+
     public function getSelect(ID $name, string $themeId): string;
+
     public function getCollection(ID $name, string $themeId): array;
+
     public function getAssocCollection(ID $name, string $themeId): array;
+
     /**
-     * @return [
-     * string $name => FieldType $type
-     * ]
+     * @return array<string, FieldType>
      */
     public function getSettingsList(string $themeId): array;
+
     public function saveIntegerSetting(ID $name, int $value, string $themeId): void;
+
     public function saveFloatSetting(ID $name, float $value, string $themeId): void;
+
     public function saveBooleanSetting(ID $name, bool $value, string $themeId): void;
+
     public function saveStringSetting(ID $name, string $value, string $themeId): void;
+
     public function saveSelectSetting(ID $name, string $value, string $themeId): void;
+
     public function saveCollectionSetting(ID $name, array $value, string $themeId): void;
+
     public function saveAssocCollectionSetting(ID $name, array $value, string $themeId): void;
 }
diff --git a/src/Setting/Service/ModuleSettingService.php b/src/Setting/Service/ModuleSettingService.php
@@ -26,27 +26,27 @@ public function __construct(
     ) {
     }
 
-    public function getIntegerSetting(ID $name, $moduleId): IntegerSetting
+    public function getIntegerSetting(ID $name, string $moduleId): IntegerSetting
     {
         return $this->moduleSettingRepository->getIntegerSetting($name, $moduleId);
     }
 
-    public function getFloatSetting(ID $name, $moduleId): FloatSetting
+    public function getFloatSetting(ID $name, string $moduleId): FloatSetting
     {
         return $this->moduleSettingRepository->getFloatSetting($name, $moduleId);
     }
 
-    public function getBooleanSetting(ID $name, $moduleId): BooleanSetting
+    public function getBooleanSetting(ID $name, string $moduleId): BooleanSetting
     {
         return $this->moduleSettingRepository->getBooleanSetting($name, $moduleId);
     }
 
-    public function getStringSetting(ID $name, $moduleId): StringSetting
+    public function getStringSetting(ID $name, string $moduleId): StringSetting
     {
         return $this->moduleSettingRepository->getStringSetting($name, $moduleId);
     }
 
-    public function getCollectionSetting(ID $name, $moduleId): StringSetting
+    public function getCollectionSetting(ID $name, string $moduleId): StringSetting
     {
         return $this->moduleSettingRepository->getCollectionSetting($name, $moduleId);
     }

diff --git a/src/Setting/Service/ModuleSettingServiceInterface.php b/src/Setting/Service/ModuleSettingServiceInterface.php
@@ -12,14 +12,23 @@
 interface ModuleSettingServiceInterface
 {
     public function getIntegerSetting(ID $name, string $moduleId): IntegerSetting;
+
     public function getFloatSetting(ID $name, string $moduleId): FloatSetting;
+
     public function getBooleanSetting(ID $name, string $moduleId): BooleanSetting;
+
     public function getStringSetting(ID $name, string $moduleId): StringSetting;
+
     public function getCollectionSetting(ID $name, string $moduleId): StringSetting;
+
     public function changeIntegerSetting(ID $name, int $value, string $moduleId): IntegerSetting;
+
     public function changeFloatSetting(ID $name, float $value, string $moduleId): FloatSetting;
+
     public function changeBooleanSetting(ID $name, bool $value, string $moduleId): BooleanSetting;
+
     public function changeStringSetting(ID $name, string $value, string $moduleId): StringSetting;
+
     public function changeCollectionSetting(ID $name, string $value, string $moduleId): StringSetting;
 
     /**

diff --git a/src/Setting/Service/ShopSettingServiceInterface.php b/src/Setting/Service/ShopSettingServiceInterface.php
@@ -12,12 +12,19 @@
 interface ShopSettingServiceInterface
 {
     public function getIntegerSetting(ID $name): IntegerSetting;
+
     public function getFloatSetting(ID $name): FloatSetting;
+
     public function getBooleanSetting(ID $name): BooleanSetting;
+
     public function getStringSetting(ID $name): StringSetting;
+
     public function getSelectSetting(ID $name): StringSetting;
+
     public function getCollectionSetting(ID $name): StringSetting;
+
     public function getAssocCollectionSetting(ID $name): StringSetting;
+
     /**
      * @return SettingType[]
      */

diff --git a/src/Setting/Service/ThemeSettingServiceInterface.php b/src/Setting/Service/ThemeSettingServiceInterface.php
@@ -12,21 +12,35 @@
 interface ThemeSettingServiceInterface
 {
     public function getIntegerSetting(ID $name, string $themeId): IntegerSetting;
+
     public function getFloatSetting(ID $name, string $themeId): FloatSetting;
+
     public function getBooleanSetting(ID $name, string $themeId): BooleanSetting;
+
     public function getStringSetting(ID $name, string $themeId): StringSetting;
+
     public function getSelectSetting(ID $name, string $themeId): StringSetting;
+
     public function getCollectionSetting(ID $name, string $themeId): StringSetting;
+
     public function getAssocCollectionSetting(ID $name, string $themeId): StringSetting;
+
     /**
      * @return SettingType[]
      */
     public function getSettingsList(string $themeId): array;
+
     public function changeIntegerSetting(ID $name, int $value, string $themeId): IntegerSetting;
+
     public function changeFloatSetting(ID $name, float $value, string $themeId): FloatSetting;
+
     public function changeBooleanSetting(ID $name, bool $value, string $themeId): BooleanSetting;
+
     public function changeStringSetting(ID $name, string $value, string $themeId): StringSetting;
+
     public function changeSelectSetting(ID $name, string $value, string $themeId): StringSetting;
+
     public function changeCollectionSetting(ID $name, string $value, string $themeId): StringSetting;
+
     public function changeAssocCollectionSetting(ID $name, string $value, string $themeId): StringSetting;
 }