apply code styling from rector

spatie · Jun 7, 2024 · 65dfc97 · 65dfc97
1 parent 0c66d92
commit 65dfc97
Show file tree

Hide file tree

Showing 18 changed files with 40 additions and 25 deletions.
diff --git a/resources/lang/fr/notifications.php b/resources/lang/fr/notifications.php
@@ -1,10 +1,10 @@
 <?php
 
 return [
-    'exception_message' => 'Message de l\'exception : :message',
-    'exception_trace' => 'Trace de l\'exception : :trace',
-    'exception_message_title' => 'Message de l\'exception',
-    'exception_trace_title' => 'Trace de l\'exception',
+    'exception_message' => "Message de l'exception : :message",
+    'exception_trace' => "Trace de l'exception : :trace",
+    'exception_message_title' => "Message de l'exception",
+    'exception_trace_title' => "Trace de l'exception",
 
     'backup_failed_subject' => 'Échec de la sauvegarde de :application_name',
     'backup_failed_body' => 'Important : Une erreur est survenue lors de la sauvegarde de :application_name',
@@ -27,14 +27,14 @@
     'unhealthy_backup_found_subject' => 'Important : Les sauvegardes pour :application_name sont corrompues',
     'unhealthy_backup_found_subject_title' => 'Important : Les sauvegardes pour :application_name sont corrompues. :problem',
     'unhealthy_backup_found_body' => 'Les sauvegardes pour :application_name sur le disque :disk_name sont corrompues.',
-    'unhealthy_backup_found_not_reachable' => 'La destination de la sauvegarde n\'est pas accessible. :error',
-    'unhealthy_backup_found_empty' => 'Il n\'y a aucune sauvegarde pour cette application.',
+    'unhealthy_backup_found_not_reachable' => "La destination de la sauvegarde n'est pas accessible. :error",
+    'unhealthy_backup_found_empty' => "Il n'y a aucune sauvegarde pour cette application.",
     'unhealthy_backup_found_old' => 'La dernière sauvegarde du :date est considérée trop vieille.',
     'unhealthy_backup_found_unknown' => 'Désolé, une raison exacte ne peut être déterminée.',
     'unhealthy_backup_found_full' => 'Les sauvegardes utilisent trop d\'espace disque. L\'utilisation actuelle est de :disk_usage alors que la limite autorisée est de :disk_limit.',
 
     'no_backups_info' => 'Aucune sauvegarde n\'a encore été effectuée',
-    'application_name' => 'Nom de l\'application',
+    'application_name' => "Nom de l'application",
     'backup_name' => 'Nom de la sauvegarde',
     'disk' => 'Disque',
     'newest_backup_size' => 'Taille de la sauvegarde la plus récente',

diff --git a/resources/lang/it/notifications.php b/resources/lang/it/notifications.php
@@ -1,10 +1,10 @@
 <?php
 
 return [
-    'exception_message' => 'Messaggio dell\'eccezione: :message',
-    'exception_trace' => 'Traccia dell\'eccezione: :trace',
-    'exception_message_title' => 'Messaggio dell\'eccezione',
-    'exception_trace_title' => 'Traccia dell\'eccezione',
+    'exception_message' => "Messaggio dell'eccezione: :message",
+    'exception_trace' => "Traccia dell'eccezione: :trace",
+    'exception_message_title' => "Messaggio dell'eccezione",
+    'exception_trace_title' => "Traccia dell'eccezione",
 
     'backup_failed_subject' => 'Fallito il backup di :application_name',
     'backup_failed_body' => 'Importante: Si è verificato un errore durante il backup di :application_name',
@@ -34,7 +34,7 @@
     'unhealthy_backup_found_full' => 'I backup utilizzano troppa memoria. L\'utilizzo corrente è :disk_usage che è superiore al limite consentito di :disk_limit.',
 
     'no_backups_info' => 'Non sono stati ancora effettuati backup',
-    'application_name' => 'Nome dell\'applicazione',
+    'application_name' => "Nome dell'applicazione",
     'backup_name' => 'Nome di backup',
     'disk' => 'Disco',
     'newest_backup_size' => 'Dimensione backup più recente',

diff --git a/src/Commands/BackupCommand.php b/src/Commands/BackupCommand.php
@@ -36,6 +36,7 @@ public function handle(): int
             if ($this->option('only-db')) {
                 $backupJob->dontBackupFilesystem();
             }
+
             if ($this->option('db-name')) {
                 $backupJob->onlyDbName($this->option('db-name'));
             }

diff --git a/src/Commands/BaseCommand.php b/src/Commands/BaseCommand.php
@@ -30,7 +30,7 @@ public function run(InputInterface $input, OutputInterface $output): int
 
     protected function runningInConsole(): bool
     {
-        return in_array(php_sapi_name(), ['cli', 'phpdbg']);
+        return in_array(PHP_SAPI, ['cli', 'phpdbg']);
     }
 
     public function getSubscribedSignals(): array

diff --git a/src/Exceptions/CannotCreateDbDumper.php b/src/Exceptions/CannotCreateDbDumper.php
@@ -11,7 +11,7 @@ public static function unsupportedDriver(string $driver): self
         $supportedDrivers = collect(config('database.connections'))->keys();
 
         $formattedSupportedDrivers = $supportedDrivers
-            ->map(fn (string $supportedDriver) => "`$supportedDriver`")
+            ->map(fn (string $supportedDriver) => "`{$supportedDriver}`")
             ->join(glue: ', ', finalGlue: ' or ');
 
         return new static("Cannot create a dumper for db driver `{$driver}`. Use {$formattedSupportedDrivers}.");

diff --git a/src/Helpers/Format.php b/src/Helpers/Format.php
@@ -13,6 +13,7 @@ public static function humanReadableSize(float $sizeInBytes): string
         if ($sizeInBytes === 0.0) {
             return '0 '.$units[1];
         }
+
         for ($i = 0; $sizeInBytes > 1024; $i++) {
             $sizeInBytes /= 1024;
         }

diff --git a/src/Listeners/EncryptBackupArchive.php b/src/Listeners/EncryptBackupArchive.php
@@ -57,7 +57,7 @@ protected static function getAlgorithm(): ?int
         $encryption = config('backup.backup.encryption');
 
         if ($encryption === 'default') {
-            $encryption = defined("\ZipArchive::EM_AES_256")
+            $encryption = defined(\ZipArchive::class . '::EM_AES_256')
                 ? ZipArchive::EM_AES_256
                 : null;
         }

diff --git a/src/Notifications/Notifications/BackupHasFailedNotification.php b/src/Notifications/Notifications/BackupHasFailedNotification.php
@@ -26,7 +26,7 @@ public function toMail(): MailMessage
             ->line(trans('backup::notifications.exception_message', ['message' => $this->event->exception->getMessage()]))
             ->line(trans('backup::notifications.exception_trace', ['trace' => $this->event->exception->getTraceAsString()]));
 
-        $this->backupDestinationProperties()->each(fn ($value, $name) => $mailMessage->line("{$name}: $value"));
+        $this->backupDestinationProperties()->each(fn ($value, $name) => $mailMessage->line("{$name}: {$value}"));
 
         return $mailMessage;
     }

diff --git a/src/Notifications/Notifications/BackupWasSuccessfulNotification.php b/src/Notifications/Notifications/BackupWasSuccessfulNotification.php
@@ -24,7 +24,7 @@ public function toMail(): MailMessage
             ->line(trans('backup::notifications.backup_successful_body', ['application_name' => $this->applicationName(), 'disk_name' => $this->diskName()]));
 
         $this->backupDestinationProperties()->each(function ($value, $name) use ($mailMessage) {
-            $mailMessage->line("{$name}: $value");
+            $mailMessage->line("{$name}: {$value}");
         });
 
         return $mailMessage;

diff --git a/src/Notifications/Notifications/CleanupHasFailedNotification.php b/src/Notifications/Notifications/CleanupHasFailedNotification.php
@@ -27,7 +27,7 @@ public function toMail(): MailMessage
             ->line(trans('backup::notifications.exception_trace', ['trace' => $this->event->exception->getTraceAsString()]));
 
         $this->backupDestinationProperties()->each(function ($value, $name) use ($mailMessage) {
-            $mailMessage->line("{$name}: $value");
+            $mailMessage->line("{$name}: {$value}");
         });
 
         return $mailMessage;

diff --git a/src/Notifications/Notifications/CleanupWasSuccessfulNotification.php b/src/Notifications/Notifications/CleanupWasSuccessfulNotification.php
@@ -24,7 +24,7 @@ public function toMail(): MailMessage
             ->line(trans('backup::notifications.cleanup_successful_body', ['application_name' => $this->applicationName(), 'disk_name' => $this->diskName()]));
 
         $this->backupDestinationProperties()->each(function ($value, $name) use ($mailMessage) {
-            $mailMessage->line("{$name}: $value");
+            $mailMessage->line("{$name}: {$value}");
         });
 
         return $mailMessage;

diff --git a/src/Notifications/Notifications/HealthyBackupWasFoundNotification.php b/src/Notifications/Notifications/HealthyBackupWasFoundNotification.php
@@ -24,7 +24,7 @@ public function toMail(): MailMessage
             ->line(trans('backup::notifications.healthy_backup_found_body', ['application_name' => $this->applicationName()]));
 
         $this->backupDestinationProperties()->each(function ($value, $name) use ($mailMessage) {
-            $mailMessage->line("{$name}: $value");
+            $mailMessage->line("{$name}: {$value}");
         });
 
         return $mailMessage;

diff --git a/src/Notifications/Notifications/UnhealthyBackupWasFoundNotification.php b/src/Notifications/Notifications/UnhealthyBackupWasFoundNotification.php
@@ -27,7 +27,7 @@ public function toMail(): MailMessage
             ->line($this->problemDescription());
 
         $this->backupDestinationProperties()->each(function ($value, $name) use ($mailMessage) {
-            $mailMessage->line("{$name}: $value");
+            $mailMessage->line("{$name}: {$value}");
         });
 
         if ($this->failure()->wasUnexpected()) {

diff --git a/src/Tasks/Backup/FileSelection.php b/src/Tasks/Backup/FileSelection.php
@@ -72,7 +72,7 @@ public function selectedFiles(): Generator|array
             yield $includedFile;
         }
 
-        if (! count($this->includedDirectories())) {
+        if ($this->includedDirectories() === []) {
             return [];
         }
 
@@ -107,6 +107,7 @@ protected function shouldExclude(string $path): bool
         if (is_dir($path)) {
             $path .= DIRECTORY_SEPARATOR;
         }
+
         foreach ($this->excludeFilesAndDirectories as $excludedPath) {
             if (Str::startsWith($path, $excludedPath.(is_dir($excludedPath) ? DIRECTORY_SEPARATOR : ''))) {
                 if ($path != $excludedPath && is_file($excludedPath)) {

diff --git a/src/Tasks/Backup/Zip.php b/src/Tasks/Backup/Zip.php
@@ -112,6 +112,7 @@ public function add(string|iterable $files, ?string $nameInZip = null): self
                     );
                 }
             }
+
             $this->fileCount++;
         }
 

diff --git a/tests/Commands/BackupCommandTest.php b/tests/Commands/BackupCommandTest.php
@@ -102,6 +102,7 @@
     foreach (range(0, $zip->numFiles - 1) as $i) {
         $zipFiles[] = $zip->statIndex($i)['name'];
     }
+
     $zip->close();
     sort($testFiles);
     sort($zipFiles);
@@ -121,6 +122,7 @@
     if ($zip->numFiles) {
         $zipFile = $zip->statIndex(0)['name'];
     }
+
     $zip->close();
 
     expect($zipFile)->toStartWith(ltrim((string) $this->getStubDirectory(), DIRECTORY_SEPARATOR));
@@ -132,6 +134,7 @@
     if (! file_exists($tempDirectoryPath)) {
         mkdir($tempDirectoryPath, 0777, true);
     }
+
     touch($tempDirectoryPath.DIRECTORY_SEPARATOR.'testing-file-temp.txt');
 
     $this->artisan('backup:run --only-files')->assertExitCode(0);
@@ -367,8 +370,10 @@
 
     $zip = new ZipArchive();
     $zip->open(Storage::disk('local')->path($this->expectedZipPath));
+
     expect($zip->numFiles)->toBe(1);
     expect($zip->statIndex(0)['encryption_method'])->toBe(ZipArchive::EM_AES_256);
+
     $zip->close();
 
     Event::assertNotDispatched(BackupZipWasCreated::class);
@@ -382,8 +387,10 @@
 
     $zip = new ZipArchive();
     $zip->open(Storage::disk('local')->path($this->expectedZipPath));
+
     expect($zip->numFiles)->toBe(1);
     expect($zip->statIndex(0)['comp_method'])->toBe(ZipArchive::CM_DEFLATE);
+
     $zip->close();
 
     // check no compression with ZipArchive::CM_STORE method
@@ -394,8 +401,10 @@
 
     $zip = new ZipArchive();
     $zip->open(Storage::disk('local')->path($this->expectedZipPath));
+
     expect($zip->numFiles)->toBe(1);
     expect($zip->statIndex(0)['comp_method'])->toBe(ZipArchive::CM_STORE);
+
     $zip->close();
 
     // check ZipArchive::CM_DEFLATE method with custom compression level
@@ -406,8 +415,10 @@
 
     $zip = new ZipArchive();
     $zip->open(Storage::disk('local')->path($this->expectedZipPath));
+
     expect($zip->numFiles)->toBe(1);
     expect($zip->statIndex(0)['comp_method'])->toBe(ZipArchive::CM_DEFLATE);
+
     $zip->close();
 });
 

