Minor code improvements

spatie · Aug 2, 2024 · 832c90b · 832c90b
1 parent 2fe68f8
commit 832c90b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/src/Checks/Checks/BackupsCheck.php b/src/Checks/Checks/BackupsCheck.php
@@ -39,14 +39,14 @@ public function locatedAt(string $globPath): self
         return $this;
     }
 
-    public function onDisk($disk): static
+    public function onDisk(string $disk): static
     {
         $this->disk = Storage::disk($disk);
 
         return $this;
     }
 
-    public function parseModifiedFormat($parseModifiedFormat = 'Y-m-d_H-i-s'): self
+    public function parseModifiedFormat(string $parseModifiedFormat = 'Y-m-d_H-i-s'): self
     {
         $this->parseModifiedUsing = $parseModifiedFormat;
 
@@ -67,14 +67,15 @@ public function oldestBackShouldHaveBeenMadeAfter(Carbon $date): self
         return $this;
     }
 
-    public function atLeastSizeInMb(int $minimumSizeInMegabytes, $onlyCheckFirstAndLast = false): self
+    public function atLeastSizeInMb(int $minimumSizeInMegabytes, bool $onlyCheckFirstAndLast = false): self
     {
         $this->minimumSizeInMegabytes = $minimumSizeInMegabytes;
+        $this->onlyCheckSizeOnFirstAndLast = $onlyCheckFirstAndLast;
 
         return $this;
     }
 
-    public function onlyCheckSizeOnFirstAndLast($onlyCheckSizeOnFirstAndLast = true): self
+    public function onlyCheckSizeOnFirstAndLast(bool $onlyCheckSizeOnFirstAndLast = true): self
     {
         $this->onlyCheckSizeOnFirstAndLast = $onlyCheckSizeOnFirstAndLast;
 
@@ -116,15 +117,15 @@ public function run(): Result
         $oldestBackup = $this->getOldestBackup($eligibleBackups);
 
         $result->appendMeta([
-            'youngest_backup' => Carbon::createFromTimestamp($youngestBackup?->lastModified())->toDateTimeString(),
-            'oldest_backup'   => Carbon::createFromTimestamp($oldestBackup?->lastModified())->toDateTimeString(),
+            'youngest_backup' => $youngestBackup ? Carbon::createFromTimestamp($youngestBackup->lastModified())->toDateTimeString() : null,
+            'oldest_backup'   => $oldestBackup ? Carbon::createFromTimestamp($oldestBackup->lastModified())->toDateTimeString() : null,
         ]);
 
-        if ($this->youngestShouldHaveBeenMadeBefore && $this->youngestBackupIsToolOld($youngestBackup)) {
+        if ($this->youngestBackupIsToolOld($youngestBackup)) {
             return $result->failed('The youngest backup was too old');
         }
 
-        if ($this->oldestShouldHaveBeenMadeAfter && $this->oldestBackupIsTooYoung($oldestBackup)) {
+        if ($this->oldestBackupIsTooYoung($oldestBackup)) {
             return $result->failed('The oldest backup was too young');
         }
 
@@ -146,7 +147,7 @@ protected function getBackupFiles(): Collection
         return collect(
             $this->disk
                 ? $this->disk->files($this->locatedAt)
-                : File::glob($this->locatedAt)
+                : File::glob($this->locatedAt ?? '')
         )->map(function (string $path) {
             return new BackupFile($path, $this->disk, $this->parseModifiedUsing);
         });
@@ -161,6 +162,10 @@ protected function getYoungestBackup(Collection $backups): ?BackupFile
 
     protected function youngestBackupIsToolOld(?BackupFile $youngestBackup): bool
     {
+        if ($this->youngestShouldHaveBeenMadeBefore === null) {
+            return false;
+        }
+
         $threshold = $this->youngestShouldHaveBeenMadeBefore->getTimestamp();
 
         return !$youngestBackup || $youngestBackup->lastModified() <= $threshold;
@@ -175,6 +180,10 @@ protected function getOldestBackup(Collection $backups): ?BackupFile
     }
     protected function oldestBackupIsTooYoung(?BackupFile $oldestBackup): bool
     {
+        if ($this->oldestShouldHaveBeenMadeAfter === null) {
+            return false;
+        }
+
         $threshold = $this->oldestShouldHaveBeenMadeAfter->getTimestamp();
 
         return !$oldestBackup || $oldestBackup->lastModified() >= $threshold;

diff --git a/src/Support/BackupFile.php b/src/Support/BackupFile.php
@@ -38,7 +38,7 @@ public function lastModified(): ?int
             $filename = Str::of($this->path)->afterLast('/')->before('.');
 
             try {
-                return Carbon::createFromFormat($this->parseModifiedUsing, $filename)->timestamp;
+                return (int) Carbon::createFromFormat($this->parseModifiedUsing, $filename)->timestamp;
             } catch (InvalidFormatException $e) {
                 return null;
             }