OXDEV-7661 Split repositories by namespaces

Signed-off-by: Anton Fedurtsya <anton@fedurtsya.com>
OXID-eSales · Dec 6, 2023 · a4ce013 · a4ce013
1 parent 9579c49
commit a4ce013
Show file tree

Hide file tree

Showing 20 changed files with 25 additions and 30 deletions.
diff --git a/services.yaml b/services.yaml
@@ -1,5 +1,4 @@
 imports:
-  - { resource: src/Setting/services.yaml }
   - { resource: src/Shared/services.yaml }
   - { resource: src/Module/services.yaml }
   - { resource: src/Shop/services.yaml }

diff --git a/src/Setting/services.yaml b/src/Setting/services.yaml
diff --git a/.../Infrastructure/ShopSettingRepository.php → .../Infrastructure/ShopSettingRepository.php b/.../Infrastructure/ShopSettingRepository.php → .../Infrastructure/ShopSettingRepository.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure;
+namespace OxidEsales\GraphQL\ConfigurationAccess\Shop\Infrastructure;
 
 use Doctrine\DBAL\Result;
 use OxidEsales\EshopCommunity\Internal\Framework\Config\Dao\ShopConfigurationSettingDaoInterface;

diff --git a/...ucture/ShopSettingRepositoryInterface.php → ...ucture/ShopSettingRepositoryInterface.php b/...ucture/ShopSettingRepositoryInterface.php → ...ucture/ShopSettingRepositoryInterface.php
@@ -5,7 +5,7 @@
  * See LICENSE file for license details.
  */
 
