Improve file structure (#5)

* Add Enums and Overrides folders

* Fix code style (php-cs-fixer)

---------

Co-authored-by: PHP CS Fixer <phpcsfixer@example.com>

assets/TenancyServiceProvider.stub.php

@@ -11,7 +11,7 @@ use Stancl\Tenancy\Middleware;
 use Stancl\JobPipeline\JobPipeline;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\ServiceProvider;
-use Stancl\Tenancy\TenancyUrlGenerator;
+use Stancl\Tenancy\Overrides\TenancyUrlGenerator;
 use Illuminate\Support\Facades\Route as RouteFacade;
 use Stancl\Tenancy\Actions\CloneRoutesAsTenant;
 use Stancl\Tenancy\Middleware\InitializeTenancyByPath;

assets/config.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 use Stancl\Tenancy\Middleware;
 use Stancl\Tenancy\Resolvers;
-use Stancl\Tenancy\RouteMode;
+use Stancl\Tenancy\Enums\RouteMode;
 
 return [
     /**

src/Actions/CloneRoutesAsTenant.php

@@ -9,8 +9,8 @@ use Illuminate\Config\Repository;
 use Illuminate\Routing\Route;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Collection;
+use Stancl\Tenancy\Enums\RouteMode;
 use Stancl\Tenancy\PathIdentificationManager;
-use Stancl\Tenancy\RouteMode;
 
 /**
  * The CloneRoutesAsTenant action clones

src/Bootstrappers/BroadcastTenancyBootstrapper.php

@@ -10,7 +10,7 @@ use Illuminate\Contracts\Broadcasting\Broadcaster;
 use Illuminate\Foundation\Application;
 use Stancl\Tenancy\Contracts\TenancyBootstrapper;
 use Stancl\Tenancy\Contracts\Tenant;
-use Stancl\Tenancy\TenancyBroadcastManager;
+use Stancl\Tenancy\Overrides\TenancyBroadcastManager;
 
 class BroadcastTenancyBootstrapper implements TenancyBootstrapper
 {

src/Bootstrappers/CacheTagsBootstrapper.php

@@ -20,7 +20,7 @@ use Stancl\Tenancy\Contracts\Tenant;
 class CacheTagsBootstrapper implements TenancyBootstrapper
 {
     protected ?CacheManager $originalCache = null;
-    public static string $cacheManagerWithTags = \Stancl\Tenancy\CacheManager::class;
+    public static string $cacheManagerWithTags = \Stancl\Tenancy\Overrides\CacheManager::class;
 
     public function __construct(
         protected Application $app

src/Bootstrappers/UrlBindingBootstrapper.php

@@ -9,7 +9,7 @@ use Illuminate\Routing\UrlGenerator;
 use Illuminate\Support\Facades\URL;
 use Stancl\Tenancy\Contracts\TenancyBootstrapper;
 use Stancl\Tenancy\Contracts\Tenant;
-use Stancl\Tenancy\TenancyUrlGenerator;
+use Stancl\Tenancy\Overrides\TenancyUrlGenerator;
 
 /**
  * Makes the app use TenancyUrlGenerator (instead of Illuminate\Routing\UrlGenerator) which:

src/Concerns/DealsWithEarlyIdentification.php

@@ -10,8 +10,8 @@ use Illuminate\Routing\Route;
 use Illuminate\Routing\Router;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Route as RouteFacade;
-use Stancl\Tenancy\Context;
+use Stancl\Tenancy\Enums\Context;
-use Stancl\Tenancy\RouteMode;
+use Stancl\Tenancy\Enums\RouteMode;
 
 // todo1 Name – maybe DealsWithMiddlewareContexts?
 trait DealsWithEarlyIdentification

src/Concerns/UsableWithEarlyIdentification.php

@@ -7,11 +7,11 @@ namespace Stancl\Tenancy\Concerns;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
-use Stancl\Tenancy\Context;
+use Stancl\Tenancy\Enums\Context;
+use Stancl\Tenancy\Enums\RouteMode;
 use Stancl\Tenancy\Exceptions\MiddlewareNotUsableWithUniversalRoutesException;
 use Stancl\Tenancy\Middleware\IdentificationMiddleware;
 use Stancl\Tenancy\Middleware\PreventAccessFromUnwantedDomains;
-use Stancl\Tenancy\RouteMode;
 
 /**
  * This trait provides methods that check if a middleware's execution should be skipped.

src/Enums/Context.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Stancl\Tenancy;
+namespace Stancl\Tenancy\Enums;
 
 enum Context
 {

src/Enums/RouteMode.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Stancl\Tenancy;
+namespace Stancl\Tenancy\Enums;
 
 enum RouteMode
 {

src/Features/ViteBundler.php

@@ -6,8 +6,8 @@ namespace Stancl\Tenancy\Features;
 
 use Illuminate\Foundation\Application;
 use Stancl\Tenancy\Contracts\Feature;
+use Stancl\Tenancy\Overrides\Vite;
 use Stancl\Tenancy\Tenancy;
-use Stancl\Tenancy\Vite;
 
 class ViteBundler implements Feature
 {

src/Listeners/ForgetTenantParameter.php

@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace Stancl\Tenancy\Listeners;
 
 use Illuminate\Routing\Events\RouteMatched;
+use Stancl\Tenancy\Enums\RouteMode;
 use Stancl\Tenancy\PathIdentificationManager;
-use Stancl\Tenancy\RouteMode;
 
 /**
  * Remove the tenant parameter from the matched route when path identification is used globally.

src/Middleware/InitializeTenancyByPath.php

@@ -11,12 +11,12 @@ use Illuminate\Support\Facades\URL;
 use Stancl\Tenancy\Concerns\UsableWithEarlyIdentification;
 use Stancl\Tenancy\Concerns\UsableWithUniversalRoutes;
 use Stancl\Tenancy\Contracts\Tenant;
+use Stancl\Tenancy\Enums\RouteMode;
 use Stancl\Tenancy\Events\InitializingTenancy;
 use Stancl\Tenancy\Exceptions\RouteIsMissingTenantParameterException;
+use Stancl\Tenancy\Overrides\TenancyUrlGenerator;
 use Stancl\Tenancy\Resolvers\PathTenantResolver;
-use Stancl\Tenancy\RouteMode;
 use Stancl\Tenancy\Tenancy;
-use Stancl\Tenancy\TenancyUrlGenerator;
 
 /**
  * @see Stancl\Tenancy\Listeners\ForgetTenantParameter

src/Middleware/InitializeTenancyByRequestData.php

@@ -9,9 +9,9 @@ use Illuminate\Http\Request;
 use Stancl\Tenancy\Concerns\UsableWithEarlyIdentification;
 use Stancl\Tenancy\Concerns\UsableWithUniversalRoutes;
 use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedByRequestDataException;
+use Stancl\Tenancy\Overrides\TenancyUrlGenerator;
 use Stancl\Tenancy\Resolvers\RequestDataTenantResolver;
 use Stancl\Tenancy\Tenancy;
-use Stancl\Tenancy\TenancyUrlGenerator;
 
 class InitializeTenancyByRequestData extends IdentificationMiddleware implements UsableWithUniversalRoutes
 {

src/Middleware/PreventAccessFromUnwantedDomains.php

@@ -8,8 +8,8 @@ use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Route;
 use Stancl\Tenancy\Concerns\UsableWithEarlyIdentification;
-use Stancl\Tenancy\Context;
+use Stancl\Tenancy\Enums\Context;
-use Stancl\Tenancy\RouteMode;
+use Stancl\Tenancy\Enums\RouteMode;
 
 /**
  * todo come up with a better name.

src/Overrides/CacheManager.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Stancl\Tenancy;
+namespace Stancl\Tenancy\Overrides;
 
 use Illuminate\Cache\CacheManager as BaseCacheManager;
 

src/Overrides/TenancyBroadcastManager.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Stancl\Tenancy; // todo new Overrides namespace?
+namespace Stancl\Tenancy\Overrides;
 
 use Illuminate\Broadcasting\Broadcasters\Broadcaster;
 use Illuminate\Broadcasting\BroadcastManager;

src/Overrides/TenancyUrlGenerator.php

@@ -2,10 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Stancl\Tenancy; // todo new Overrides namespace?
+namespace Stancl\Tenancy\Overrides;
 
 use Illuminate\Routing\UrlGenerator;
 use Illuminate\Support\Arr;
+use Stancl\Tenancy\PathIdentificationManager;
 
 /**
  * This class is used in place of the default UrlGenerator when UrlBindingBootstrapper is enabled.

src/Overrides/Vite.php

@@ -2,11 +2,11 @@
 
 declare(strict_types=1);
 
-namespace Stancl\Tenancy;
+namespace Stancl\Tenancy\Overrides;
 
 use Illuminate\Foundation\Vite as BaseVite;
 
-class Vite extends BaseVite // todo move to a different directory in v4
+class Vite extends BaseVite
 {
     /**
      * Generate an asset path for the application.

tests/BootstrapperTest.php

@@ -15,11 +15,11 @@ use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Storage;
 use Stancl\Tenancy\Events\TenancyEnded;
 use Stancl\Tenancy\Jobs\CreateDatabase;
-use Stancl\Tenancy\TenancyUrlGenerator;
+use Stancl\Tenancy\Overrides\TenancyUrlGenerator;
 use Stancl\Tenancy\Events\TenantCreated;
 use Stancl\Tenancy\Events\TenantDeleted;
 use Stancl\Tenancy\Events\DeletingTenant;
-use Stancl\Tenancy\TenancyBroadcastManager;
+use Stancl\Tenancy\Overrides\TenancyBroadcastManager;
 use Illuminate\Filesystem\FilesystemAdapter;
 use Illuminate\Broadcasting\BroadcastManager;
 use Stancl\Tenancy\Events\TenancyInitialized;

tests/BroadcastingTest.php

@@ -5,7 +5,7 @@ declare(strict_types=1);
 use Illuminate\Support\Facades\Event;
 use Stancl\Tenancy\Events\TenancyEnded;
 use Illuminate\Support\Facades\Broadcast;
-use Stancl\Tenancy\TenancyBroadcastManager;
+use Stancl\Tenancy\Overrides\TenancyBroadcastManager;
 use Illuminate\Broadcasting\BroadcastManager;
 use Stancl\Tenancy\Events\TenancyInitialized;
 use Stancl\Tenancy\Listeners\BootstrapTenancy;

tests/EarlyIdentificationTest.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 use Illuminate\Support\Arr;
 use Illuminate\Routing\Route;
-use Stancl\Tenancy\RouteMode;
+use Stancl\Tenancy\Enums\RouteMode;
 use Stancl\Tenancy\Tests\Etc\Tenant;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\Facades\Event;

tests/Features/ViteBundlerTest.php

@@ -4,7 +4,7 @@ declare(strict_types=1);
 
 use Illuminate\Foundation\Vite;
 use Stancl\Tenancy\Tests\Etc\Tenant;
-use Stancl\Tenancy\Vite as StanclVite;
+use Stancl\Tenancy\Overrides\Vite as StanclVite;
 use Stancl\Tenancy\Features\ViteBundler;
 
 test('vite helper uses our custom class', function() {

tests/GlobalCacheTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Stancl\Tenancy\CacheManager;
+use Stancl\Tenancy\Overrides\CacheManager;
 use Stancl\Tenancy\Tests\Etc\Tenant;
 use Illuminate\Support\Facades\Event;
 use Stancl\Tenancy\Events\TenancyEnded;

tests/PreventAccessFromUnwantedDomainsTest.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-use Stancl\Tenancy\RouteMode;
+use Stancl\Tenancy\Enums\RouteMode;
 use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\Facades\Route;
 use Stancl\Tenancy\Middleware\InitializeTenancyByDomain;

tests/UniversalRouteTest.php

@@ -24,7 +24,7 @@ use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedByPathException;
 use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedOnDomainException;
 use Stancl\Tenancy\Exceptions\MiddlewareNotUsableWithUniversalRoutesException;
 use Stancl\Tenancy\Exceptions\TenantCouldNotBeIdentifiedByRequestDataException;
-use Stancl\Tenancy\RouteMode;
+use Stancl\Tenancy\Enums\RouteMode;
 
 test('a route can be universal using domain identification', function (array $routeMiddleware, array $globalMiddleware) {
     foreach ($globalMiddleware as $middleware) {