chore(test): improve arch standard

commitlint.config.js

@@ -0,0 +1 @@
+export default { extends: ["@commitlint/config-conventional"] };

composer.json

@@ -15,9 +15,9 @@
   },
   "require-dev": {
     "laravel/pint": "^1.13",
-    "orchestra/testbench": "^8.11",
-    "pestphp/pest": "^2.19",
-    "pestphp/pest-plugin-laravel": "^2.2"
+    "orchestra/testbench": "^9.0",
+    "pestphp/pest": "^3.0",
+    "pestphp/pest-plugin-laravel": "^3.0"
   },
   "autoload": {
     "psr-4": {

package.json

@@ -1,6 +1,7 @@
 {
   "name": "statamic-backup",
   "version": "1.0.0",
+  "type": "module",
   "description": "Backup is an extensible and powerful backup tool for statamic sites, it enables you to create, manage and schedule backups of your site with ease in the control panel.",
   "workspaces": [
     "client",

src/Backuper.php

@@ -11,7 +11,6 @@
 use Itiden\Backup\DataTransferObjects\BackupDto;
 use Itiden\Backup\Events\BackupCreated;
 use Itiden\Backup\Events\BackupFailed;
-use Itiden\Backup\Exceptions\BackupFailedException;
 
 final class Backuper
 {
@@ -23,7 +22,7 @@ public function __construct(
     /**
      * Create a new backup.
      *
-     * @throws BackupFailedException
+     * @throws Exceptions\BackupFailed
      */
     public function backup(): BackupDto
     {
@@ -61,15 +60,15 @@ public function backup(): BackupDto
 
             event(new BackupCreated($backup));
 
-            unlink($temp_zip_path);
+            @unlink($temp_zip_path);
 
             $this->enforceMaxBackups();
 
             return $backup;
         } catch (Exception $e) {
             report($e);
 
-            $exception = new BackupFailedException();
+            $exception = new Exceptions\BackupFailed();
 
             event(new BackupFailed($exception));
 

src/Console/Commands/BackupCommand.php

@@ -12,7 +12,7 @@
 /**
  * Backup site
  */
-class BackupCommand extends Command
+final class BackupCommand extends Command
 {
     protected $signature = 'statamic:backup';
 

src/Console/Commands/ClearFilesCommand.php

@@ -12,7 +12,7 @@
 /**
  * Clear the backup temp directory
  */
-class ClearFilesCommand extends Command
+final class ClearFilesCommand extends Command
 {
     protected $signature = 'statamic:backup:temp-clear';
 

src/DataTransferObjects/ChunkyTestDto.php

@@ -6,7 +6,7 @@
 
 use Illuminate\Http\Request;
 
-readonly class ChunkyTestDto
+final readonly class ChunkyTestDto
 {
     public function __construct(
         public string $path,

src/DataTransferObjects/ChunkyUploadDto.php

@@ -7,7 +7,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
 
-readonly class ChunkyUploadDto
+final readonly class ChunkyUploadDto
 {
     public function __construct(
         public string $path,

src/Events/BackupCreated.php

@@ -6,7 +6,7 @@
 
 use Itiden\Backup\DataTransferObjects\BackupDto;
 
-class BackupCreated
+final readonly class BackupCreated
 {
     public function __construct(public BackupDto $backup)
     {

src/Events/BackupFailed.php

@@ -4,11 +4,11 @@
 
 namespace Itiden\Backup\Events;
 
-use Itiden\Backup\Exceptions\BackupFailedException;
+use Itiden\Backup\Exceptions;
 
-class BackupFailed
+final readonly class BackupFailed
 {
-    public function __construct(public BackupFailedException $exception)
+    public function __construct(public Exceptions\BackupFailed $exception)
     {
     }
 }

src/Events/BackupRestored.php

@@ -6,7 +6,7 @@
 
 use Itiden\Backup\DataTransferObjects\BackupDto;
 
-class BackupRestored
+final readonly class BackupRestored
 {
     public function __construct(
         public BackupDto $backup

src/Events/RestoreFailed.php

@@ -4,11 +4,11 @@
 
 namespace Itiden\Backup\Events;
 
-use Itiden\Backup\Exceptions\RestoreFailedException;
+use Itiden\Backup\Exceptions;
 
-class RestoreFailed
+final readonly class RestoreFailed
 {
-    public function __construct(public RestoreFailedException $exception)
+    public function __construct(public Exceptions\RestoreFailed $exception)
     {
     }
 }

src/Exceptions/BackupFailedException.php → src/Exceptions/BackupFailed.php

@@ -7,7 +7,7 @@
 use Carbon\Carbon;
 use Exception;
 
-class BackupFailedException extends Exception
+final class BackupFailed extends Exception
 {
     public function __construct()
     {

src/Exceptions/RestoreFailedException.php → src/Exceptions/RestoreFailed.php

@@ -9,7 +9,7 @@
 use Itiden\Backup\DataTransferObjects\BackupDto;
 use Throwable;
 
-class RestoreFailedException extends Exception
+final class RestoreFailed extends Exception
 {
     public function __construct(
         public BackupDto $backup,

src/Facades/Backuper.php

@@ -13,9 +13,9 @@
  *
  * @see \Itiden\Backup\Backuper
  */
-class Backuper extends Facade
+final class Backuper extends Facade
 {
-    protected static function getFacadeAccessor()
+    public static function getFacadeAccessor()
     {
         return BackuperService::class;
     }

src/Facades/Restorer.php

@@ -13,9 +13,9 @@
  *
  * @see \Itiden\Backup\Restorer
  */
-class Restorer extends Facade
+final class Restorer extends Facade
 {
-    protected static function getFacadeAccessor()
+    public static function getFacadeAccessor()
     {
         return RestorerService::class;
     }

src/Http/Controllers/Api/BackupController.php

@@ -5,11 +5,10 @@
 namespace Itiden\Backup\Http\Controllers\Api;
 
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
-use Illuminate\Routing\Controller;
 use Itiden\Backup\Contracts\Repositories\BackupRepository;
 use Itiden\Backup\Http\Resources\BackupResource;
 
-class BackupController extends Controller
+final readonly class BackupController
 {
     public function __invoke(BackupRepository $repo): AnonymousResourceCollection
     {

src/Http/Controllers/Api/DestroyBackupController.php

@@ -6,10 +6,9 @@
 
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Routing\Controller;
 use Itiden\Backup\Contracts\Repositories\BackupRepository;
 
-class DestroyBackupController extends Controller
+final readonly class DestroyBackupController
 {
     public function __invoke(string $timestamp, BackupRepository $repo): JsonResponse|RedirectResponse
     {

src/Http/Controllers/Api/RestoreController.php

@@ -5,10 +5,9 @@
 namespace Itiden\Backup\Http\Controllers\Api;
 
 use Illuminate\Http\JsonResponse;
-use Illuminate\Routing\Controller;
 use Itiden\Backup\Facades\Restorer;
 
-class RestoreController extends Controller
+final readonly class RestoreController
 {
     public function __invoke(string $timestamp): JsonResponse
     {

src/Http/Controllers/Api/RestoreFromPathController.php

@@ -5,13 +5,12 @@
 namespace Itiden\Backup\Http\Controllers\Api;
 
 use Illuminate\Http\JsonResponse;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\File;
 use Itiden\Backup\DataTransferObjects\BackupDto;
 use Itiden\Backup\Facades\Restorer;
 use Itiden\Backup\Http\Requests\RestoreFromPathRequest;
 
-class RestoreFromPathController extends Controller
+final readonly class RestoreFromPathController
 {
     public function __invoke(RestoreFromPathRequest $request): JsonResponse
     {

src/Http/Controllers/Api/StoreBackupController.php

@@ -5,10 +5,9 @@
 namespace Itiden\Backup\Http\Controllers\Api;
 
 use Illuminate\Http\JsonResponse;
-use Illuminate\Routing\Controller;
 use Itiden\Backup\Facades\Backuper;
 
-class StoreBackupController extends Controller
+final readonly class StoreBackupController
 {
     public function __invoke(): JsonResponse
     {

src/Http/Controllers/DownloadBackupController.php

@@ -4,18 +4,12 @@
 
 namespace Itiden\Backup\Http\Controllers;
 
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
-use Illuminate\Foundation\Validation\ValidatesRequests;
-use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Storage;
 use Itiden\Backup\Contracts\Repositories\BackupRepository;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
-class DownloadBackupController extends Controller
+final readonly class DownloadBackupController
 {
-    use AuthorizesRequests;
-    use ValidatesRequests;
-
     /**
      * Handle the incoming request.
      */

src/Http/Controllers/UploadController.php

@@ -6,13 +6,12 @@
 
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use Illuminate\Routing\Controller;
 use Itiden\Backup\DataTransferObjects\ChunkyTestDto;
 use Itiden\Backup\DataTransferObjects\ChunkyUploadDto;
 use Itiden\Backup\Http\Requests\ChunkyUploadRequest;
 use Itiden\Backup\Support\Facades\Chunky;
 
-class UploadController extends Controller
+final readonly class UploadController
 {
     public function __invoke(ChunkyUploadRequest $request): JsonResponse
     {

src/Http/Requests/ChunkyUploadRequest.php

@@ -6,7 +6,7 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class ChunkyUploadRequest extends FormRequest
+final class ChunkyUploadRequest extends FormRequest
 {
     public function rules()
     {

src/Http/Requests/RestoreFromPathRequest.php

@@ -6,7 +6,7 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 
-class RestoreFromPathRequest extends FormRequest
+final class RestoreFromPathRequest extends FormRequest
 {
     public function rules()
     {

src/Http/Resources/BackupResource.php

@@ -9,7 +9,7 @@
 /**
  * @mixin \Itiden\Backup\DataTransferObjects\BackupDto
  */
-class BackupResource extends JsonResource
+final class BackupResource extends JsonResource
 {
     public function toArray($request)
     {

src/Pipes/Assets.php

@@ -11,7 +11,7 @@
 use Statamic\Assets\AssetContainer as Container;
 use Statamic\Facades\AssetContainer;
 
-class Assets extends BackupPipe
+final class Assets extends BackupPipe
 {
     public static function getKey(): string
     {

src/Pipes/Content.php

@@ -9,7 +9,7 @@
 use Itiden\Backup\Abstracts\BackupPipe;
 use Itiden\Backup\Support\Zipper;
 
-class Content extends BackupPipe
+final class Content extends BackupPipe
 {
     public static function getKey(): string
     {

src/Pipes/Users.php

@@ -10,7 +10,7 @@
 use Itiden\Backup\Support\Zipper;
 use Statamic\Facades\Stache;
 
-class Users extends BackupPipe
+final class Users extends BackupPipe
 {
     public static function getKey(): string
     {

src/Restorer.php

@@ -13,7 +13,6 @@
 use Itiden\Backup\DataTransferObjects\BackupDto;
 use Itiden\Backup\Events\BackupRestored;
 use Itiden\Backup\Events\RestoreFailed;
-use Itiden\Backup\Exceptions\RestoreFailedException;
 use Itiden\Backup\Support\Zipper;
 use RuntimeException;
 
@@ -43,7 +42,7 @@ public function restoreFromTimestamp(string $timestamp): void
     /**
      * Restore to the given backup.
      *
-     * @throws RestoreFailedException
+     * @throws RestoreFailed
      */
     public function restore(BackupDto $backup): void
     {
@@ -83,7 +82,7 @@ public function restore(BackupDto $backup): void
         } catch (Exception $e) {
             report($e);
 
-            $exception = new RestoreFailedException($backup, previous: $e);
+            $exception = new Exceptions\RestoreFailed($backup, previous: $e);
 
             event(new RestoreFailed($exception));
 

src/ServiceProvider.php

@@ -14,7 +14,7 @@
 use Statamic\Facades\Permission;
 use Statamic\Providers\AddonServiceProvider;
 
-class ServiceProvider extends AddonServiceProvider
+final class ServiceProvider extends AddonServiceProvider
 {
     protected $viewNamespace = 'itiden-backup';
 
@@ -58,7 +58,7 @@ public function bootAddon()
         ]);
     }
 
-    protected function schedule(Schedule $schedule)
+    public function schedule(Schedule $schedule)
     {
         if (!config('backup.schedule')) {
             return;

src/Support/Facades/Chunky.php

@@ -16,9 +16,9 @@
  *
  * @see \Itiden\Backup\Support\Chunky
  */
-class Chunky extends Facade
+final class Chunky extends Facade
 {
-    protected static function getFacadeAccessor(): string
+    public static function getFacadeAccessor(): string
     {
         return ChunkySupport::class;
     }