style updates

Modules/Sites/Concerns/BelongsToSites.php

@@ -1,24 +1,32 @@
 <?php
+
 namespace Modules\Sites\Concerns;
+
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Modules\Sites\Models\Site;
 use Modules\Sites\Services\SiteManager;
+
 trait BelongsToSites
 {
     public function sites(): MorphToMany
     {
         return $this->morphToMany(Site::class, 'content', 'site_content', 'content_id', 'site_id')->withPivot('is_primary')->withTimestamps();
     }
+
     public function scopeForCurrentSite(Builder $query): Builder
     {
         $site = app(SiteManager::class)->current();
+
         return $site ? $query->whereHas('sites', fn (Builder $sites) => $sites->whereKey($site->id)) : $query;
     }
+
     public function assignToSite(Site|int $site, bool $primary = false): void
     {
         $id = $site instanceof Site ? $site->getKey() : $site;
-        if ($primary) { $this->sites()->updateExistingPivot($this->sites()->pluck('sites.id'), ['is_primary' => false]); }
+        if ($primary) {
+            $this->sites()->updateExistingPivot($this->sites()->pluck('sites.id'), ['is_primary' => false]);
+        }
         $this->sites()->syncWithoutDetaching([$id => ['is_primary' => $primary]]);
     }
 }

Modules/Sites/Config/config.php

@@ -1,11 +1,16 @@
 <?php
+
+use Modules\Blog\Models\Blog;
+use Modules\News\Models\News;
+use Modules\Pages\Models\Page;
+
 return [
     'fallback_to_default' => true,
     'session_key' => 'platform_site_id',
     'central_domains' => array_values(array_filter(explode(',', (string) env('CENTRAL_DOMAINS', '')))),
     'content_types' => [
-        'pages' => Modules\Pages\Models\Page::class,
-        'blog' => Modules\Blog\Models\Blog::class,
-        'news' => Modules\News\Models\News::class,
+        'pages' => Page::class,
+        'blog' => Blog::class,
+        'news' => News::class,
     ],
 ];

Modules/Sites/Contracts/SiteAwareModule.php

@@ -1,7 +1,10 @@
 <?php
+
 namespace Modules\Sites\Contracts;
+
 interface SiteAwareModule
 {
     public function supportsMultisite(): bool;
+
     public function sharedAcrossSites(): bool;
 }

Modules/Sites/Database/Migrations/2026_07_24_070000_create_multisite_tables.php

@@ -1,33 +1,69 @@
 <?php
+
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+
 return new class extends Migration
 {
     public function up(): void
     {
         Schema::create('sites', function (Blueprint $table): void {
-            $table->id(); $table->string('name'); $table->string('key')->unique(); $table->string('status')->default('active');
-            $table->string('theme')->nullable(); $table->string('default_locale', 20)->default('en'); $table->string('timezone')->default('UTC');
-            $table->boolean('is_default')->default(false); $table->timestamps();
+            $table->id();
+            $table->string('name');
+            $table->string('key')->unique();
+            $table->string('status')->default('active');
+            $table->string('theme')->nullable();
+            $table->string('default_locale', 20)->default('en');
+            $table->string('timezone')->default('UTC');
+            $table->boolean('is_default')->default(false);
+            $table->timestamps();
         });
         Schema::create('site_domains', function (Blueprint $table): void {
-            $table->id(); $table->foreignId('site_id')->constrained()->cascadeOnDelete(); $table->string('domain')->unique();
-            $table->boolean('is_primary')->default(false); $table->boolean('redirect_to_primary')->default(false); $table->boolean('force_https')->default(true); $table->boolean('is_active')->default(true); $table->timestamps();
+            $table->id();
+            $table->foreignId('site_id')->constrained()->cascadeOnDelete();
+            $table->string('domain')->unique();
+            $table->boolean('is_primary')->default(false);
+            $table->boolean('redirect_to_primary')->default(false);
+            $table->boolean('force_https')->default(true);
+            $table->boolean('is_active')->default(true);
+            $table->timestamps();
         });
         Schema::create('site_settings', function (Blueprint $table): void {
-            $table->id(); $table->foreignId('site_id')->constrained()->cascadeOnDelete(); $table->string('group')->default('general'); $table->string('key'); $table->longText('value')->nullable(); $table->string('type')->default('string'); $table->timestamps(); $table->unique(['site_id','key']);
+            $table->id();
+            $table->foreignId('site_id')->constrained()->cascadeOnDelete();
+            $table->string('group')->default('general');
+            $table->string('key');
+            $table->longText('value')->nullable();
+            $table->string('type')->default('string');
+            $table->timestamps();
+            $table->unique(['site_id', 'key']);
         });
         Schema::create('site_content', function (Blueprint $table): void {
-            $table->id(); $table->foreignId('site_id')->constrained()->cascadeOnDelete(); $table->string('content_type'); $table->unsignedBigInteger('content_id'); $table->boolean('is_primary')->default(false); $table->timestamps();
-            $table->unique(['site_id','content_type','content_id']); $table->index(['content_type','content_id']);
+            $table->id();
+            $table->foreignId('site_id')->constrained()->cascadeOnDelete();
+            $table->string('content_type');
+            $table->unsignedBigInteger('content_id');
+            $table->boolean('is_primary')->default(false);
+            $table->timestamps();
+            $table->unique(['site_id', 'content_type', 'content_id']);
+            $table->index(['content_type', 'content_id']);
         });
         Schema::create('site_user', function (Blueprint $table): void {
-            $table->foreignId('site_id')->constrained()->cascadeOnDelete(); $table->foreignId('user_id')->constrained()->cascadeOnDelete(); $table->string('role')->default('editor'); $table->timestamps(); $table->primary(['site_id','user_id']);
+            $table->foreignId('site_id')->constrained()->cascadeOnDelete();
+            $table->foreignId('user_id')->constrained()->cascadeOnDelete();
+            $table->string('role')->default('editor');
+            $table->timestamps();
+            $table->primary(['site_id', 'user_id']);
         });
     }
+
     public function down(): void
     {
-        Schema::dropIfExists('site_user'); Schema::dropIfExists('site_content'); Schema::dropIfExists('site_settings'); Schema::dropIfExists('site_domains'); Schema::dropIfExists('sites');
+        Schema::dropIfExists('site_user');
+        Schema::dropIfExists('site_content');
+        Schema::dropIfExists('site_settings');
+        Schema::dropIfExists('site_domains');
+        Schema::dropIfExists('sites');
     }
 };

