OXDEV-8215 Moved LanguageWrapper into infrastructure

OXID-eSales · Jul 9, 2024 · e86e1d0 · e86e1d0
1 parent 1622769
commit e86e1d0
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 20 deletions.
diff --git a/src/Shared/Core/services.yaml b/src/Shared/Core/services.yaml
diff --git a/src/Shared/Core/LanguageWrapper.php → ...Shared/Infrastructure/LanguageWrapper.php b/src/Shared/Core/LanguageWrapper.php → ...Shared/Infrastructure/LanguageWrapper.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\GraphQL\ConfigurationAccess\Shared\Core;
+namespace OxidEsales\GraphQL\ConfigurationAccess\Shared\Infrastructure;
 
 use OxidEsales\Eshop\Core\Language;
 

diff --git a/src/Shared/Core/LanguageWrapperInterface.php → ...frastructure/LanguageWrapperInterface.php b/src/Shared/Core/LanguageWrapperInterface.php → ...frastructure/LanguageWrapperInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OxidEsales\GraphQL\ConfigurationAccess\Shared\Core;
+namespace OxidEsales\GraphQL\ConfigurationAccess\Shared\Infrastructure;
 
 interface LanguageWrapperInterface
 {

diff --git a/src/Shared/Infrastructure/services.yaml b/src/Shared/Infrastructure/services.yaml
@@ -0,0 +1,13 @@
+services:
+  _defaults:
+    public: false
+    autowire: true
+    bind:
+      OxidEsales\Eshop\Core\Language: '@=service("OxidEsales\\GraphQL\\ConfigurationAccess\\Shared\\Infrastructure\\Registry").getLang()'
+
+  OxidEsales\GraphQL\ConfigurationAccess\Shared\Infrastructure\Registry:
+    class: OxidEsales\Eshop\Core\Registry
+    public: true
+
+  OxidEsales\GraphQL\ConfigurationAccess\Shared\Infrastructure\LanguageWrapperInterface:
+    class: OxidEsales\GraphQL\ConfigurationAccess\Shared\Infrastructure\LanguageWrapper
diff --git a/src/Shared/Service/LanguageService.php b/src/Shared/Service/LanguageService.php
@@ -9,7 +9,7 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Shared\Service;
 
-use OxidEsales\GraphQL\ConfigurationAccess\Shared\Core\LanguageWrapperInterface;
+use OxidEsales\GraphQL\ConfigurationAccess\Shared\Infrastructure\LanguageWrapperInterface;
 
 class LanguageService implements LanguageServiceInterface
 {

diff --git a/src/Shared/services.yaml b/src/Shared/services.yaml
@@ -1,5 +1,5 @@
 imports:
-  - { resource: Core/services.yaml }
+  - { resource: Infrastructure/services.yaml }
 
 services:
   _defaults:

diff --git a/.../Unit/Shared/Core/LanguageWrapperTest.php → ...ed/Infrastructure/LanguageWrapperTest.php b/.../Unit/Shared/Core/LanguageWrapperTest.php → ...ed/Infrastructure/LanguageWrapperTest.php
@@ -7,12 +7,15 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\Shared\Core;
+namespace OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\Shared\Infrastructure;
 
-use OxidEsales\GraphQL\ConfigurationAccess\Shared\Core\LanguageWrapper;
+use OxidEsales\GraphQL\ConfigurationAccess\Shared\Infrastructure\LanguageWrapper;
 use PHPUnit\Framework\TestCase;
 use OxidEsales\Eshop\Core\Language;
 
+/**
+ * @covers \OxidEsales\GraphQL\ConfigurationAccess\Shared\Infrastructure\LanguageWrapper
+ */
 class LanguageWrapperTest extends TestCase
 {
     public function testGetBaseLanguage(): void

diff --git a/tests/Unit/Shared/Service/LanguageServiceTest.php b/tests/Unit/Shared/Service/LanguageServiceTest.php
@@ -9,10 +9,13 @@
 
 namespace OxidEsales\GraphQL\ConfigurationAccess\Tests\Unit\Shared\Service;
 
-use OxidEsales\GraphQL\ConfigurationAccess\Shared\Core\LanguageWrapperInterface;
+use OxidEsales\GraphQL\ConfigurationAccess\Shared\Infrastructure\LanguageWrapperInterface;
 use OxidEsales\GraphQL\ConfigurationAccess\Shared\Service\LanguageService;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @covers \OxidEsales\GraphQL\ConfigurationAccess\Shared\Service\LanguageService
+ */
 class LanguageServiceTest extends TestCase
 {
     public function testFilterByLanguageAbbreviationCorrectLangValue()