-namespace OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure;
+namespace OxidEsales\GraphQL\ConfigurationAccess\Shop\Infrastructure;
 
 interface ShopSettingRepositoryInterface
 {

diff --git a/src/Shop/Service/ShopSettingService.php b/src/Shop/Service/ShopSettingService.php
@@ -9,13 +9,13 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Shop\Service;
 
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ShopSettingRepositoryInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\BooleanSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\FloatSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\IntegerSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\SettingType;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\StringSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Service\CollectionEncodingServiceInterface;
+use OxidEsales\GraphQL\ConfigurationAccess\Shop\Infrastructure\ShopSettingRepositoryInterface;
 
 final class ShopSettingService implements ShopSettingServiceInterface
 {

diff --git a/src/Shop/services.yaml b/src/Shop/services.yaml
@@ -9,3 +9,6 @@ services:
 
   OxidEsales\GraphQL\ConfigurationAccess\Shop\Service\ShopSettingServiceInterface:
     class: OxidEsales\GraphQL\ConfigurationAccess\Shop\Service\ShopSettingService
+
+  OxidEsales\GraphQL\ConfigurationAccess\Shop\Infrastructure\ShopSettingRepositoryInterface:
+    class: OxidEsales\GraphQL\ConfigurationAccess\Shop\Infrastructure\ShopSettingRepository
diff --git a/...Infrastructure/ThemeSettingRepository.php → ...Infrastructure/ThemeSettingRepository.php b/...Infrastructure/ThemeSettingRepository.php → ...Infrastructure/ThemeSettingRepository.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure;
+namespace OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure;
 
 use Doctrine\DBAL\ForwardCompatibility\Result;
 use OxidEsales\EshopCommunity\Internal\Framework\Config\Utility\ShopSettingEncoderInterface;

diff --git a/...cture/ThemeSettingRepositoryInterface.php → ...cture/ThemeSettingRepositoryInterface.php b/...cture/ThemeSettingRepositoryInterface.php → ...cture/ThemeSettingRepositoryInterface.php
@@ -5,7 +5,7 @@
  * See LICENSE file for license details.
  */
 
-namespace OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure;
+namespace OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure;
 
 interface ThemeSettingRepositoryInterface
 {

diff --git a/src/Theme/Service/ThemeSettingService.php b/src/Theme/Service/ThemeSettingService.php
@@ -9,14 +9,14 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Theme\Service;
 
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ThemeSettingRepositoryInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\BooleanSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\FloatSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\IntegerSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\SettingType;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\StringSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Exception\InvalidCollectionException;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Service\CollectionEncodingServiceInterface;
+use OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\ThemeSettingRepositoryInterface;
 
 final class ThemeSettingService implements ThemeSettingServiceInterface
 {

diff --git a/src/Theme/services.yaml b/src/Theme/services.yaml
@@ -9,3 +9,6 @@ services:
 
   OxidEsales\GraphQL\ConfigurationAccess\Theme\Service\ThemeSettingServiceInterface:
     class: OxidEsales\GraphQL\ConfigurationAccess\Theme\Service\ThemeSettingService
+
+  OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\ThemeSettingRepositoryInterface:
+    class: OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\ThemeSettingRepository
diff --git a/tests/Integration/Infrastructure/ShopSettingRepositoryTest.php b/tests/Integration/Infrastructure/ShopSettingRepositoryTest.php
@@ -15,11 +15,11 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Database\QueryBuilderFactoryInterface;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;
 use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ShopSettingRepository;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Exception\NoSettingsFoundForShopException;
+use OxidEsales\GraphQL\ConfigurationAccess\Shop\Infrastructure\ShopSettingRepository;
 
 /**
- * @covers \OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ShopSettingRepository
+ * @covers \OxidEsales\GraphQL\ConfigurationAccess\Shop\Infrastructure\ShopSettingRepository
  */
 class ShopSettingRepositoryTest extends IntegrationTestCase
 {

diff --git a/tests/Integration/Infrastructure/ThemeSettingRepositoryTest.php b/tests/Integration/Infrastructure/ThemeSettingRepositoryTest.php
@@ -14,12 +14,12 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Theme\Event\ThemeSettingChangedEvent;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;
 use OxidEsales\EshopCommunity\Tests\Integration\IntegrationTestCase;
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ThemeSettingRepository;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Enum\FieldType;
+use OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\ThemeSettingRepository;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 /**
- * @covers \OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ThemeSettingRepository
+ * @covers \OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\ThemeSettingRepository
  */
 class ThemeSettingRepositoryTest extends IntegrationTestCase
 {

diff --git a/tests/Unit/Infrastructure/AbstractShopSettingRepositoryTestCase.php b/tests/Unit/Infrastructure/AbstractShopSettingRepositoryTestCase.php
@@ -13,8 +13,8 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Config\Utility\ShopSettingEncoderInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Database\QueryBuilderFactoryInterface;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ShopSettingRepository;
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ShopSettingRepositoryInterface;
+use OxidEsales\GraphQL\ConfigurationAccess\Shop\Infrastructure\ShopSettingRepository;
+use OxidEsales\GraphQL\ConfigurationAccess\Shop\Infrastructure\ShopSettingRepositoryInterface;
 
 abstract class AbstractShopSettingRepositoryTestCase extends AbstractDatabaseSettingsRepositoryTestCase
 {

diff --git a/tests/Unit/Infrastructure/AbstractThemeSettingRepositoryTestCase.php b/tests/Unit/Infrastructure/AbstractThemeSettingRepositoryTestCase.php
@@ -12,7 +12,7 @@
 use OxidEsales\EshopCommunity\Internal\Framework\Config\Utility\ShopSettingEncoderInterface;
 use OxidEsales\EshopCommunity\Internal\Framework\Database\QueryBuilderFactoryInterface;
 use OxidEsales\EshopCommunity\Internal\Transition\Utility\BasicContextInterface;
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ThemeSettingRepository;
+use OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\ThemeSettingRepository;
 use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 

diff --git a/tests/Unit/Infrastructure/ShopSettingRepositoryGettersTest.php b/tests/Unit/Infrastructure/ShopSettingRepositoryGettersTest.php
@@ -14,7 +14,7 @@
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Exception\WrongSettingTypeException;
 
 /**
- * @covers \OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ShopSettingRepository
+ * @covers \OxidEsales\GraphQL\ConfigurationAccess\Shop\Infrastructure\ShopSettingRepository
  */
 class ShopSettingRepositoryGettersTest extends AbstractShopSettingRepositoryTestCase
 {

diff --git a/tests/Unit/Infrastructure/ShopSettingRepositorySettersTest.php b/tests/Unit/Infrastructure/ShopSettingRepositorySettersTest.php
@@ -15,7 +15,7 @@
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Exception\WrongSettingTypeException;
 
 /**
- * @covers \OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ShopSettingRepository
+ * @covers \OxidEsales\GraphQL\ConfigurationAccess\Shop\Infrastructure\ShopSettingRepository
  */
 class ShopSettingRepositorySettersTest extends AbstractShopSettingRepositoryTestCase
 {

diff --git a/tests/Unit/Infrastructure/ThemeSettingRepositoryGettersTest.php b/tests/Unit/Infrastructure/ThemeSettingRepositoryGettersTest.php
@@ -16,7 +16,7 @@
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Exception\NoSettingsFoundForThemeException;
 
 /**
- * @covers \OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ThemeSettingRepository
+ * @covers \OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\ThemeSettingRepository
  */
 class ThemeSettingRepositoryGettersTest extends AbstractThemeSettingRepositoryTestCase
 {

diff --git a/tests/Unit/Infrastructure/ThemeSettingRepositorySettersTest.php b/tests/Unit/Infrastructure/ThemeSettingRepositorySettersTest.php
@@ -12,7 +12,7 @@
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Exception\NoSettingsFoundForThemeException;
 
 /**
- * @covers \OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ThemeSettingRepository
+ * @covers \OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\ThemeSettingRepository
  */
 class ThemeSettingRepositorySettersTest extends AbstractThemeSettingRepositoryTestCase
 {

diff --git a/tests/Unit/Shop/Service/ShopSettingServiceTest.php b/tests/Unit/Shop/Service/ShopSettingServiceTest.php
@@ -9,13 +9,13 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\Shop\Service;
 
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ShopSettingRepositoryInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\BooleanSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\FloatSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\IntegerSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\StringSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Enum\FieldType;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Service\CollectionEncodingServiceInterface;
+use OxidEsales\GraphQL\ConfigurationAccess\Shop\Infrastructure\ShopSettingRepositoryInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Shop\Service\ShopSettingService;
 use OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\UnitTestCase;
 

diff --git a/tests/Unit/Theme/Service/ThemeSettingServiceTest.php b/tests/Unit/Theme/Service/ThemeSettingServiceTest.php
@@ -9,7 +9,6 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\Theme\Service;
 
-use OxidEsales\GraphQL\ConfigurationAccess\Setting\Infrastructure\ThemeSettingRepositoryInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\BooleanSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\FloatSetting;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\DataType\IntegerSetting;
@@ -18,6 +17,7 @@
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Exception\InvalidCollectionException;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Service\CollectionEncodingServiceInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\UnitTestCase;
+use OxidEsales\GraphQL\ConfigurationAccess\Theme\Infrastructure\ThemeSettingRepositoryInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Theme\Service\ThemeSettingService;
 use PHPUnit\Framework\MockObject\MockObject;