Modules/Sites/Database/Seeders/SiteSeeder.php

@@ -1,13 +1,16 @@
 <?php
+
 namespace Modules\Sites\Database\Seeders;
+
 use Illuminate\Database\Seeder;
 use Modules\Sites\Models\Site;
+
 final class SiteSeeder extends Seeder
 {
     public function run(): void
     {
         $host = parse_url((string) config('app.url'), PHP_URL_HOST) ?: 'localhost';
-        $site = Site::query()->updateOrCreate(['key' => 'default'], ['name'=>'Default Site','status'=>'active','default_locale'=>config('app.locale','en'),'timezone'=>config('app.timezone','UTC'),'is_default'=>true]);
-        $site->domains()->updateOrCreate(['domain'=>$host], ['is_primary'=>true,'redirect_to_primary'=>false,'force_https'=>str_starts_with((string) config('app.url'), 'https://'),'is_active'=>true]);
+        $site = Site::query()->updateOrCreate(['key' => 'default'], ['name' => 'Default Site', 'status' => 'active', 'default_locale' => config('app.locale', 'en'), 'timezone' => config('app.timezone', 'UTC'), 'is_default' => true]);
+        $site->domains()->updateOrCreate(['domain' => $host], ['is_primary' => true, 'redirect_to_primary' => false, 'force_https' => str_starts_with((string) config('app.url'), 'https://'), 'is_active' => true]);
     }
 }

Modules/Sites/Http/Controllers/DomainController.php

@@ -1,19 +1,33 @@
 <?php
+
 namespace Modules\Sites\Http\Controllers;
+
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Illuminate\Validation\Rule;
 use Modules\Sites\Models\Site;
 use Modules\Sites\Models\SiteDomain;
