From 544d0f80a57546250963c7cc836a70ce84a15e7c Mon Sep 17 00:00:00 2001
From: RahatHameed <the_rahat_online@yahoo.com>
Date: Tue, 9 Jul 2024 11:24:18 +0200
Subject: [PATCH] OXDEV-8215 Moved LanguageWrapper into infrastructure

---
 src/Shared/Core/services.yaml                       | 13 -------------
 .../{Core => Infrastructure}/LanguageWrapper.php    |  2 +-
 .../LanguageWrapperInterface.php                    |  2 +-
 src/Shared/Infrastructure/services.yaml             | 13 +++++++++++++
 src/Shared/Service/LanguageService.php              |  2 +-
 src/Shared/services.yaml                            |  2 +-
 .../LanguageWrapperTest.php                         |  7 +++++--
 tests/Unit/Shared/Service/LanguageServiceTest.php   |  5 ++++-
 8 files changed, 26 insertions(+), 20 deletions(-)
 delete mode 100644 src/Shared/Core/services.yaml
 rename src/Shared/{Core => Infrastructure}/LanguageWrapper.php (89%)
 rename src/Shared/{Core => Infrastructure}/LanguageWrapperInterface.php (68%)
 create mode 100644 src/Shared/Infrastructure/services.yaml
 rename tests/Unit/Shared/{Core => Infrastructure}/LanguageWrapperTest.php (86%)

diff --git a/src/Shared/Core/services.yaml b/src/Shared/Core/services.yaml
deleted file mode 100644
index 2558516..0000000
--- a/src/Shared/Core/services.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-services:
-  _defaults:
-    public: false
-    autowire: true
-    bind:
-      OxidEsales\Eshop\Core\Language: '@=service("OxidEsales\\GraphQL\\ConfigurationAccess\\Shared\\Core\\Registry").getLang()'
-
-  OxidEsales\GraphQL\ConfigurationAccess\Shared\Core\Registry:
-    class: OxidEsales\Eshop\Core\Registry
-    public: true
-
-  OxidEsales\GraphQL\ConfigurationAccess\Shared\Core\LanguageWrapperInterface:
-    class: OxidEsales\GraphQL\ConfigurationAccess\Shared\Core\LanguageWrapper
diff --git a/src/Shared/Core/LanguageWrapper.php b/src/Shared/Infrastructure/LanguageWrapper.php
similarity index 89%
rename from src/Shared/Core/LanguageWrapper.php
rename to src/Shared/Infrastructure/LanguageWrapper.php
index f58f5e9..63a546f 100644
--- a/src/Shared/Core/LanguageWrapper.php
+++ b/src/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 b/src/Shared/Infrastructure/LanguageWrapperInterface.php
similarity index 68%
rename from src/Shared/Core/LanguageWrapperInterface.php
rename to src/Shared/Infrastructure/LanguageWrapperInterface.php
index b4baaa3..551cc58 100644
--- a/src/Shared/Core/LanguageWrapperInterface.php
+++ b/src/Shared/Infrastructure/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
new file mode 100644
index 0000000..fa2630f
--- /dev/null
+++ 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
index d2efe19..99be7e9 100644
--- 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
index b29c344..74ff2d2 100644
--- 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/tests/Unit/Shared/Core/LanguageWrapperTest.php b/tests/Unit/Shared/Infrastructure/LanguageWrapperTest.php
similarity index 86%
rename from tests/Unit/Shared/Core/LanguageWrapperTest.php
rename to tests/Unit/Shared/Infrastructure/LanguageWrapperTest.php
index 83d558d..35bed99 100644
--- a/tests/Unit/Shared/Core/LanguageWrapperTest.php
+++ b/tests/Unit/Shared/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
index 014be34..2ba8103 100644
--- 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()