From 4c1e0bec079dec60bd862691e60c43ab9efe1d80 Mon Sep 17 00:00:00 2001
From: KKlochko <KKlochko@protonmail.com>
Date: Sun, 3 Sep 2023 11:54:39 +0300
Subject: [PATCH] Refactor InformativeValidators to move the modules into
 Validators.

---
 app/Http/Controllers/API/v2/CartController.php        |  4 ++--
 .../Factories/InformativeValidatorFactory.php         | 11 -----------
 .../CompanyInformativeValidatorByNameFactory.php      |  6 +++---
 .../Factories/InformativeValidatorByNameFactory.php   | 10 +++++-----
 .../Factories/InformativeValidatorFactory.php         | 11 +++++++++++
 .../ItemInformativeValidatorByNameFactory.php         |  6 +++---
 .../Informative}/InformativeValidator.php             |  2 +-
 .../Informative}/NextInformativeValidator.php         |  4 ++--
 .../Informative}/OkInformativeValidator.php           |  4 ++--
 .../CompanyInformativeValidatorByNameFactoryTest.php  |  2 +-
 .../ItemInformativeValidatorByNameFactoryTest.php     |  2 +-
 .../Informative}/OkInformativeValidatorTest.php       |  2 +-
 .../UpperRangeInformativeValidatorTest.php            |  4 ++--
 13 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 app/Models/Validation/Messages/Factories/InformativeValidatorFactory.php
 rename app/Models/Validation/{Messages => Validators/Informative}/Factories/CompanyInformativeValidatorByNameFactory.php (72%)
 rename app/Models/Validation/{Messages => Validators/Informative}/Factories/InformativeValidatorByNameFactory.php (76%)
 create mode 100644 app/Models/Validation/Validators/Informative/Factories/InformativeValidatorFactory.php
 rename app/Models/Validation/{Messages => Validators/Informative}/Factories/ItemInformativeValidatorByNameFactory.php (72%)
 rename app/Models/Validation/{Messages => Validators/Informative}/InformativeValidator.php (94%)
 rename app/Models/Validation/{Messages => Validators/Informative}/NextInformativeValidator.php (76%)
 rename app/Models/Validation/{Messages => Validators/Informative}/OkInformativeValidator.php (77%)
 rename tests/Feature/Validation/{ => Validators/Informative}/Factories/CompanyInformativeValidatorByNameFactoryTest.php (93%)
 rename tests/Feature/Validation/{ => Validators/Informative}/Factories/ItemInformativeValidatorByNameFactoryTest.php (93%)
 rename tests/Unit/Validation/{Messages => Validators/Informative}/OkInformativeValidatorTest.php (87%)
 rename tests/Unit/Validation/{Messages => Validators/Informative}/UpperRangeInformativeValidatorTest.php (93%)

diff --git a/app/Http/Controllers/API/v2/CartController.php b/app/Http/Controllers/API/v2/CartController.php
index 1bdb782..69f765f 100644
--- a/app/Http/Controllers/API/v2/CartController.php
+++ b/app/Http/Controllers/API/v2/CartController.php
@@ -23,8 +23,8 @@ use App\Http\Resources\API\v2\CartItemCollection;
 
 use App\Models\Validation\UserValidationByMatrixUsername;
 use App\Models\Validation\CityValidationByName;