+
 final class DomainController extends Controller
 {
     public function store(Request $request, Site $site): RedirectResponse
     {
-        $data=$request->validate(['domain'=>['required','string','max:255','regex:/^[a-z0-9.-]+$/i',Rule::unique('site_domains','domain')],'is_primary'=>['sometimes','boolean'],'redirect_to_primary'=>['sometimes','boolean'],'force_https'=>['sometimes','boolean'],'is_active'=>['sometimes','boolean']]);
-        if ($request->boolean('is_primary')) { $site->domains()->update(['is_primary'=>false]); }
-        $site->domains()->create($data + ['is_primary'=>$request->boolean('is_primary'),'redirect_to_primary'=>$request->boolean('redirect_to_primary'),'force_https'=>$request->boolean('force_https'),'is_active'=>$request->boolean('is_active', true)]);
-        return back()->with('success','Domain added.');
+        $data = $request->validate(['domain' => ['required', 'string', 'max:255', 'regex:/^[a-z0-9.-]+$/i', Rule::unique('site_domains', 'domain')], 'is_primary' => ['sometimes', 'boolean'], 'redirect_to_primary' => ['sometimes', 'boolean'], 'force_https' => ['sometimes', 'boolean'], 'is_active' => ['sometimes', 'boolean']]);
+        if ($request->boolean('is_primary')) {
+            $site->domains()->update(['is_primary' => false]);
+        }
+        $site->domains()->create($data + ['is_primary' => $request->boolean('is_primary'), 'redirect_to_primary' => $request->boolean('redirect_to_primary'), 'force_https' => $request->boolean('force_https'), 'is_active' => $request->boolean('is_active', true)]);
+
+        return back()->with('success', 'Domain added.');
+    }
+
+    public function destroy(Site $site, SiteDomain $domain): RedirectResponse
+    {
+        abort_unless($domain->site_id === $site->id, 404);
+        abort_if($domain->is_primary && $site->domains()->count() === 1, 422, 'A site must retain a domain.');
+        $domain->delete();
+
+        return back()->with('success', 'Domain removed.');
     }
-    public function destroy(Site $site, SiteDomain $domain): RedirectResponse { abort_unless($domain->site_id===$site->id,404); abort_if($domain->is_primary && $site->domains()->count()===1,422,'A site must retain a domain.'); $domain->delete(); return back()->with('success','Domain removed.'); }
 }

Modules/Sites/Http/Controllers/SiteController.php

@@ -1,5 +1,7 @@
 <?php
+
 namespace Modules\Sites\Http\Controllers;
+
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
@@ -7,21 +9,60 @@ use Illuminate\Support\Facades\DB;
 use Illuminate\Validation\Rule;
 use Illuminate\View\View;
 use Modules\Sites\Models\Site;
+
 final class SiteController extends Controller
 {
-    public function index(): View { return view('sites::admin.sites.index', ['sites'=>Site::query()->with('domains')->orderByDesc('is_default')->orderBy('name')->paginate(20)]); }
-    public function create(): View { return view('sites::admin.sites.form', ['site'=>new Site]); }
-    public function store(Request $request): RedirectResponse { $site = Site::query()->create($this->validated($request)); return redirect()->route('administration.sites.edit', $site)->with('success','Site created.'); }
-    public function edit(Site $site): View { return view('sites::admin.sites.form', ['site'=>$site->load(['domains','settings'])]); }
+    public function index(): View
+    {
+        return view('sites::admin.sites.index', ['sites' => Site::query()->with('domains')->orderByDesc('is_default')->orderBy('name')->paginate(20)]);
+    }
+
+    public function create(): View
+    {
+        return view('sites::admin.sites.form', ['site' => new Site]);
+    }
+
+    public function store(Request $request): RedirectResponse
+    {
+        $site = Site::query()->create($this->validated($request));
+
+        return redirect()->route('administration.sites.edit', $site)->with('success', 'Site created.');
+    }
+
+    public function edit(Site $site): View
+    {
+        return view('sites::admin.sites.form', ['site' => $site->load(['domains', 'settings'])]);
+    }
+
     public function update(Request $request, Site $site): RedirectResponse
     {
-        DB::transaction(function () use ($request,$site): void { $data=$this->validated($request,$site); if ($data['is_default']) { Site::query()->whereKeyNot($site->id)->update(['is_default'=>false]); } $site->update($data); });
-        return back()->with('success','Site updated.');
+        DB::transaction(function () use ($request, $site): void {
+            $data = $this->validated($request, $site);
+            if ($data['is_default']) {
+                Site::query()->whereKeyNot($site->id)->update(['is_default' => false]);
+            } $site->update($data);
+        });
+
+        return back()->with('success', 'Site updated.');
     }
-    public function destroy(Site $site): RedirectResponse { abort_if($site->is_default, 422, 'The default site cannot be deleted.'); $site->delete(); return redirect()->route('administration.sites.index')->with('success','Site deleted.'); }
-    public function switch(Request $request, Site $site): RedirectResponse { $request->session()->put(config('sites.session_key'), $site->id); return back()->with('success', "Site context changed to {$site->name}."); }
-    private function validated(Request $request, ?Site $site=null): array
+
+    public function destroy(Site $site): RedirectResponse
     {
-        return $request->validate(['name'=>['required','string','max:150'],'key'=>['required','alpha_dash','max:100',Rule::unique('sites','key')->ignore($site)],'status'=>['required',Rule::in(['active','inactive','maintenance'])],'theme'=>['nullable','string','max:100'],'default_locale'=>['required','string','max:20'],'timezone'=>['required','timezone'],'is_default'=>['sometimes','boolean']]) + ['is_default'=>$request->boolean('is_default')];
+        abort_if($site->is_default, 422, 'The default site cannot be deleted.');
+        $site->delete();
+
+        return redirect()->route('administration.sites.index')->with('success', 'Site deleted.');
+    }
+
+    public function switch(Request $request, Site $site): RedirectResponse
+    {
+        $request->session()->put(config('sites.session_key'), $site->id);
+
+        return back()->with('success', "Site context changed to {$site->name}.");
+    }
+
+    private function validated(Request $request, ?Site $site = null): array
+    {
+        return $request->validate(['name' => ['required', 'string', 'max:150'], 'key' => ['required', 'alpha_dash', 'max:100', Rule::unique('sites', 'key')->ignore($site)], 'status' => ['required', Rule::in(['active', 'inactive', 'maintenance'])], 'theme' => ['nullable', 'string', 'max:100'], 'default_locale' => ['required', 'string', 'max:20'], 'timezone' => ['required', 'timezone'], 'is_default' => ['sometimes', 'boolean']]) + ['is_default' => $request->boolean('is_default')];
     }
 }

