diff --git a/src/Core/Cdn/Console/CdnPurge.php b/src/Core/Cdn/Console/CdnPurge.php index 64c3b02..b947999 100644 --- a/src/Core/Cdn/Console/CdnPurge.php +++ b/src/Core/Cdn/Console/CdnPurge.php @@ -96,8 +96,8 @@ class CdnPurge extends Command // Purge by workspace if (empty($workspaceArg)) { $workspaceOptions = ['all', 'Select specific URLs']; - if (class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { - $workspaceOptions = array_merge($workspaceOptions, \Core\Mod\Tenant\Models\Workspace::pluck('slug')->toArray()); + if (class_exists(\Core\Tenant\Models\Workspace::class)) { + $workspaceOptions = array_merge($workspaceOptions, \Core\Tenant\Models\Workspace::pluck('slug')->toArray()); } $workspaceArg = $this->choice( 'What would you like to purge?', @@ -218,13 +218,13 @@ class CdnPurge extends Command protected function purgeAllWorkspaces(bool $dryRun): int { - if (! class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { + if (! class_exists(\Core\Tenant\Models\Workspace::class)) { $this->error('Workspace purge requires Tenant module to be installed.'); return self::FAILURE; } - $workspaces = \Core\Mod\Tenant\Models\Workspace::all(); + $workspaces = \Core\Tenant\Models\Workspace::all(); if ($workspaces->isEmpty()) { $this->error('No workspaces found'); @@ -276,19 +276,19 @@ class CdnPurge extends Command protected function purgeWorkspace(string $slug, bool $dryRun): int { - if (! class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { + if (! class_exists(\Core\Tenant\Models\Workspace::class)) { $this->error('Workspace purge requires Tenant module to be installed.'); return self::FAILURE; } - $workspace = \Core\Mod\Tenant\Models\Workspace::where('slug', $slug)->first(); + $workspace = \Core\Tenant\Models\Workspace::where('slug', $slug)->first(); if (! $workspace) { $this->error("Workspace not found: {$slug}"); $this->newLine(); $this->info('Available workspaces:'); - \Core\Mod\Tenant\Models\Workspace::pluck('slug')->each(fn ($s) => $this->line(" - {$s}")); + \Core\Tenant\Models\Workspace::pluck('slug')->each(fn ($s) => $this->line(" - {$s}")); return self::FAILURE; } diff --git a/src/Core/Config/ConfigService.php b/src/Core/Config/ConfigService.php index daff918..e5d50f0 100644 --- a/src/Core/Config/ConfigService.php +++ b/src/Core/Config/ConfigService.php @@ -601,8 +601,8 @@ class ConfigService // Re-compute this key for the affected scope $workspace = null; - if ($workspaceId !== null && class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { - $workspace = \Core\Mod\Tenant\Models\Workspace::find($workspaceId); + if ($workspaceId !== null && class_exists(\Core\Tenant\Models\Workspace::class)) { + $workspace = \Core\Tenant\Models\Workspace::find($workspaceId); } $channel = $channelId ? Channel::find($channelId) : null; @@ -629,7 +629,7 @@ class ConfigService * Prime cache for all workspaces. * * Run this from a scheduled command or queue job. - * Requires Core\Mod\Tenant module to prime workspace-level config. + * Requires Core\Tenant module to prime workspace-level config. */ public function primeAll(): void { @@ -637,8 +637,8 @@ class ConfigService $this->prime(null); // Prime each workspace (requires Tenant module) - if (class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { - \Core\Mod\Tenant\Models\Workspace::chunk(100, function ($workspaces) { + if (class_exists(\Core\Tenant\Models\Workspace::class)) { + \Core\Tenant\Models\Workspace::chunk(100, function ($workspaces) { foreach ($workspaces as $workspace) { $this->prime($workspace); } diff --git a/src/Core/Config/Console/ConfigExportCommand.php b/src/Core/Config/Console/ConfigExportCommand.php index 01381cd..8264886 100644 --- a/src/Core/Config/Console/ConfigExportCommand.php +++ b/src/Core/Config/Console/ConfigExportCommand.php @@ -45,13 +45,13 @@ class ConfigExportCommand extends Command // Resolve workspace $workspace = null; if ($workspaceSlug) { - if (! class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { + if (! class_exists(\Core\Tenant\Models\Workspace::class)) { $this->components->error('Tenant module not installed. Cannot export workspace config.'); return self::FAILURE; } - $workspace = \Core\Mod\Tenant\Models\Workspace::where('slug', $workspaceSlug)->first(); + $workspace = \Core\Tenant\Models\Workspace::where('slug', $workspaceSlug)->first(); if (! $workspace) { $this->components->error("Workspace not found: {$workspaceSlug}"); @@ -99,8 +99,8 @@ class ConfigExportCommand extends Command public function complete(CompletionInput $input, \Symfony\Component\Console\Completion\CompletionSuggestions $suggestions): void { if ($input->mustSuggestOptionValuesFor('workspace')) { - if (class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { - $suggestions->suggestValues(\Core\Mod\Tenant\Models\Workspace::pluck('slug')->toArray()); + if (class_exists(\Core\Tenant\Models\Workspace::class)) { + $suggestions->suggestValues(\Core\Tenant\Models\Workspace::pluck('slug')->toArray()); } } diff --git a/src/Core/Config/Console/ConfigImportCommand.php b/src/Core/Config/Console/ConfigImportCommand.php index 6d1c492..0788948 100644 --- a/src/Core/Config/Console/ConfigImportCommand.php +++ b/src/Core/Config/Console/ConfigImportCommand.php @@ -53,13 +53,13 @@ class ConfigImportCommand extends Command // Resolve workspace $workspace = null; if ($workspaceSlug) { - if (! class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { + if (! class_exists(\Core\Tenant\Models\Workspace::class)) { $this->components->error('Tenant module not installed. Cannot import workspace config.'); return self::FAILURE; } - $workspace = \Core\Mod\Tenant\Models\Workspace::where('slug', $workspaceSlug)->first(); + $workspace = \Core\Tenant\Models\Workspace::where('slug', $workspaceSlug)->first(); if (! $workspace) { $this->components->error("Workspace not found: {$workspaceSlug}"); @@ -177,8 +177,8 @@ class ConfigImportCommand extends Command public function complete(CompletionInput $input, \Symfony\Component\Console\Completion\CompletionSuggestions $suggestions): void { if ($input->mustSuggestOptionValuesFor('workspace')) { - if (class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { - $suggestions->suggestValues(\Core\Mod\Tenant\Models\Workspace::pluck('slug')->toArray()); + if (class_exists(\Core\Tenant\Models\Workspace::class)) { + $suggestions->suggestValues(\Core\Tenant\Models\Workspace::pluck('slug')->toArray()); } } } diff --git a/src/Core/Config/Console/ConfigListCommand.php b/src/Core/Config/Console/ConfigListCommand.php index 1e8086d..97e3e9a 100644 --- a/src/Core/Config/Console/ConfigListCommand.php +++ b/src/Core/Config/Console/ConfigListCommand.php @@ -33,13 +33,13 @@ class ConfigListCommand extends Command $workspace = null; if ($workspaceSlug) { - if (! class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { + if (! class_exists(\Core\Tenant\Models\Workspace::class)) { $this->error('Tenant module not installed. Cannot filter by workspace.'); return self::FAILURE; } - $workspace = \Core\Mod\Tenant\Models\Workspace::where('slug', $workspaceSlug)->first(); + $workspace = \Core\Tenant\Models\Workspace::where('slug', $workspaceSlug)->first(); if (! $workspace) { $this->error("Workspace not found: {$workspaceSlug}"); diff --git a/src/Core/Config/Console/ConfigPrimeCommand.php b/src/Core/Config/Console/ConfigPrimeCommand.php index 4a1c280..c121eca 100644 --- a/src/Core/Config/Console/ConfigPrimeCommand.php +++ b/src/Core/Config/Console/ConfigPrimeCommand.php @@ -36,13 +36,13 @@ class ConfigPrimeCommand extends Command } if ($workspaceSlug) { - if (! class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { + if (! class_exists(\Core\Tenant\Models\Workspace::class)) { $this->error('Tenant module not installed. Cannot prime workspace config.'); return self::FAILURE; } - $workspace = \Core\Mod\Tenant\Models\Workspace::where('slug', $workspaceSlug)->first(); + $workspace = \Core\Tenant\Models\Workspace::where('slug', $workspaceSlug)->first(); if (! $workspace) { $this->error("Workspace not found: {$workspaceSlug}"); @@ -59,7 +59,7 @@ class ConfigPrimeCommand extends Command $this->info('Priming config cache for all workspaces...'); - if (! class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { + if (! class_exists(\Core\Tenant\Models\Workspace::class)) { $this->warn('Tenant module not installed. Only priming system config.'); $config->prime(null); $this->info('System config cached.'); @@ -67,7 +67,7 @@ class ConfigPrimeCommand extends Command return self::SUCCESS; } - $this->withProgressBar(\Core\Mod\Tenant\Models\Workspace::all(), function ($workspace) use ($config) { + $this->withProgressBar(\Core\Tenant\Models\Workspace::all(), function ($workspace) use ($config) { $config->prime($workspace); }); diff --git a/src/Core/Config/Console/ConfigVersionCommand.php b/src/Core/Config/Console/ConfigVersionCommand.php index 73eb15c..fa4140a 100644 --- a/src/Core/Config/Console/ConfigVersionCommand.php +++ b/src/Core/Config/Console/ConfigVersionCommand.php @@ -50,13 +50,13 @@ class ConfigVersionCommand extends Command // Resolve workspace $workspace = null; if ($workspaceSlug) { - if (! class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { + if (! class_exists(\Core\Tenant\Models\Workspace::class)) { $this->components->error('Tenant module not installed. Cannot manage workspace versions.'); return self::FAILURE; } - $workspace = \Core\Mod\Tenant\Models\Workspace::where('slug', $workspaceSlug)->first(); + $workspace = \Core\Tenant\Models\Workspace::where('slug', $workspaceSlug)->first(); if (! $workspace) { $this->components->error("Workspace not found: {$workspaceSlug}"); @@ -409,8 +409,8 @@ class ConfigVersionCommand extends Command } if ($input->mustSuggestOptionValuesFor('workspace')) { - if (class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { - $suggestions->suggestValues(\Core\Mod\Tenant\Models\Workspace::pluck('slug')->toArray()); + if (class_exists(\Core\Tenant\Models\Workspace::class)) { + $suggestions->suggestValues(\Core\Tenant\Models\Workspace::pluck('slug')->toArray()); } } } diff --git a/src/Core/Config/Models/Channel.php b/src/Core/Config/Models/Channel.php index 82fffa2..5d2d34f 100644 --- a/src/Core/Config/Models/Channel.php +++ b/src/Core/Config/Models/Channel.php @@ -72,12 +72,12 @@ class Channel extends Model /** * Workspace this channel belongs to (null = system channel). * - * Requires Core\Mod\Tenant module to be installed. + * Requires Core\Tenant module to be installed. */ public function workspace(): BelongsTo { - if (class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { - return $this->belongsTo(\Core\Mod\Tenant\Models\Workspace::class); + if (class_exists(\Core\Tenant\Models\Workspace::class)) { + return $this->belongsTo(\Core\Tenant\Models\Workspace::class); } // Return a null relationship when Tenant module is not installed diff --git a/src/Core/Config/Models/ConfigResolved.php b/src/Core/Config/Models/ConfigResolved.php index 0ddb44a..0248281 100644 --- a/src/Core/Config/Models/ConfigResolved.php +++ b/src/Core/Config/Models/ConfigResolved.php @@ -67,12 +67,12 @@ class ConfigResolved extends Model /** * Workspace this resolution is for (null = system). * - * Requires Core\Mod\Tenant module to be installed. + * Requires Core\Tenant module to be installed. */ public function workspace(): BelongsTo { - if (class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { - return $this->belongsTo(\Core\Mod\Tenant\Models\Workspace::class); + if (class_exists(\Core\Tenant\Models\Workspace::class)) { + return $this->belongsTo(\Core\Tenant\Models\Workspace::class); } // Return a null relationship when Tenant module is not installed diff --git a/src/Core/Config/Models/ConfigVersion.php b/src/Core/Config/Models/ConfigVersion.php index b97871d..190a65f 100644 --- a/src/Core/Config/Models/ConfigVersion.php +++ b/src/Core/Config/Models/ConfigVersion.php @@ -61,12 +61,12 @@ class ConfigVersion extends Model /** * Workspace this version is for (null = system). * - * Requires Core\Mod\Tenant module to be installed. + * Requires Core\Tenant module to be installed. */ public function workspace(): BelongsTo { - if (class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { - return $this->belongsTo(\Core\Mod\Tenant\Models\Workspace::class); + if (class_exists(\Core\Tenant\Models\Workspace::class)) { + return $this->belongsTo(\Core\Tenant\Models\Workspace::class); } // Return a null relationship when Tenant module is not installed diff --git a/src/Core/Config/Tests/Feature/ConfigServiceTest.php b/src/Core/Config/Tests/Feature/ConfigServiceTest.php index 44f20ae..d9e3bf7 100644 --- a/src/Core/Config/Tests/Feature/ConfigServiceTest.php +++ b/src/Core/Config/Tests/Feature/ConfigServiceTest.php @@ -18,7 +18,7 @@ use Core\Config\Models\ConfigKey; use Core\Config\Models\ConfigProfile; use Core\Config\Models\ConfigResolved; use Core\Config\Models\ConfigValue; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\Workspace; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/src/Core/Config/View/Modal/Admin/ConfigPanel.php b/src/Core/Config/View/Modal/Admin/ConfigPanel.php index cae1ae1..0899053 100644 --- a/src/Core/Config/View/Modal/Admin/ConfigPanel.php +++ b/src/Core/Config/View/Modal/Admin/ConfigPanel.php @@ -74,11 +74,11 @@ class ConfigPanel extends Component #[Computed] public function workspaces(): \Illuminate\Database\Eloquent\Collection { - if (! class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { + if (! class_exists(\Core\Tenant\Models\Workspace::class)) { return new \Illuminate\Database\Eloquent\Collection; } - return \Core\Mod\Tenant\Models\Workspace::orderBy('name')->get(); + return \Core\Tenant\Models\Workspace::orderBy('name')->get(); } #[Computed] @@ -112,8 +112,8 @@ class ConfigPanel extends Component #[Computed] public function selectedWorkspace(): ?object { - if ($this->workspaceId && class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { - return \Core\Mod\Tenant\Models\Workspace::find($this->workspaceId); + if ($this->workspaceId && class_exists(\Core\Tenant\Models\Workspace::class)) { + return \Core\Tenant\Models\Workspace::find($this->workspaceId); } return null; diff --git a/src/Core/Config/View/Modal/Admin/WorkspaceConfig.php b/src/Core/Config/View/Modal/Admin/WorkspaceConfig.php index b469295..8b373ad 100644 --- a/src/Core/Config/View/Modal/Admin/WorkspaceConfig.php +++ b/src/Core/Config/View/Modal/Admin/WorkspaceConfig.php @@ -35,8 +35,8 @@ class WorkspaceConfig extends Component $this->config = $config; // Try to resolve WorkspaceService if Tenant module is installed - if (class_exists(\Core\Mod\Tenant\Services\WorkspaceService::class)) { - $this->workspaceService = app(\Core\Mod\Tenant\Services\WorkspaceService::class); + if (class_exists(\Core\Tenant\Services\WorkspaceService::class)) { + $this->workspaceService = app(\Core\Tenant\Services\WorkspaceService::class); } } diff --git a/src/Core/Database/Seeders/Attributes/SeederAfter.php b/src/Core/Database/Seeders/Attributes/SeederAfter.php index b566fe8..9917701 100644 --- a/src/Core/Database/Seeders/Attributes/SeederAfter.php +++ b/src/Core/Database/Seeders/Attributes/SeederAfter.php @@ -22,7 +22,7 @@ use Attribute; * ## Example * * ```php - * use Core\Mod\Tenant\Database\Seeders\FeatureSeeder; + * use Core\Tenant\Database\Seeders\FeatureSeeder; * * #[SeederAfter(FeatureSeeder::class)] * class PackageSeeder extends Seeder diff --git a/src/Core/Database/Seeders/Attributes/SeederBefore.php b/src/Core/Database/Seeders/Attributes/SeederBefore.php index f26ebff..0b525dc 100644 --- a/src/Core/Database/Seeders/Attributes/SeederBefore.php +++ b/src/Core/Database/Seeders/Attributes/SeederBefore.php @@ -23,7 +23,7 @@ use Attribute; * ## Example * * ```php - * use Core\Mod\Tenant\Database\Seeders\PackageSeeder; + * use Core\Tenant\Database\Seeders\PackageSeeder; * * #[SeederBefore(PackageSeeder::class)] * class FeatureSeeder extends Seeder diff --git a/src/Core/Database/Seeders/CoreDatabaseSeeder.php b/src/Core/Database/Seeders/CoreDatabaseSeeder.php index daf9af5..5987453 100644 --- a/src/Core/Database/Seeders/CoreDatabaseSeeder.php +++ b/src/Core/Database/Seeders/CoreDatabaseSeeder.php @@ -292,7 +292,7 @@ class CoreDatabaseSeeder extends Seeder * Check if a seeder matches a pattern. * * Patterns can be: - * - Full class name: Core\Mod\Tenant\Database\Seeders\FeatureSeeder + * - Full class name: Core\Tenant\Database\Seeders\FeatureSeeder * - Short name: FeatureSeeder * - Partial match: Feature (matches FeatureSeeder) * diff --git a/src/Core/Front/Admin/AdminMenuRegistry.php b/src/Core/Front/Admin/AdminMenuRegistry.php index 24f9da7..ab3f3c0 100644 --- a/src/Core/Front/Admin/AdminMenuRegistry.php +++ b/src/Core/Front/Admin/AdminMenuRegistry.php @@ -92,7 +92,7 @@ class AdminMenuRegistry protected int $cacheTtl; /** - * EntitlementService instance (Core\Mod\Tenant\Services\EntitlementService when available). + * EntitlementService instance (Core\Tenant\Services\EntitlementService when available). */ protected ?object $entitlements = null; @@ -108,8 +108,8 @@ class AdminMenuRegistry public function __construct(?object $entitlements = null, ?IconValidator $iconValidator = null) { - if ($entitlements === null && class_exists(\Core\Mod\Tenant\Services\EntitlementService::class)) { - $this->entitlements = app(\Core\Mod\Tenant\Services\EntitlementService::class); + if ($entitlements === null && class_exists(\Core\Tenant\Services\EntitlementService::class)) { + $this->entitlements = app(\Core\Tenant\Services\EntitlementService::class); } else { $this->entitlements = $entitlements; } diff --git a/src/Core/Front/Admin/View/Components/Sidemenu.php b/src/Core/Front/Admin/View/Components/Sidemenu.php index 2987021..b6f168e 100644 --- a/src/Core/Front/Admin/View/Components/Sidemenu.php +++ b/src/Core/Front/Admin/View/Components/Sidemenu.php @@ -39,12 +39,12 @@ class Sidemenu extends Component // Use current workspace from session, not default $workspace = null; - if (class_exists(\Core\Mod\Tenant\Services\WorkspaceService::class)) { - $workspace = app(\Core\Mod\Tenant\Services\WorkspaceService::class)->currentModel(); + if (class_exists(\Core\Tenant\Services\WorkspaceService::class)) { + $workspace = app(\Core\Tenant\Services\WorkspaceService::class)->currentModel(); } $isAdmin = false; - if (class_exists(\Core\Mod\Tenant\Models\User::class) && $user instanceof \Core\Mod\Tenant\Models\User) { + if (class_exists(\Core\Tenant\Models\User::class) && $user instanceof \Core\Tenant\Models\User) { $isAdmin = $user->isHades(); } diff --git a/src/Core/Front/Web/Middleware/FindDomainRecord.php b/src/Core/Front/Web/Middleware/FindDomainRecord.php index 0817c9e..b634723 100644 --- a/src/Core/Front/Web/Middleware/FindDomainRecord.php +++ b/src/Core/Front/Web/Middleware/FindDomainRecord.php @@ -77,19 +77,19 @@ class FindDomainRecord /** * Resolve workspace from the domain. * - * Requires Core\Mod\Tenant module to be installed. + * Requires Core\Tenant module to be installed. * * @return object|null Workspace model instance or null */ protected function resolveWorkspaceFromDomain(string $host): ?object { // Check if Tenant module is installed - if (! class_exists(\Core\Mod\Tenant\Models\Workspace::class)) { + if (! class_exists(\Core\Tenant\Models\Workspace::class)) { return null; } // Check for custom domain first - $workspace = \Core\Mod\Tenant\Models\Workspace::where('domain', $host)->first(); + $workspace = \Core\Tenant\Models\Workspace::where('domain', $host)->first(); if ($workspace) { return $workspace; } @@ -104,7 +104,7 @@ class FindDomainRecord if (count($parts) >= 1) { $workspaceSlug = $parts[0]; - return \Core\Mod\Tenant\Models\Workspace::where('slug', $workspaceSlug) + return \Core\Tenant\Models\Workspace::where('slug', $workspaceSlug) ->where('is_active', true) ->first(); } diff --git a/src/Core/Tests/Feature/AdminRouteSmokeTest.php b/src/Core/Tests/Feature/AdminRouteSmokeTest.php index 1b5e7a6..b84b20a 100644 --- a/src/Core/Tests/Feature/AdminRouteSmokeTest.php +++ b/src/Core/Tests/Feature/AdminRouteSmokeTest.php @@ -16,9 +16,9 @@ declare(strict_types=1); * No manual route lists to maintain - new routes are tested automatically. */ -use Core\Mod\Tenant\Enums\UserTier; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Enums\UserTier; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; use Illuminate\Support\Facades\Route; uses()->group('admin-smoke'); diff --git a/src/Core/Tests/Feature/DatabaseMigrationTest.php b/src/Core/Tests/Feature/DatabaseMigrationTest.php index 5022764..79e40da 100644 --- a/src/Core/Tests/Feature/DatabaseMigrationTest.php +++ b/src/Core/Tests/Feature/DatabaseMigrationTest.php @@ -91,7 +91,7 @@ describe('Database Migrations', function () { it('critical seeder classes exist in modules', function () { // Check for module seeders - these live in Mod namespaces $moduleSeederClasses = [ - \Core\Mod\Tenant\Database\Seeders\PackageSeeder::class, + \Core\Tenant\Database\Seeders\PackageSeeder::class, \Core\Mod\Commerce\Database\Seeders\TaxRateSeeder::class, ]; diff --git a/src/Core/Tests/Feature/ErrorPagesTest.php b/src/Core/Tests/Feature/ErrorPagesTest.php index 2cd4355..f18291e 100644 --- a/src/Core/Tests/Feature/ErrorPagesTest.php +++ b/src/Core/Tests/Feature/ErrorPagesTest.php @@ -87,7 +87,7 @@ describe('404 Error Page', function () { describe('403 Error Page', function () { it('returns 403 for forbidden access', function () { // Create a regular user (not hades) - $user = \Core\Mod\Tenant\Models\User::factory()->create([ + $user = \Core\Tenant\Models\User::factory()->create([ 'account_type' => 'apollo', ]); diff --git a/src/Core/Tests/Feature/ImageOptimizerTest.php b/src/Core/Tests/Feature/ImageOptimizerTest.php index 5fba8f2..48dc07c 100644 --- a/src/Core/Tests/Feature/ImageOptimizerTest.php +++ b/src/Core/Tests/Feature/ImageOptimizerTest.php @@ -12,8 +12,8 @@ pest()->group('slow'); use Core\Media\Image\ImageOptimization; use Core\Media\Image\ImageOptimizer; use Core\Media\Image\OptimizationResult; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; use Illuminate\Http\UploadedFile; use Illuminate\Support\Facades\Storage; diff --git a/src/Core/Tests/Feature/PerformanceBaselineTest.php b/src/Core/Tests/Feature/PerformanceBaselineTest.php index 00e3559..269b83e 100644 --- a/src/Core/Tests/Feature/PerformanceBaselineTest.php +++ b/src/Core/Tests/Feature/PerformanceBaselineTest.php @@ -22,7 +22,7 @@ declare(strict_types=1); * - Social: <600ms (acceptable: <1000ms) */ -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; use Illuminate\Support\Facades\DB; beforeEach(function () { diff --git a/src/Core/Tests/Feature/SecurityFixesTest.php b/src/Core/Tests/Feature/SecurityFixesTest.php index e0ebdbe..53ba7cb 100644 --- a/src/Core/Tests/Feature/SecurityFixesTest.php +++ b/src/Core/Tests/Feature/SecurityFixesTest.php @@ -19,10 +19,10 @@ use Core\Mod\Analytics\Models\AnalyticsGoal; use Core\Mod\Analytics\Models\AnalyticsWebsite; use Core\Mod\Commerce\Models\Order; use Core\Mod\Commerce\Models\Payment; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Services\EntitlementService; uses(\Illuminate\Foundation\Testing\RefreshDatabase::class); diff --git a/src/Core/Tests/Feature/SecurityHeadersTest.php b/src/Core/Tests/Feature/SecurityHeadersTest.php index 3d92b7c..5ff7989 100644 --- a/src/Core/Tests/Feature/SecurityHeadersTest.php +++ b/src/Core/Tests/Feature/SecurityHeadersTest.php @@ -74,7 +74,7 @@ describe('Security Headers on Public Routes', function () { describe('Security Headers on Authenticated Routes', function () { beforeEach(function () { - $this->user = \Core\Mod\Tenant\Models\User::factory()->create(); + $this->user = \Core\Tenant\Models\User::factory()->create(); }); it('has security headers on hub routes', function () { @@ -98,7 +98,7 @@ describe('Security Headers on Authenticated Routes', function () { describe('Security Headers on API Routes', function () { beforeEach(function () { - $this->user = \Core\Mod\Tenant\Models\User::factory()->create([ + $this->user = \Core\Tenant\Models\User::factory()->create([ 'account_type' => 'hades', ]); }); diff --git a/src/Core/Tests/Feature/ValidationRulesTest.php b/src/Core/Tests/Feature/ValidationRulesTest.php index f775890..86a264f 100644 --- a/src/Core/Tests/Feature/ValidationRulesTest.php +++ b/src/Core/Tests/Feature/ValidationRulesTest.php @@ -11,9 +11,9 @@ declare(strict_types=1); use Core\Helpers\Rules\HexRule; use Core\Mod\Social\Enums\ResourceStatus; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Rules\CheckUserPasswordRule; -use Core\Mod\Tenant\Rules\ResourceStatusRule; +use Core\Tenant\Models\User; +use Core\Tenant\Rules\CheckUserPasswordRule; +use Core\Tenant\Rules\ResourceStatusRule; use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Validator; diff --git a/src/Core/config.php b/src/Core/config.php index 710ffe2..2163e52 100644 --- a/src/Core/config.php +++ b/src/Core/config.php @@ -256,7 +256,7 @@ return [ ], // Seeder classes to exclude (fully qualified class names) - // Example: [Core\Mod\Tenant\Database\Seeders\DemoWorkspaceSeeder::class] + // Example: [Core\Tenant\Database\Seeders\DemoWorkspaceSeeder::class] 'exclude' => [], ], ]; diff --git a/src/Mod/Trees/Listeners/PlantTreeForAgentReferral.php b/src/Mod/Trees/Listeners/PlantTreeForAgentReferral.php index 413c2a2..56a4998 100644 --- a/src/Mod/Trees/Listeners/PlantTreeForAgentReferral.php +++ b/src/Mod/Trees/Listeners/PlantTreeForAgentReferral.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace Core\Mod\Trees\Listeners; use Core\Helpers\PrivacyHelper; -use Core\Mod\Tenant\Controllers\ReferralController; -use Core\Mod\Tenant\Models\AgentReferralBonus; +use Core\Tenant\Controllers\ReferralController; +use Core\Tenant\Models\AgentReferralBonus; use Core\Mod\Trees\Models\TreePlanting; use Illuminate\Auth\Events\Registered; use Illuminate\Support\Facades\Log; diff --git a/src/Mod/Trees/Middleware/IncludeAgentContext.php b/src/Mod/Trees/Middleware/IncludeAgentContext.php index 2a650fe..e8d7b14 100644 --- a/src/Mod/Trees/Middleware/IncludeAgentContext.php +++ b/src/Mod/Trees/Middleware/IncludeAgentContext.php @@ -5,8 +5,8 @@ declare(strict_types=1); namespace Core\Mod\Trees\Middleware; use Closure; -use Core\Mod\Agentic\Services\AgentDetection; -use Core\Mod\Agentic\Support\AgentIdentity; +use Core\Agentic\Services\AgentDetection; +use Core\Agentic\Support\AgentIdentity; use Core\Mod\Trees\Models\TreePlanting; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; diff --git a/src/Mod/Trees/Models/TreePlanting.php b/src/Mod/Trees/Models/TreePlanting.php index 7a17600..c2f5de1 100644 --- a/src/Mod/Trees/Models/TreePlanting.php +++ b/src/Mod/Trees/Models/TreePlanting.php @@ -4,7 +4,7 @@ declare(strict_types=1); namespace Core\Mod\Trees\Models; -use Core\Mod\Tenant\Concerns\BelongsToWorkspace; +use Core\Tenant\Concerns\BelongsToWorkspace; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; diff --git a/src/Mod/Trees/Routes/web.php b/src/Mod/Trees/Routes/web.php index 3bae36b..3268dc0 100644 --- a/src/Mod/Trees/Routes/web.php +++ b/src/Mod/Trees/Routes/web.php @@ -14,6 +14,6 @@ Route::middleware(['web'])->group(function () { Route::get('/trees', TreesIndex::class)->name('trees'); // Agent referral tracking (Trees for Agents) - Route::get('/ref/{provider}/{model?}', [\Core\Mod\Tenant\Controllers\ReferralController::class, 'track']) + Route::get('/ref/{provider}/{model?}', [\Core\Tenant\Controllers\ReferralController::class, 'track']) ->name('referral.agent'); }); diff --git a/src/Mod/Trees/Tests/Feature/DailyLimitAndBonusTest.php b/src/Mod/Trees/Tests/Feature/DailyLimitAndBonusTest.php index 3300079..9e69871 100644 --- a/src/Mod/Trees/Tests/Feature/DailyLimitAndBonusTest.php +++ b/src/Mod/Trees/Tests/Feature/DailyLimitAndBonusTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -use Core\Mod\Tenant\Models\AgentReferralBonus; +use Core\Tenant\Models\AgentReferralBonus; use Core\Mod\Trees\Models\TreePlanting; use Core\Mod\Trees\Models\TreeReserve; diff --git a/src/Mod/Trees/Tests/Feature/SignupReferralTest.php b/src/Mod/Trees/Tests/Feature/SignupReferralTest.php index e0698ff..f232f4a 100644 --- a/src/Mod/Trees/Tests/Feature/SignupReferralTest.php +++ b/src/Mod/Trees/Tests/Feature/SignupReferralTest.php @@ -2,7 +2,7 @@ declare(strict_types=1); -use Core\Mod\Tenant\Models\User; +use Core\Tenant\Models\User; use Core\Mod\Trees\Listeners\PlantTreeForAgentReferral; use Core\Mod\Trees\Models\TreePlanting; use Core\Mod\Trees\Models\TreeReserve; diff --git a/src/Mod/Trees/Tests/Feature/SubscriberMonthlyCommandTest.php b/src/Mod/Trees/Tests/Feature/SubscriberMonthlyCommandTest.php index dac9a1d..9482a7a 100644 --- a/src/Mod/Trees/Tests/Feature/SubscriberMonthlyCommandTest.php +++ b/src/Mod/Trees/Tests/Feature/SubscriberMonthlyCommandTest.php @@ -3,10 +3,10 @@ declare(strict_types=1); use Core\Mod\Commerce\Models\Subscription; -use Core\Mod\Tenant\Models\Package; -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; -use Core\Mod\Tenant\Models\WorkspacePackage; +use Core\Tenant\Models\Package; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; +use Core\Tenant\Models\WorkspacePackage; use Core\Mod\Trees\Models\TreePlanting; use Core\Mod\Trees\Models\TreeReserve; diff --git a/src/Mod/Trees/Tests/Feature/TreePlantingTest.php b/src/Mod/Trees/Tests/Feature/TreePlantingTest.php index a9ad100..e05e61e 100644 --- a/src/Mod/Trees/Tests/Feature/TreePlantingTest.php +++ b/src/Mod/Trees/Tests/Feature/TreePlantingTest.php @@ -2,8 +2,8 @@ declare(strict_types=1); -use Core\Mod\Tenant\Models\User; -use Core\Mod\Tenant\Models\Workspace; +use Core\Tenant\Models\User; +use Core\Tenant\Models\Workspace; use Core\Mod\Trees\Models\TreePlanting; use Core\Mod\Trees\Models\TreePlantingStats; use Core\Mod\Trees\Models\TreeReserve; diff --git a/src/Mod/Trees/Tests/Unit/AgentDetectionTest.php b/src/Mod/Trees/Tests/Unit/AgentDetectionTest.php index 2f47bd9..e0f1dee 100644 --- a/src/Mod/Trees/Tests/Unit/AgentDetectionTest.php +++ b/src/Mod/Trees/Tests/Unit/AgentDetectionTest.php @@ -2,8 +2,8 @@ declare(strict_types=1); -use Core\Mod\Agentic\Services\AgentDetection; -use Core\Mod\Agentic\Support\AgentIdentity; +use Core\Agentic\Services\AgentDetection; +use Core\Agentic\Support\AgentIdentity; use Illuminate\Http\Request; describe('AgentDetection Service', function () { diff --git a/tests/Feature/AdminMenuRegistryTest.php b/tests/Feature/AdminMenuRegistryTest.php index 858ded9..3b1a49b 100644 --- a/tests/Feature/AdminMenuRegistryTest.php +++ b/tests/Feature/AdminMenuRegistryTest.php @@ -7,7 +7,7 @@ namespace Core\Tests\Feature; use Core\Front\Admin\AdminMenuRegistry; use Core\Front\Admin\Concerns\HasMenuPermissions; use Core\Front\Admin\Contracts\AdminMenuProvider; -use Core\Mod\Tenant\Services\EntitlementService; +use Core\Tenant\Services\EntitlementService; use Core\Tests\TestCase; use Mockery;