Merge pull request #180 from RonasIT/173-structure-refactoring

#173: structure refactoring
RonasIT · Jan 10, 2025 · 45d228b · 45d228b
2 parents 3208832 + c3fdb9a
commit 45d228b
Show file tree

Hide file tree

Showing 33 changed files with 71 additions and 64 deletions.
diff --git a/src/Interfaces/ExporterInterface.php → src/Contracts/ExporterContract.php b/src/Interfaces/ExporterInterface.php → src/Contracts/ExporterContract.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace RonasIT\Support\Interfaces;
+namespace RonasIT\Support\Contracts;
 
-interface ExporterInterface
+interface ExporterContract
 {
     /**
      * Set fields to export

diff --git a/src/Exporters/Exporter.php b/src/Exporters/Exporter.php
@@ -4,13 +4,13 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Storage;
-use Maatwebsite\Excel\Concerns\FromQuery;
 use Maatwebsite\Excel\Concerns\Exportable;
-use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\FromQuery;
 use Maatwebsite\Excel\Concerns\WithHeadings;
-use RonasIT\Support\Interfaces\ExporterInterface;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use RonasIT\Support\Contracts\ExporterContract;
 
-abstract class Exporter implements FromQuery, WithHeadings, WithMapping, ExporterInterface
+abstract class Exporter implements FromQuery, WithHeadings, WithMapping, ExporterContract
 {
     use Exportable;
 

diff --git a/src/HelpersServiceProvider.php b/src/HelpersServiceProvider.php
@@ -3,6 +3,7 @@
 namespace RonasIT\Support;
 
 use Illuminate\Routing\Route;
+use Illuminate\Routing\Router;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -14,8 +15,7 @@
 use Maatwebsite\Excel\ExcelServiceProvider;
 use RonasIT\Support\Contracts\VersionEnumContract as Version;
 use RonasIT\Support\Exceptions\InvalidValidationRuleUsageException;
-use RonasIT\Support\Middleware\SecurityMiddleware;
-use Illuminate\Routing\Router;
+use RonasIT\Support\Http\Middleware\SecurityMiddleware;
 
 class HelpersServiceProvider extends ServiceProvider
 {

diff --git a/src/BaseRequest.php → src/Http/BaseRequest.php b/src/BaseRequest.php → src/Http/BaseRequest.php
@@ -1,9 +1,9 @@
 <?php
 
-namespace RonasIT\Support;
+namespace RonasIT\Support\Http;
 
-use Illuminate\Support\Arr;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Arr;
 use RonasIT\Support\Exceptions\InvalidModelException;
 
 class BaseRequest extends FormRequest

diff --git a/src/BaseResource.php → src/Http/BaseResource.php b/src/BaseResource.php → src/Http/BaseResource.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RonasIT\Support;
+namespace RonasIT\Support\Http;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 

diff --git a/src/Middleware/RemovePathParamMiddleware.php → .../Middleware/RemovePathParamMiddleware.php b/src/Middleware/RemovePathParamMiddleware.php → .../Middleware/RemovePathParamMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RonasIT\Support\Middleware;
+namespace RonasIT\Support\Http\Middleware;
 
 use Closure;
 use Illuminate\Http\Request;

diff --git a/src/Middleware/SecurityMiddleware.php → src/Http/Middleware/SecurityMiddleware.php b/src/Middleware/SecurityMiddleware.php → src/Http/Middleware/SecurityMiddleware.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RonasIT\Support\Middleware;
+namespace RonasIT\Support\Http\Middleware;
 
 use Closure;
 use Illuminate\Cache\Repository;

diff --git a/tests/AuthTestTraitTest.php b/tests/AuthTestTraitTest.php
@@ -4,7 +4,7 @@
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
-use RonasIT\Support\Tests\Support\Mock\MockAuthUser;
+use RonasIT\Support\Tests\Support\Mock\Models\MockAuthUser;
 use RonasIT\Support\Traits\AuthTestTrait;
 use RonasIT\Support\Traits\FixturesTrait;
 

diff --git a/tests/BaseRequestTest.php b/tests/BaseRequestTest.php
@@ -3,8 +3,8 @@
 namespace RonasIT\Support\Tests;
 
 use ReflectionClass;
-use RonasIT\Support\BaseRequest;
-use RonasIT\Support\Tests\Support\Mock\TestModel;
+use RonasIT\Support\Http\BaseRequest;
+use RonasIT\Support\Tests\Support\Mock\Models\TestModel;
 use RonasIT\Support\Tests\Support\Traits\TableTestStateMockTrait;
 
 class BaseRequestTest extends HelpersTestCase

diff --git a/tests/EntityControlTraitTest.php b/tests/EntityControlTraitTest.php
@@ -5,10 +5,10 @@
 use Illuminate\Support\Carbon;
 use ReflectionProperty;
 use RonasIT\Support\Exceptions\InvalidModelException;
-use RonasIT\Support\Tests\Support\Mock\TestRepository;
-use RonasIT\Support\Tests\Support\Mock\TestRepositoryNoPrimaryKey;
-use RonasIT\Support\Tests\Support\Mock\TestRepositoryWithDifferentTimestampNames;
-use RonasIT\Support\Tests\Support\Mock\TestRepositoryWithoutTimestamps;
+use RonasIT\Support\Tests\Support\Mock\Repositories\TestRepository;
+use RonasIT\Support\Tests\Support\Mock\Repositories\TestRepositoryNoPrimaryKey;
+use RonasIT\Support\Tests\Support\Mock\Repositories\TestRepositoryWithDifferentTimestampNames;
+use RonasIT\Support\Tests\Support\Mock\Repositories\TestRepositoryWithoutTimestamps;
 use RonasIT\Support\Tests\Support\Traits\SqlMockTrait;
 
 class EntityControlTraitTest extends HelpersTestCase
@@ -791,7 +791,7 @@ public function testModelWithoutPrimaryKey()
     {
         $this->expectException(InvalidModelException::class);
         $this->expectExceptionMessage(
-            'Model RonasIT\Support\Tests\Support\Mock\TestModelNoPrimaryKey must have primary key.'
+            'Model RonasIT\Support\Tests\Support\Mock\Models\TestModelNoPrimaryKey must have primary key.'
         );
 
         new TestRepositoryNoPrimaryKey();

diff --git a/tests/EntityServiceTest.php b/tests/EntityServiceTest.php
@@ -2,10 +2,10 @@
 
 namespace RonasIT\Support\Tests;
 
+use BadMethodCallException;
 use ReflectionProperty;
 use RonasIT\Support\Services\EntityService;
-use RonasIT\Support\Tests\Support\Mock\TestRepository;
-use BadMethodCallException;
+use RonasIT\Support\Tests\Support\Mock\Repositories\TestRepository;
 
 class EntityServiceTest extends HelpersTestCase
 {

diff --git a/tests/MailsMockTraitTest.php b/tests/MailsMockTraitTest.php
@@ -6,10 +6,10 @@
 use Illuminate\Support\Facades\Mail;
 use PHPUnit\Framework\AssertionFailedError;
 use PHPUnit\Framework\ExpectationFailedException;
-use RonasIT\Support\Tests\Support\Mock\LegacyTestMail;
-use RonasIT\Support\Tests\Support\Mock\TestMail;
-use RonasIT\Support\Tests\Support\Mock\TestMailManyFromWithName;
-use RonasIT\Support\Tests\Support\Mock\TestMailWithAttachments;
+use RonasIT\Support\Tests\Support\Mock\Mails\LegacyTestMail;
+use RonasIT\Support\Tests\Support\Mock\Mails\TestMail;
+use RonasIT\Support\Tests\Support\Mock\Mails\TestMailManyFromWithName;
+use RonasIT\Support\Tests\Support\Mock\Mails\TestMailWithAttachments;
 
 class MailsMockTraitTest extends HelpersTestCase
 {

diff --git a/tests/ModelTestStateTest.php b/tests/ModelTestStateTest.php
@@ -3,8 +3,8 @@
 namespace RonasIT\Support\Tests;
 
 use ReflectionClass;
-use RonasIT\Support\Tests\Support\Mock\TestModel;
-use RonasIT\Support\Tests\Support\Mock\TestModelWithoutJsonFields;
+use RonasIT\Support\Tests\Support\Mock\Models\TestModel;
+use RonasIT\Support\Tests\Support\Mock\Models\TestModelWithoutJsonFields;
 use RonasIT\Support\Tests\Support\Traits\TableTestStateMockTrait;
 
 class ModelTestStateTest extends HelpersTestCase

diff --git a/tests/NovaTestTraitTest.php b/tests/NovaTestTraitTest.php
@@ -5,9 +5,9 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Route;
-use RonasIT\Support\Tests\Support\Mock\MockAuthUser;
-use RonasIT\Support\Tests\Support\Mock\TestModel;
-use RonasIT\Support\Tests\Support\Mock\TestNovaAction;
+use RonasIT\Support\Tests\Support\Mock\NovaActions\TestNovaAction;
+use RonasIT\Support\Tests\Support\Mock\Models\MockAuthUser;
+use RonasIT\Support\Tests\Support\Mock\Models\TestModel;
 use RonasIT\Support\Traits\MockTrait;
 use RonasIT\Support\Traits\NovaTestTrait;
 use Symfony\Component\HttpFoundation\Response;

diff --git a/tests/SearchTraitTest.php b/tests/SearchTraitTest.php
@@ -6,8 +6,8 @@
 use Illuminate\Support\Facades\Config;
 use ReflectionClass;
 use ReflectionMethod;
-use RonasIT\Support\Tests\Support\Mock\TestRepository;
 use ReflectionProperty;
+use RonasIT\Support\Tests\Support\Mock\Repositories\TestRepository;
 use RonasIT\Support\Tests\Support\Traits\SqlMockTrait;
 
 class SearchTraitTest extends HelpersTestCase

diff --git a/tests/support/Mock/JSONCustomCast.php → tests/support/Mock/Casts/JSONCustomCast.php b/tests/support/Mock/JSONCustomCast.php → tests/support/Mock/Casts/JSONCustomCast.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Casts;
 
 use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
 

diff --git a/tests/support/Mock/LegacyTestMail.php → tests/support/Mock/Mails/LegacyTestMail.php b/tests/support/Mock/LegacyTestMail.php → tests/support/Mock/Mails/LegacyTestMail.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Mails;
 
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;

diff --git a/tests/support/Mock/TestMail.php → tests/support/Mock/Mails/TestMail.php b/tests/support/Mock/TestMail.php → tests/support/Mock/Mails/TestMail.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Mails;
 
 use Illuminate\Mail\Mailables\Content;
 use Illuminate\Mail\Mailables\Envelope;

diff --git a/...support/Mock/TestMailManyFromWithName.php → ...t/Mock/Mails/TestMailManyFromWithName.php b/...support/Mock/TestMailManyFromWithName.php → ...t/Mock/Mails/TestMailManyFromWithName.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Mails;
 
 class TestMailManyFromWithName extends TestMail
 {

diff --git a/.../support/Mock/TestMailWithAttachments.php → ...rt/Mock/Mails/TestMailWithAttachments.php b/.../support/Mock/TestMailWithAttachments.php → ...rt/Mock/Mails/TestMailWithAttachments.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Mails;
 
 class TestMailWithAttachments extends TestMail
 {

diff --git a/tests/support/Mock/ChildRelationModel.php → ...upport/Mock/Models/ChildRelationModel.php b/tests/support/Mock/ChildRelationModel.php → ...upport/Mock/Models/ChildRelationModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Models;
 
 use Illuminate\Database\Eloquent\Model;
 

diff --git a/tests/support/Mock/MockAuthUser.php → tests/support/Mock/Models/MockAuthUser.php b/tests/support/Mock/MockAuthUser.php → tests/support/Mock/Models/MockAuthUser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Models;
 
 use Illuminate\Contracts\Auth\Authenticatable;
 

diff --git a/tests/support/Mock/RelationModel.php → tests/support/Mock/Models/RelationModel.php b/tests/support/Mock/RelationModel.php → tests/support/Mock/Models/RelationModel.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;

diff --git a/tests/support/Mock/TestModel.php → tests/support/Mock/Models/TestModel.php b/tests/support/Mock/TestModel.php → tests/support/Mock/Models/TestModel.php
@@ -1,11 +1,12 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use RonasIT\Support\Traits\ModelTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use RonasIT\Support\Tests\Support\Mock\Casts\JSONCustomCast;
+use RonasIT\Support\Traits\ModelTrait;
 
 class TestModel extends Model
 {

diff --git a/tests/support/Mock/TestModelNoPrimaryKey.php → ...ort/Mock/Models/TestModelNoPrimaryKey.php b/tests/support/Mock/TestModelNoPrimaryKey.php → ...ort/Mock/Models/TestModelNoPrimaryKey.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use RonasIT\Support\Traits\ModelTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use RonasIT\Support\Traits\ModelTrait;
 
 class TestModelNoPrimaryKey extends Model
 {

diff --git a/.../TestModelWithDifferentTimestampNames.php → .../TestModelWithDifferentTimestampNames.php b/.../TestModelWithDifferentTimestampNames.php → .../TestModelWithDifferentTimestampNames.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use RonasIT\Support\Tests\Support\Mock\Casts\JSONCustomCast;
 use RonasIT\Support\Traits\ModelTrait;
 
 class TestModelWithDifferentTimestampNames extends Model

diff --git a/...pport/Mock/TestModelWithoutJsonFields.php → ...ock/Models/TestModelWithoutJsonFields.php b/...pport/Mock/TestModelWithoutJsonFields.php → ...ock/Models/TestModelWithoutJsonFields.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Models;
 
 use Illuminate\Database\Eloquent\Model;
-use RonasIT\Support\Traits\ModelTrait;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use RonasIT\Support\Traits\ModelTrait;
 
 class TestModelWithoutJsonFields extends Model
 {

diff --git a/...pport/Mock/TestModelWithoutTimestamps.php → ...ock/Models/TestModelWithoutTimestamps.php b/...pport/Mock/TestModelWithoutTimestamps.php → ...ock/Models/TestModelWithoutTimestamps.php
@@ -1,9 +1,10 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use RonasIT\Support\Tests\Support\Mock\Casts\JSONCustomCast;
 use RonasIT\Support\Traits\ModelTrait;
 
 class TestModelWithoutTimestamps extends Model

diff --git a/tests/support/Mock/TestNovaAction.php → ...pport/Mock/NovaActions/TestNovaAction.php b/tests/support/Mock/TestNovaAction.php → ...pport/Mock/NovaActions/TestNovaAction.php
@@ -1,11 +1,11 @@
-<?php
-
-namespace RonasIT\Support\Tests\Support\Mock;
-
-class TestNovaAction
-{
-    public function uriKey(): string
-    {
-        return 'test-nova-action';
-    }
-}
+<?php
+
+namespace RonasIT\Support\Tests\Support\Mock\NovaActions;
+
+class TestNovaAction
+{
+    public function uriKey(): string
+    {
+        return 'test-nova-action';
+    }
+}
diff --git a/tests/support/Mock/TestRepository.php → ...port/Mock/Repositories/TestRepository.php b/tests/support/Mock/TestRepository.php → ...port/Mock/Repositories/TestRepository.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Repositories;
 
 use RonasIT\Support\Repositories\BaseRepository;
+use RonasIT\Support\Tests\Support\Mock\Models\TestModel;
 
 class TestRepository extends BaseRepository
 {

diff --git a/...pport/Mock/TestRepositoryNoPrimaryKey.php → ...positories/TestRepositoryNoPrimaryKey.php b/...pport/Mock/TestRepositoryNoPrimaryKey.php → ...positories/TestRepositoryNoPrimaryKey.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Repositories;
 
 use RonasIT\Support\Repositories\BaseRepository;
+use RonasIT\Support\Tests\Support\Mock\Models\TestModelNoPrimaryKey;
 
 class TestRepositoryNoPrimaryKey extends BaseRepository
 {

diff --git a/...RepositoryWithDifferentTimestampNames.php → ...RepositoryWithDifferentTimestampNames.php b/...RepositoryWithDifferentTimestampNames.php → ...RepositoryWithDifferentTimestampNames.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Repositories;
 
 use RonasIT\Support\Repositories\BaseRepository;
+use RonasIT\Support\Tests\Support\Mock\Models\TestModelWithDifferentTimestampNames;
 
 class TestRepositoryWithDifferentTimestampNames extends BaseRepository
 {

diff --git a/.../Mock/TestRepositoryWithoutTimestamps.php → ...ories/TestRepositoryWithoutTimestamps.php b/.../Mock/TestRepositoryWithoutTimestamps.php → ...ories/TestRepositoryWithoutTimestamps.php
@@ -1,8 +1,9 @@
 <?php
 
-namespace RonasIT\Support\Tests\Support\Mock;
+namespace RonasIT\Support\Tests\Support\Mock\Repositories;
 
 use RonasIT\Support\Repositories\BaseRepository;
+use RonasIT\Support\Tests\Support\Mock\Models\TestModelWithoutTimestamps;
 
 class TestRepositoryWithoutTimestamps extends BaseRepository
 {