Modules/Sites/Http/Middleware/ResolveSite.php

@@ -1,12 +1,16 @@
 <?php
+
 namespace Modules\Sites\Http\Middleware;
+
 use Closure;
 use Illuminate\Http\Request;
 use Modules\Sites\Services\SiteManager;
 use Symfony\Component\HttpFoundation\Response;
+
 final class ResolveSite
 {
     public function __construct(private readonly SiteManager $sites) {}
+
     public function handle(Request $request, Closure $next): Response
     {
         $site = $this->sites->resolve($request);
@@ -14,6 +18,7 @@ final class ResolveSite
             config(['app.url' => $request->getSchemeAndHttpHost(), 'app.timezone' => $site->timezone ?: config('app.timezone')]);
             date_default_timezone_set((string) config('app.timezone'));
         }
+
         return $next($request);
     }
 }

Modules/Sites/Models/Site.php

@@ -1,19 +1,44 @@
 <?php
+
 namespace Modules\Sites\Models;
+
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+
 final class Site extends Model
 {
-    protected $fillable = ['name','key','status','theme','default_locale','timezone','is_default'];
-    protected function casts(): array { return ['is_default' => 'boolean']; }
-    public function domains(): HasMany { return $this->hasMany(SiteDomain::class); }
-    public function settings(): HasMany { return $this->hasMany(SiteSetting::class); }
-    public function assignments(): HasMany { return $this->hasMany(SiteContent::class); }
-    public function scopeActive(Builder $query): Builder { return $query->where('status', 'active'); }
+    protected $fillable = ['name', 'key', 'status', 'theme', 'default_locale', 'timezone', 'is_default'];
+
+    protected function casts(): array
+    {
+        return ['is_default' => 'boolean'];
+    }
+
+    public function domains(): HasMany
+    {
+        return $this->hasMany(SiteDomain::class);
+    }
+
+    public function settings(): HasMany
+    {
+        return $this->hasMany(SiteSetting::class);
+    }
+
+    public function assignments(): HasMany
+    {
+        return $this->hasMany(SiteContent::class);
+    }
+
+    public function scopeActive(Builder $query): Builder
+    {
+        return $query->where('status', 'active');
+    }
+
     public function setting(string $key, mixed $default = null): mixed
     {
         $setting = $this->relationLoaded('settings') ? $this->settings->firstWhere('key', $key) : $this->settings()->where('key', $key)->first();
+
         return $setting?->typedValue() ?? $default;
     }
 }

Modules/Sites/Models/SiteContent.php

@@ -1,13 +1,29 @@
 <?php
+
 namespace Modules\Sites\Models;
+
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
+
 final class SiteContent extends Model
 {
     protected $table = 'site_content';
-    protected $fillable = ['site_id','content_type','content_id','is_primary'];
-    protected function casts(): array { return ['is_primary'=>'boolean']; }
-    public function site(): BelongsTo { return $this->belongsTo(Site::class); }
-    public function content(): MorphTo { return $this->morphTo(__FUNCTION__, 'content_type', 'content_id'); }
+
+    protected $fillable = ['site_id', 'content_type', 'content_id', 'is_primary'];
+
+    protected function casts(): array
+    {
+        return ['is_primary' => 'boolean'];
+    }
+
+    public function site(): BelongsTo
+    {
+        return $this->belongsTo(Site::class);
+    }
+
+    public function content(): MorphTo
+    {
+        return $this->morphTo(__FUNCTION__, 'content_type', 'content_id');
+    }
 }

