add more types

composer.json

@@ -32,10 +32,10 @@
         "spatie/laravel-signal-aware-command": "^1.2|^2.0",
         "spatie/temporary-directory": "^2.0",
         "symfony/console": "^6.0|^7.0",
-        "symfony/finder": "^6.0|^7.0"
+        "symfony/finder": "^6.0|^7.0",
+        "ext-pcntl": "*"
     },
     "require-dev": {
-        "ext-pcntl": "*",
         "composer-runtime-api": "^2.0",
         "larastan/larastan": "^2.7.0",
         "laravel/slack-notification-channel": "^2.5|^3.0",

src/BackupDestination/Backup.php

@@ -66,6 +66,7 @@ public function sizeInBytes(): float
         return $this->size;
     }
 
+    /** @return resource */
     public function stream()
     {
         return throw_unless(

src/BackupDestination/BackupCollection.php

@@ -6,10 +6,12 @@
 use Illuminate\Support\Collection;
 use Spatie\Backup\Helpers\File;
 
+/** @extends Collection<int,Backup> */
 class BackupCollection extends Collection
 {
     protected ?float $sizeCache = null;
 
+    /** @param array<string> $files */
     public static function createFromFiles(?FileSystem $disk, array $files): self
     {
         return (new static($files))

src/BackupDestination/BackupDestination.php

@@ -114,8 +114,10 @@ public function connectionError(): Exception
         return $this->connectionError;
     }
 
+    /** @return array<string, string> */
     public function getDiskOptions(): array
     {
+        ray(config("filesystems.disks.{$this->diskName()}.backup_options") ?? []);
         return config("filesystems.disks.{$this->diskName()}.backup_options") ?? [];
     }
 

src/BackupDestination/BackupDestinationFactory.php

@@ -6,6 +6,10 @@
 
 class BackupDestinationFactory
 {
+    /**
+     * @param array<string, mixed> $config
+     * @return Collection<int, BackupDestination>
+     */
     public static function createFromArray(array $config): Collection
     {
         return collect($config['destination']['disks'])

src/BackupServiceProvider.php

@@ -52,7 +52,7 @@ public function packageRegistered(): void
         $this->registerDiscordChannel();
     }
 
-    protected function registerDiscordChannel()
+    protected function registerDiscordChannel(): void
     {
         Notification::resolved(function (ChannelManager $service) {
             $service->extend('discord', function ($app) {

src/Commands/BackupCommand.php

@@ -95,7 +95,7 @@ public function handle(): int
         }
     }
 
-    protected function guardAgainstInvalidOptions()
+    protected function guardAgainstInvalidOptions(): void
     {
         if (! $this->option('only-db')) {
             return;

src/Commands/BaseCommand.php

@@ -10,6 +10,7 @@
 
 abstract class BaseCommand extends SignalAwareCommand
 {
+    /** @var array<int> */
     protected array $handlesSignals = [];
 
     public function __construct()
@@ -33,6 +34,7 @@ protected function runningInConsole(): bool
         return in_array(PHP_SAPI, ['cli', 'phpdbg']);
     }
 
+    /** @return array<int> */
     public function getSubscribedSignals(): array
     {
         return $this->handlesSignals;

src/Commands/ListCommand.php

@@ -30,7 +30,10 @@ public function handle(): int
         return static::SUCCESS;
     }
 
-    protected function displayOverview(Collection $backupDestinationStatuses)
+    /**
+     * @param Collection<int, BackupDestinationStatus> $backupDestinationStatuses
+     */
+    protected function displayOverview(Collection $backupDestinationStatuses): static
     {
         $headers = ['Name', 'Disk', 'Reachable', 'Healthy', '# of backups', 'Newest backup', 'Used storage'];
 
@@ -46,6 +49,7 @@ protected function displayOverview(Collection $backupDestinationStatuses)
         return $this;
     }
 
+    /** @return array{0: string, 1: string, 2: string, disk: string, amount: integer, newest: string, usedStorage: string} */
     public function convertToRow(BackupDestinationStatus $backupDestinationStatus): array
     {
         $destination = $backupDestinationStatus->backupDestination();
@@ -73,7 +77,8 @@ public function convertToRow(BackupDestinationStatus $backupDestinationStatus):
         return $row;
     }
 
-    protected function displayFailures(Collection $backupDestinationStatuses)
+    /** @param Collection<int, BackupDestinationStatus> $backupDestinationStatuses */
+    protected function displayFailures(Collection $backupDestinationStatuses): static
     {
         $failed = $backupDestinationStatuses
             ->filter(function (BackupDestinationStatus $backupDestinationStatus) {
@@ -98,7 +103,7 @@ protected function displayFailures(Collection $backupDestinationStatuses)
         return $this;
     }
 
-    protected function getFormattedBackupDate(?Backup $backup = null)
+    protected function getFormattedBackupDate(?Backup $backup = null): string
     {
         return is_null($backup)
             ? 'No backups present'

src/Exceptions/CannotCreateDbDumper.php

@@ -6,11 +6,13 @@
 
 class CannotCreateDbDumper extends Exception
 {
-    public static function unsupportedDriver(string $driver): self
+    public static function unsupportedDriver(string $driver): static
     {
-        $supportedDrivers = collect(config('database.connections'))->keys();
+        /** @var array<int, string> $supportedDrivers */
+        $supportedDrivers = config('database.connections');
 
-        $formattedSupportedDrivers = $supportedDrivers
+        $formattedSupportedDrivers = collect($supportedDrivers)
+            ->keys()
             ->map(fn (string $supportedDriver) => "`{$supportedDriver}`")
             ->join(glue: ', ', finalGlue: ' or ');
 

src/Exceptions/NotificationCouldNotBeSent.php

@@ -6,7 +6,7 @@
 
 class NotificationCouldNotBeSent extends Exception
 {
-    public static function noNotificationClassForEvent($event): self
+    public static function noNotificationClassForEvent(object $event): static
     {
         $eventClass = $event::class;
 

src/Helpers/ConsoleOutput.php

@@ -18,7 +18,7 @@ public function setCommand(Command $command): void
         $this->command = $command;
     }
 
-    public function __call(string $method, array $arguments)
+    public function __call(string $method, array $arguments): void
     {
         $consoleOutput = app(static::class);
 

src/Tasks/Backup/Zip.php

@@ -30,7 +30,7 @@ public static function createForManifest(Manifest $manifest, string $pathToZip):
         return $zip;
     }
 
-    protected static function determineNameOfFileInZip(string $pathToFile, string $pathToZip, string $relativePath)
+    protected static function determineNameOfFileInZip(string $pathToFile, string $pathToZip, string $relativePath): string
     {
         $fileDirectory = pathinfo($pathToFile, PATHINFO_DIRNAME).DIRECTORY_SEPARATOR;
 

src/Tasks/Cleanup/CleanupJob.php

@@ -49,7 +49,7 @@ public function run(): void
         });
     }
 
-    protected function sendNotification($notification): void
+    protected function sendNotification(string|object $notification): void
     {
         if ($this->sendNotifications) {
             rescue(

src/Tasks/Cleanup/CleanupStrategy.php

@@ -15,7 +15,7 @@ public function __construct(
     ) {
     }
 
-    abstract public function deleteOldBackups(BackupCollection $backups);
+    abstract public function deleteOldBackups(BackupCollection $backups): void;
 
     public function setBackupDestination(BackupDestination $backupDestination): self
     {

src/Tasks/Monitor/HealthCheck.php

@@ -8,7 +8,7 @@
 
 abstract class HealthCheck
 {
-    abstract public function checkHealth(BackupDestination $backupDestination);
+    abstract public function checkHealth(BackupDestination $backupDestination): void;
 
     public function name(): string
     {

src/Traits/Retryable.php

@@ -10,7 +10,7 @@ trait Retryable
 
     protected int $currentTry = 1;
 
-    protected function shouldRetry()
+    protected function shouldRetry(): bool
     {
         if ($this->tries <= 1) {
             return false;
@@ -19,17 +19,17 @@ protected function shouldRetry()
         return $this->currentTry < $this->tries;
     }
 
-    protected function hasRetryDelay(string $type)
+    protected function hasRetryDelay(string $type): bool
     {
         return ! empty($this->getRetryDelay($type));
     }
 
-    protected function sleepFor(int $seconds = 0)
+    protected function sleepFor(int $seconds = 0): void
     {
         Sleep::for($seconds)->seconds();
     }
 
-    protected function setTries(string $type)
+    protected function setTries(string $type): void
     {
         if ($this->option('tries')) {
             $this->tries = (int) $this->option('tries');
@@ -40,7 +40,7 @@ protected function setTries(string $type)
         $this->tries = (int) config('backup.'.$type.'.tries', 1);
     }
 
-    protected function getRetryDelay(string $type)
+    protected function getRetryDelay(string $type): int
     {
         return (int) config('backup.'.$type.'.retry_delay', 0);
     }