Add DeleteTenantStorage listener

assets/TenancyServiceProvider.stub.php

@@ -53,6 +53,7 @@ class TenancyServiceProvider extends ServiceProvider
                 ])->send(function (Events\TenantDeleted $event) {
                     return $event->tenant;
                 })->shouldBeQueued(false), // `false` by default, but you probably want to make this `true` for production.
+                // Listeners\DeleteTenantStorage::class,
             ],
 
             // Domain events

src/Events/DeletingTenantStorage.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Events;
+
+class DeletingTenantStorage extends Contracts\TenantEvent
+{
+}

src/Events/TenantStorageDeleted.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Events;
+
+class TenantStorageDeleted extends Contracts\TenantEvent
+{
+}

src/Listeners/DeleteTenantStorage.php

@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Stancl\Tenancy\Listeners;
+
+use Illuminate\Support\Facades\File;
+use Stancl\Tenancy\Events\DeletingTenantStorage;
+use Stancl\Tenancy\Events\TenantDeleted;
+use Stancl\Tenancy\Events\TenantStorageDeleted;
+
+class DeleteTenantStorage
+{
+    public function handle(TenantDeleted $event): void
+    {
+        event(new DeletingTenantStorage($event->tenant));
+
+        File::deleteDirectory($event->tenant->run(fn () => storage_path()));
+
+        event(new TenantStorageDeleted($event->tenant));
+    }
+}

tests/BootstrapperTest.php

@@ -23,6 +23,7 @@ use Stancl\Tenancy\Bootstrappers\RedisTenancyBootstrapper;
 use Stancl\Tenancy\Bootstrappers\DatabaseTenancyBootstrapper;
 use Stancl\Tenancy\Bootstrappers\FilesystemTenancyBootstrapper;
 use Stancl\Tenancy\Events\TenantDeleted;
+use Stancl\Tenancy\Listeners\DeleteTenantStorage;
 
 beforeEach(function () {
     $this->mockConsoleOutput = false;
@@ -186,19 +187,14 @@ test('filesystem data is separated', function () {
     expect($new_storage_path)->toEqual($expected_storage_path);
 });
 
-test('tenant storage gets deleted after the tenant if filesystem.delete_storage_after_tenant_deletion is true', function () {
+test('tenant storage gets deleted after the tenant', function () {
     config([
         'tenancy.bootstrappers' => [
             FilesystemTenancyBootstrapper::class,
         ],
-        'tenancy.filesystem.delete_storage_after_tenant_deletion' => true
     ]);
 
-    Event::listen(TenantDeleted::class, function(TenantDeleted $event) {
-        if (config('tenancy.filesystem.delete_storage_after_tenant_deletion')) {
-            File::deleteDirectory($event->tenant->run(fn () => storage_path()));
-        }
-    });
+    Event::listen(TenantDeleted::class, DeleteTenantStorage::class);
 
     tenancy()->initialize(Tenant::create());
     $tenantStoragePath = storage_path();