Modules/Sites/Models/SiteDomain.php

@@ -1,10 +1,21 @@
 <?php
+
 namespace Modules\Sites\Models;
+
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
 final class SiteDomain extends Model
 {
-    protected $fillable = ['site_id','domain','is_primary','redirect_to_primary','force_https','is_active'];
-    protected function casts(): array { return ['is_primary'=>'boolean','redirect_to_primary'=>'boolean','force_https'=>'boolean','is_active'=>'boolean']; }
-    public function site(): BelongsTo { return $this->belongsTo(Site::class); }
+    protected $fillable = ['site_id', 'domain', 'is_primary', 'redirect_to_primary', 'force_https', 'is_active'];
+
+    protected function casts(): array
+    {
+        return ['is_primary' => 'boolean', 'redirect_to_primary' => 'boolean', 'force_https' => 'boolean', 'is_active' => 'boolean'];
+    }
+
+    public function site(): BelongsTo
+    {
+        return $this->belongsTo(Site::class);
+    }
 }

Modules/Sites/Models/SiteSetting.php

@@ -1,11 +1,19 @@
 <?php
+
 namespace Modules\Sites\Models;
+
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
 final class SiteSetting extends Model
 {
-    protected $fillable = ['site_id','group','key','value','type'];
-    public function site(): BelongsTo { return $this->belongsTo(Site::class); }
+    protected $fillable = ['site_id', 'group', 'key', 'value', 'type'];
+
+    public function site(): BelongsTo
+    {
+        return $this->belongsTo(Site::class);
+    }
+
     public function typedValue(): mixed
     {
         return match ($this->type) {

Modules/Sites/Providers/RouteServiceProvider.php

@@ -1,8 +1,15 @@
 <?php
+
 namespace Modules\Sites\Providers;
+
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Support\Facades\Route;
+
 final class RouteServiceProvider extends ServiceProvider
 {
-    public function boot(): void { parent::boot(); Route::middleware('web')->group(module_path('Sites', 'Routes/web.php')); }
+    public function boot(): void
+    {
+        parent::boot();
+        Route::middleware('web')->group(module_path('Sites', 'Routes/web.php'));
+    }
 }

Modules/Sites/Providers/SitesServiceProvider.php

@@ -1,7 +1,10 @@
 <?php
+
 namespace Modules\Sites\Providers;
+
 use Illuminate\Support\ServiceProvider;
 use Modules\Sites\Services\SiteManager;
+
 final class SitesServiceProvider extends ServiceProvider
 {
     public function register(): void
@@ -10,6 +13,7 @@ final class SitesServiceProvider extends ServiceProvider
         $this->app->singleton(SiteManager::class);
         $this->app->register(RouteServiceProvider::class);
     }
+
     public function boot(): void
     {
         $this->loadMigrationsFrom(module_path('Sites', 'Database/Migrations'));

Modules/Sites/Routes/web.php

@@ -1,10 +1,12 @@
 <?php
+
 use Illuminate\Support\Facades\Route;
 use Modules\Sites\Http\Controllers\DomainController;
 use Modules\Sites\Http\Controllers\SiteController;
-Route::middleware(['auth','verified'])->prefix('administration')->name('administration.')->group(function (): void {
-    Route::post('sites/{site}/switch', [SiteController::class,'switch'])->name('sites.switch');
+
+Route::middleware(['auth', 'verified'])->prefix('administration')->name('administration.')->group(function (): void {
+    Route::post('sites/{site}/switch', [SiteController::class, 'switch'])->name('sites.switch');
     Route::resource('sites', SiteController::class)->except('show');
-    Route::post('sites/{site}/domains', [DomainController::class,'store'])->name('sites.domains.store');
-    Route::delete('sites/{site}/domains/{domain}', [DomainController::class,'destroy'])->name('sites.domains.destroy');
+    Route::post('sites/{site}/domains', [DomainController::class, 'store'])->name('sites.domains.store');
+    Route::delete('sites/{site}/domains/{domain}', [DomainController::class, 'destroy'])->name('sites.domains.destroy');
 });

Modules/Sites/Tests/Feature/SitesModuleBootTest.php

@@ -1,6 +1,9 @@
 <?php
+
 namespace Modules\Sites\Tests\Feature;
+
 use Tests\TestCase;
+
 final class SitesModuleBootTest extends TestCase
 {
     public function test_sites_module_routes_are_registered(): void