rector fixes

Author: Nielsvanpach

rector.php

@@ -15,6 +15,7 @@
 use Rector\Php74\Rector\Closure\ClosureToArrowFunctionRector;
 use Rector\TypeDeclaration\Rector\ArrowFunction\AddArrowFunctionReturnTypeRector;
 use Rector\TypeDeclaration\Rector\ClassMethod\ReturnNeverTypeRector;
+use Rector\TypeDeclaration\Rector\Closure\AddClosureVoidReturnTypeWhereNoReturnRector;
 
 return RectorConfig::configure()
     ->withPaths(['config', 'resources', 'src'])
@@ -33,4 +34,5 @@
         PostIncDecToPreIncDecRector::class,
         NullableCompareToNullRector::class,
         AddArrowFunctionReturnTypeRector::class,
+        AddClosureVoidReturnTypeWhereNoReturnRector::class,
     ]);

src/BackupDestination/BackupCollection.php

@@ -16,7 +16,7 @@ public static function createFromFiles(?FileSystem $disk, array $files): self
     {
         return (new static($files))
             ->filter(fn (string $path) => (new File())->isZipFile($disk, $path))
-            ->map(fn (string $path) => new Backup($disk, $path))
+            ->map(fn (string $path): \Spatie\Backup\BackupDestination\Backup => new Backup($disk, $path))
             ->sortByDesc(fn (Backup $backup) => $backup->date()->timestamp)
             ->values();
     }

src/BackupServiceProvider.php

@@ -52,15 +52,15 @@ public function packageRegistered(): void
 
         $this->registerDiscordChannel();
 
-        $this->app->scoped(Config::class, function () {
+        $this->app->scoped(Config::class, function (): \Spatie\Backup\Config\Config {
             return Config::fromArray(config('backup'));
         });
     }
 
     protected function registerDiscordChannel(): void
     {
         Notification::resolved(function (ChannelManager $service) {
-            $service->extend('discord', function ($app) {
+            $service->extend('discord', function ($app): \Spatie\Backup\Notifications\Channels\Discord\DiscordChannel {
                 return new DiscordChannel();
             });
         });

src/Commands/ListCommand.php

@@ -39,7 +39,7 @@ protected function displayOverview(Collection $backupDestinationStatuses): stati
     {
         $headers = ['Name', 'Disk', 'Reachable', 'Healthy', '# of backups', 'Newest backup', 'Used storage'];
 
-        $rows = $backupDestinationStatuses->map(function (BackupDestinationStatus $backupDestinationStatus) {
+        $rows = $backupDestinationStatuses->map(function (BackupDestinationStatus $backupDestinationStatus): array {
             return $this->convertToRow($backupDestinationStatus);
         });
 
@@ -83,10 +83,10 @@ public function convertToRow(BackupDestinationStatus $backupDestinationStatus):
     protected function displayFailures(Collection $backupDestinationStatuses): static
     {
         $failed = $backupDestinationStatuses
-            ->filter(function (BackupDestinationStatus $backupDestinationStatus) {
+            ->filter(function (BackupDestinationStatus $backupDestinationStatus): bool {
                 return $backupDestinationStatus->getHealthCheckFailure() !== null;
             })
-            ->map(function (BackupDestinationStatus $backupDestinationStatus) {
+            ->map(function (BackupDestinationStatus $backupDestinationStatus): array {
                 return [
                     $backupDestinationStatus->backupDestination()->backupName(),
                     $backupDestinationStatus->backupDestination()->diskName(),

src/Config/Config.php

@@ -17,7 +17,7 @@ protected function __construct(
     /** @internal used for testing */
     public static function rebind(): void
     {
-        app()->scoped(Config::class, function () {
+        app()->scoped(Config::class, function (): \Spatie\Backup\Config\Config {
             return self::fromArray(config('backup'));
         });
     }

src/Config/DestinationConfig.php

@@ -17,7 +17,11 @@ protected function __construct(
         public string $filenamePrefix,
         public array $disks,
     ) {
-        if ($compressionLevel > 9 || $compressionLevel < 0) {
+        if ($compressionLevel > 9) {
+            throw InvalidConfig::integerMustBeBetween('compression_level', 0, 9);
+        }
+
+        if ($compressionLevel < 0) {
             throw InvalidConfig::integerMustBeBetween('compression_level', 0, 9);
         }
     }

src/Tasks/Backup/BackupJob.php

@@ -254,7 +254,7 @@ protected function createZipContainingEveryFileInManifest(Manifest $manifest): s
     protected function dumpDatabases(): array
     {
         return $this->dbDumpers
-            ->map(function (DbDumper $dbDumper, $key) {
+            ->map(function (DbDumper $dbDumper, string $key): string {
                 consoleOutput()->info("Dumping database {$dbDumper->getDbName()}...");
 
                 $dbType = mb_strtolower(basename(str_replace('\\', '/', $dbDumper::class)));

src/Tasks/Backup/BackupJobFactory.php

@@ -33,7 +33,7 @@ protected static function createFileSelection(SourceFilesConfig $sourceFiles): F
     protected static function createDbDumpers(array $dbConnectionNames): Collection
     {
         return collect($dbConnectionNames)->mapWithKeys(
-            fn (string $dbConnectionName) => [$dbConnectionName => DbDumperFactory::createFromConnection($dbConnectionName)]
+            fn (string $dbConnectionName): array => [$dbConnectionName => DbDumperFactory::createFromConnection($dbConnectionName)]
         );
     }
 }

src/Tasks/Backup/Zip.php

@@ -111,13 +111,11 @@ public function add(string|iterable $files, ?string $nameInZip = null): self
             if (is_file($file)) {
                 $this->zipFile->addFile($file, ltrim((string) $nameInZip, DIRECTORY_SEPARATOR));
 
-                if (is_int($compressionMethod)) {
-                    $this->zipFile->setCompressionName(
-                        ltrim($nameInZip ?: $file, DIRECTORY_SEPARATOR),
-                        $compressionMethod,
-                        $compressionLevel
-                    );
-                }
+                $this->zipFile->setCompressionName(
+                    ltrim($nameInZip ?: $file, DIRECTORY_SEPARATOR),
+                    $compressionMethod,
+                    $compressionLevel
+                );
             }
 
             $this->fileCount++;

src/Tasks/Monitor/BackupDestinationStatusFactory.php

@@ -26,7 +26,7 @@ public static function createForMonitorConfig(MonitoredBackupsConfig $monitorCon
     public static function createForSingleMonitor(array $monitorConfig): Collection
     {
         return collect($monitorConfig['disks'])
-            ->map(function ($diskName) use ($monitorConfig) {
+            ->map(function ($diskName) use ($monitorConfig): \Spatie\Backup\Tasks\Monitor\BackupDestinationStatus {
                 $backupDestination = BackupDestination::create($diskName, $monitorConfig['name']);
 
                 return new BackupDestinationStatus($backupDestination, static::buildHealthChecks($monitorConfig));
@@ -40,7 +40,7 @@ public static function createForSingleMonitor(array $monitorConfig): Collection
     protected static function buildHealthChecks(array $monitorConfig): array
     {
         return collect($monitorConfig['healthChecks'])
-            ->map(function ($options, $class) {
+            ->map(function ($options, $class): \Spatie\Backup\Tasks\Monitor\HealthCheck {
                 if (is_int($class)) {
                     $class = $options;
                     $options = [];