-use App\Models\Validation\Messages\Factories\CompanyInformativeValidatorByNameFactory;
-use App\Models\Validation\Messages\Factories\ItemInformativeValidatorByNameFactory;
+use App\Models\Validation\Validators\Informative\Factories\CompanyInformativeValidatorByNameFactory;
+use App\Models\Validation\Validators\Informative\Factories\ItemInformativeValidatorByNameFactory;
 
 class CartController extends Controller
 {
diff --git a/app/Models/Validation/Messages/Factories/InformativeValidatorFactory.php b/app/Models/Validation/Messages/Factories/InformativeValidatorFactory.php
deleted file mode 100644
index 8c8e9be..0000000
--- a/app/Models/Validation/Messages/Factories/InformativeValidatorFactory.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace App\Models\Validation\Messages\Factories;
-
-use App\Models\Validation\Messages\InformativeValidator;
-
-abstract class InformativeValidatorFactory
-{
-    abstract function create(): InformativeValidator;
-}
-
diff --git a/app/Models/Validation/Messages/Factories/CompanyInformativeValidatorByNameFactory.php b/app/Models/Validation/Validators/Informative/Factories/CompanyInformativeValidatorByNameFactory.php
similarity index 72%
rename from app/Models/Validation/Messages/Factories/CompanyInformativeValidatorByNameFactory.php
rename to app/Models/Validation/Validators/Informative/Factories/CompanyInformativeValidatorByNameFactory.php
index 71301ab..d55aeff 100644
--- a/app/Models/Validation/Messages/Factories/CompanyInformativeValidatorByNameFactory.php
+++ b/app/Models/Validation/Validators/Informative/Factories/CompanyInformativeValidatorByNameFactory.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Models\Validation\Messages\Factories;
+namespace App\Models\Validation\Validators\Informative\Factories;
 
-use App\Models\Validation\Messages\Factories\InformativeValidatorByNameFactory;
+use App\Models\Validation\Validators\Informative\Factories\InformativeValidatorByNameFactory;
+use App\Models\Validation\Validators\Informative\InformativeValidator;
 use App\Models\Validation\Messages\Factories\MessageByNameFactory;
-use App\Models\Validation\Messages\InformativeValidator;
 
 use App\Models\Validation\Validators\Validator;
 use App\Models\Validation\Validators\CompanyValidatorByName;
diff --git a/app/Models/Validation/Messages/Factories/InformativeValidatorByNameFactory.php b/app/Models/Validation/Validators/Informative/Factories/InformativeValidatorByNameFactory.php
similarity index 76%
rename from app/Models/Validation/Messages/Factories/InformativeValidatorByNameFactory.php
rename to app/Models/Validation/Validators/Informative/Factories/InformativeValidatorByNameFactory.php
index 9081f11..e0558b3 100644
--- a/app/Models/Validation/Messages/Factories/InformativeValidatorByNameFactory.php
+++ b/app/Models/Validation/Validators/Informative/Factories/InformativeValidatorByNameFactory.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Models\Validation\Messages\Factories;
+namespace App\Models\Validation\Validators\Informative\Factories;
 
-use App\Models\Validation\Messages\Factories\InformativeValidatorFactory;
-use App\Models\Validation\Messages\InformativeValidator;
+use App\Models\Validation\Validators\Informative\Factories\InformativeValidatorFactory;
+use App\Models\Validation\Validators\Informative\InformativeValidator;
 
-use App\Models\Validation\Messages\OkInformativeValidator;
-use App\Models\Validation\Messages\NextInformativeValidator;
+use App\Models\Validation\Validators\Informative\OkInformativeValidator;
+use App\Models\Validation\Validators\Informative\NextInformativeValidator;
 use App\Models\Validation\Validators\EmptyNameValidator;
 use App\Models\Validation\Validators\Validator;
 
diff --git a/app/Models/Validation/Validators/Informative/Factories/InformativeValidatorFactory.php b/app/Models/Validation/Validators/Informative/Factories/InformativeValidatorFactory.php
new file mode 100644
index 0000000..79cf493
--- /dev/null
+++ b/app/Models/Validation/Validators/Informative/Factories/InformativeValidatorFactory.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models\Validation\Validators\Informative\Factories;
+
+use App\Models\Validation\Validators\Informative\InformativeValidator;
+
+abstract class InformativeValidatorFactory
+{
+    abstract function create(): InformativeValidator;
+}
+
diff --git a/app/Models/Validation/Messages/Factories/ItemInformativeValidatorByNameFactory.php b/app/Models/Validation/Validators/Informative/Factories/ItemInformativeValidatorByNameFactory.php
similarity index 72%
rename from app/Models/Validation/Messages/Factories/ItemInformativeValidatorByNameFactory.php
rename to app/Models/Validation/Validators/Informative/Factories/ItemInformativeValidatorByNameFactory.php
index 128215a..534d059 100644
--- a/app/Models/Validation/Messages/Factories/ItemInformativeValidatorByNameFactory.php
+++ b/app/Models/Validation/Validators/Informative/Factories/ItemInformativeValidatorByNameFactory.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Models\Validation\Messages\Factories;
+namespace App\Models\Validation\Validators\Informative\Factories;
 
-use App\Models\Validation\Messages\Factories\InformativeValidatorByNameFactory;
+use App\Models\Validation\Validators\Informative\Factories\InformativeValidatorByNameFactory;
+use App\Models\Validation\Validators\Informative\InformativeValidator;
 use App\Models\Validation\Messages\Factories\MessageByNameFactory;
-use App\Models\Validation\Messages\InformativeValidator;
 
 use App\Models\Validation\Validators\Validator;
 use App\Models\Validation\Validators\ItemValidatorByName;
diff --git a/app/Models/Validation/Messages/InformativeValidator.php b/app/Models/Validation/Validators/Informative/InformativeValidator.php
similarity index 94%
rename from app/Models/Validation/Messages/InformativeValidator.php
rename to app/Models/Validation/Validators/Informative/InformativeValidator.php
index d65ea98..6a5501d 100644
--- a/app/Models/Validation/Messages/InformativeValidator.php
+++ b/app/Models/Validation/Validators/Informative/InformativeValidator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Models\Validation\Messages;
+namespace App\Models\Validation\Validators\Informative;
 
 use App\Models\Validation\Validators\Validator;
 
diff --git a/app/Models/Validation/Messages/NextInformativeValidator.php b/app/Models/Validation/Validators/Informative/NextInformativeValidator.php
similarity index 76%
rename from app/Models/Validation/Messages/NextInformativeValidator.php
rename to app/Models/Validation/Validators/Informative/NextInformativeValidator.php
index c830c10..9e6b45e 100644
--- a/app/Models/Validation/Messages/NextInformativeValidator.php
+++ b/app/Models/Validation/Validators/Informative/NextInformativeValidator.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Models\Validation\Messages;
+namespace App\Models\Validation\Validators\Informative;
 
-use App\Models\Validation\Messages\InformativeValidator;
+use App\Models\Validation\Validators\Informative\InformativeValidator;
 use App\Models\Validation\Validators\Validator;
 
 class NextInformativeValidator extends InformativeValidator {
diff --git a/app/Models/Validation/Messages/OkInformativeValidator.php b/app/Models/Validation/Validators/Informative/OkInformativeValidator.php
similarity index 77%
rename from app/Models/Validation/Messages/OkInformativeValidator.php
rename to app/Models/Validation/Validators/Informative/OkInformativeValidator.php
index d820631..563af15 100644
--- a/app/Models/Validation/Messages/OkInformativeValidator.php
+++ b/app/Models/Validation/Validators/Informative/OkInformativeValidator.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace App\Models\Validation\Messages;
+namespace App\Models\Validation\Validators\Informative;
 
-use App\Models\Validation\Messages\InformativeValidator;
+use App\Models\Validation\Validators\Informative\InformativeValidator;
 use App\Models\Validation\Validators\OkValidator;
 
 class OkInformativeValidator extends InformativeValidator {
diff --git a/tests/Feature/Validation/Factories/CompanyInformativeValidatorByNameFactoryTest.php b/tests/Feature/Validation/Validators/Informative/Factories/CompanyInformativeValidatorByNameFactoryTest.php
similarity index 93%
rename from tests/Feature/Validation/Factories/CompanyInformativeValidatorByNameFactoryTest.php
rename to tests/Feature/Validation/Validators/Informative/Factories/CompanyInformativeValidatorByNameFactoryTest.php
index 8c41169..cd0f53b 100644
--- a/tests/Feature/Validation/Factories/CompanyInformativeValidatorByNameFactoryTest.php
+++ b/tests/Feature/Validation/Validators/Informative/Factories/CompanyInformativeValidatorByNameFactoryTest.php
@@ -4,7 +4,7 @@ namespace Tests\Feature;
 
 use Tests\TestCase;
 
-use App\Models\Validation\Messages\Factories\CompanyInformativeValidatorByNameFactory;
+use App\Models\Validation\Validators\Informative\Factories\CompanyInformativeValidatorByNameFactory;
 
 class CompanyInformativeValidatorByNameFactoryTest extends TestCase
 {
diff --git a/tests/Feature/Validation/Factories/ItemInformativeValidatorByNameFactoryTest.php b/tests/Feature/Validation/Validators/Informative/Factories/ItemInformativeValidatorByNameFactoryTest.php
similarity index 93%
rename from tests/Feature/Validation/Factories/ItemInformativeValidatorByNameFactoryTest.php
rename to tests/Feature/Validation/Validators/Informative/Factories/ItemInformativeValidatorByNameFactoryTest.php
index 779b48e..57dc824 100644
--- a/tests/Feature/Validation/Factories/ItemInformativeValidatorByNameFactoryTest.php
+++ b/tests/Feature/Validation/Validators/Informative/Factories/ItemInformativeValidatorByNameFactoryTest.php
@@ -4,7 +4,7 @@ namespace Tests\Feature;
 
 use Tests\TestCase;
 
-use App\Models\Validation\Messages\Factories\ItemInformativeValidatorByNameFactory;
+use App\Models\Validation\Validators\Informative\Factories\ItemInformativeValidatorByNameFactory;
 
 class ItemInformativeValidatorByNameFactoryTest extends TestCase
 {
diff --git a/tests/Unit/Validation/Messages/OkInformativeValidatorTest.php b/tests/Unit/Validation/Validators/Informative/OkInformativeValidatorTest.php
similarity index 87%
rename from tests/Unit/Validation/Messages/OkInformativeValidatorTest.php
rename to tests/Unit/Validation/Validators/Informative/OkInformativeValidatorTest.php
index 409bf10..6ad001e 100644
--- a/tests/Unit/Validation/Messages/OkInformativeValidatorTest.php
+++ b/tests/Unit/Validation/Validators/Informative/OkInformativeValidatorTest.php
@@ -4,7 +4,7 @@ namespace Tests\Unit;
 
 use PHPUnit\Framework\TestCase;
 
-use App\Models\Validation\Messages\OkInformativeValidator;
+use App\Models\Validation\Validators\Informative\OkInformativeValidator;
 
 class OkInformativeValidatorTest extends TestCase
 {
diff --git a/tests/Unit/Validation/Messages/UpperRangeInformativeValidatorTest.php b/tests/Unit/Validation/Validators/Informative/UpperRangeInformativeValidatorTest.php
similarity index 93%
rename from tests/Unit/Validation/Messages/UpperRangeInformativeValidatorTest.php
rename to tests/Unit/Validation/Validators/Informative/UpperRangeInformativeValidatorTest.php
index 584498a..937ff46 100644
--- a/tests/Unit/Validation/Messages/UpperRangeInformativeValidatorTest.php
+++ b/tests/Unit/Validation/Validators/Informative/UpperRangeInformativeValidatorTest.php
@@ -4,8 +4,8 @@ namespace Tests\Unit;
 
 use PHPUnit\Framework\TestCase;
 
-use App\Models\Validation\Messages\NextInformativeValidator;
-use App\Models\Validation\Messages\OkInformativeValidator;
+use App\Models\Validation\Validators\Informative\NextInformativeValidator;
+use App\Models\Validation\Validators\Informative\OkInformativeValidator;
 use App\Models\Validation\Validators\UpperRangeValidator;
 use App\Models\Validation\Validators\OkValidator;
 use App\Models\Validation\Validators\Validator;