diff --git a/tests/Notifications/EventHandlerTest.php b/tests/Notifications/EventHandlerTest.php
@@ -4,7 +4,7 @@
 use Spatie\Backup\BackupDestination\BackupDestinationFactory;
 use Spatie\Backup\Events\BackupHasFailed;
 use Spatie\Backup\Notifications\Notifiable;
-use Spatie\Backup\Notifications\Notifications\BackupHasFailedNotification as BackupHasFailedNotification;
+use Spatie\Backup\Notifications\Notifications\BackupHasFailedNotification;
 
 beforeEach(function () {
     Notification::fake();

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -72,7 +72,7 @@ protected function seeInConsoleOutput(string $expectedText): void
         $this->assertStringContainsString(
             $expectedText,
             $consoleOutput,
-            "Did not see `{$expectedText}` in console output: `$consoleOutput`"
+            "Did not see `{$expectedText}` in console output: `{$consoleOutput}`"
         );
     }
 
@@ -83,7 +83,7 @@ protected function doNotSeeInConsoleOutput(string $unexpectedText): void
         $this->assertNotContains(
             $unexpectedText,
             $consoleOutput,
-            "Did not expect to see `{$unexpectedText}` in console output: `$consoleOutput`"
+            "Did not expect to see `{$unexpectedText}` in console output: `{$consoleOutput}`"
         );
     }