From 078fb6a213253742a41eed8f18a711c0112a4aa5 Mon Sep 17 00:00:00 2001
From: sgodard <sebastien.godard@prestashop.com>
Date: Mon, 27 Nov 2023 17:32:12 +0100
Subject: [PATCH] fix naming and directory

---
 src/Country/Country.php                            | 4 ++--
 src/Country/Exception/CountryException.php         | 4 +++-
 src/Currency/Currency.php                          | 4 ++--
 src/Currency/{ => Exception}/CurrencyException.php | 4 +++-
 src/{ => Locale}/Exception/LocaleException.php     | 4 +++-
 src/Locale/Locale.php                              | 4 ++--
 tests/Unit/{ => Country}/CountryTest.php           | 5 +++--
 tests/Unit/{ => Currency}/CurrencyTest.php         | 5 +++--
 tests/Unit/{ => Locale}/LocaleTest.php             | 5 +++--
 9 files changed, 24 insertions(+), 15 deletions(-)
 rename src/Currency/{ => Exception}/CurrencyException.php (87%)
 rename src/{ => Locale}/Exception/LocaleException.php (87%)
 rename tests/Unit/{ => Country}/CountryTest.php (91%)
 rename tests/Unit/{ => Currency}/CurrencyTest.php (91%)
 rename tests/Unit/{ => Locale}/LocaleTest.php (89%)

diff --git a/src/Country/Country.php b/src/Country/Country.php
index f70b0e9ec..22cbf9821 100644
--- a/src/Country/Country.php
+++ b/src/Country/Country.php
@@ -18,9 +18,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PrestashopCheckout;
+namespace PrestaShop\Module\PrestashopCheckout\Country;
 
-use PrestaShop\Module\PrestashopCheckout\Exception\CountryException;
+use PrestaShop\Module\PrestashopCheckout\Country\Exception\CountryException;
 
 class Country
 {
diff --git a/src/Country/Exception/CountryException.php b/src/Country/Exception/CountryException.php
index 3e2801237..c34f21bc8 100644
--- a/src/Country/Exception/CountryException.php
+++ b/src/Country/Exception/CountryException.php
@@ -19,7 +19,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PrestashopCheckout\Exception;
+namespace PrestaShop\Module\PrestashopCheckout\Country\Exception;
+
+use PrestaShop\Module\PrestashopCheckout\Exception\PsCheckoutException;
 
 class CountryException extends PsCheckoutException
 {
diff --git a/src/Currency/Currency.php b/src/Currency/Currency.php
index 6d81a36b1..80c49086d 100644
--- a/src/Currency/Currency.php
+++ b/src/Currency/Currency.php
@@ -18,9 +18,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PrestashopCheckout;
+namespace PrestaShop\Module\PrestashopCheckout\Currency;
 
-use PrestaShop\Module\PrestashopCheckout\Exception\CurrencyException;
+use PrestaShop\Module\PrestashopCheckout\Currency\Exception\CurrencyException;
 
 class Currency
 {
diff --git a/src/Currency/CurrencyException.php b/src/Currency/Exception/CurrencyException.php
similarity index 87%
rename from src/Currency/CurrencyException.php
rename to src/Currency/Exception/CurrencyException.php
index b57ee8063..593adc684 100644
--- a/src/Currency/CurrencyException.php
+++ b/src/Currency/Exception/CurrencyException.php
@@ -19,7 +19,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PrestashopCheckout\Exception;
+namespace PrestaShop\Module\PrestashopCheckout\Currency\Exception;
+
+use PrestaShop\Module\PrestashopCheckout\Exception\PsCheckoutException;
 
 class CurrencyException extends PsCheckoutException
 {
diff --git a/src/Exception/LocaleException.php b/src/Locale/Exception/LocaleException.php
similarity index 87%
rename from src/Exception/LocaleException.php
rename to src/Locale/Exception/LocaleException.php
index 07dd12dc2..9b6bab1d0 100644
--- a/src/Exception/LocaleException.php
+++ b/src/Locale/Exception/LocaleException.php
@@ -19,7 +19,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PrestashopCheckout\Exception;
+namespace PrestaShop\Module\PrestashopCheckout\Locale\Exception;
+
+use PrestaShop\Module\PrestashopCheckout\Exception\PsCheckoutException;
 
 class LocaleException extends PsCheckoutException
 {
diff --git a/src/Locale/Locale.php b/src/Locale/Locale.php
index 0d9e1a3cc..51bae634c 100644
--- a/src/Locale/Locale.php
+++ b/src/Locale/Locale.php
@@ -18,9 +18,9 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
  */
 
-namespace PrestaShop\Module\PrestashopCheckout;
+namespace PrestaShop\Module\PrestashopCheckout\Locale;
 
-use PrestaShop\Module\PrestashopCheckout\Exception\LocaleException;
+use PrestaShop\Module\PrestashopCheckout\Locale\Exception\LocaleException;
 
 class Locale
 {
diff --git a/tests/Unit/CountryTest.php b/tests/Unit/Country/CountryTest.php
similarity index 91%
rename from tests/Unit/CountryTest.php
rename to tests/Unit/Country/CountryTest.php
index bbbbc463e..770851cab 100644
--- a/tests/Unit/CountryTest.php
+++ b/tests/Unit/Country/CountryTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace PrestaShop\Module\PrestashopCheckout;
+namespace Tests\Unit\Country;
 
 use PHPUnit\Framework\TestCase;
-use PrestaShop\Module\PrestashopCheckout\Exception\CountryException;
+use PrestaShop\Module\PrestashopCheckout\Country\Country;
+use PrestaShop\Module\PrestashopCheckout\Country\Exception\CountryException;
 
 class CountryTest extends TestCase
 {
diff --git a/tests/Unit/CurrencyTest.php b/tests/Unit/Currency/CurrencyTest.php
similarity index 91%
rename from tests/Unit/CurrencyTest.php
rename to tests/Unit/Currency/CurrencyTest.php
index 06b6939b8..11a21c7e4 100644
--- a/tests/Unit/CurrencyTest.php
+++ b/tests/Unit/Currency/CurrencyTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace PrestaShop\Module\PrestashopCheckout;
+namespace Tests\Unit\Currency;
 
 use PHPUnit\Framework\TestCase;
-use PrestaShop\Module\PrestashopCheckout\Exception\CurrencyException;
+use PrestaShop\Module\PrestashopCheckout\Currency\Currency;
+use PrestaShop\Module\PrestashopCheckout\Currency\Exception\CurrencyException;
 
 class CurrencyTest extends TestCase
 {
diff --git a/tests/Unit/LocaleTest.php b/tests/Unit/Locale/LocaleTest.php
similarity index 89%
rename from tests/Unit/LocaleTest.php
rename to tests/Unit/Locale/LocaleTest.php
index 493efff57..cdb23e756 100644
--- a/tests/Unit/LocaleTest.php
+++ b/tests/Unit/Locale/LocaleTest.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace PrestaShop\Module\PrestashopCheckout;
+namespace Tests\Unit\Locale;
 
 use PHPUnit\Framework\TestCase;
-use PrestaShop\Module\PrestashopCheckout\Exception\LocaleException;
+use PrestaShop\Module\PrestashopCheckout\Locale\Exception\LocaleException;
+use PrestaShop\Module\PrestashopCheckout\Locale\Locale;
 
 class LocaleTest extends TestCase
 {