Merge pull request #291 from yoeriboven/carbon-immutable

Allow immutable dates for BackupsCheck

Author: freekmurze

src/Checks/Checks/BackupsCheck.php

@@ -3,6 +3,7 @@
 namespace Spatie\Health\Checks\Checks;
 
 use Carbon\Carbon;
+use Carbon\CarbonInterface;
 use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\File;
@@ -17,9 +18,9 @@ class BackupsCheck extends Check
 
     protected ?Filesystem $disk = null;
 
-    protected ?Carbon $youngestShouldHaveBeenMadeBefore = null;
+    protected ?CarbonInterface $youngestShouldHaveBeenMadeBefore = null;
 
-    protected ?Carbon $oldestShouldHaveBeenMadeAfter = null;
+    protected ?CarbonInterface $oldestShouldHaveBeenMadeAfter = null;
 
     protected ?string $parseModifiedUsing = null;
 
@@ -52,14 +53,14 @@ public function parseModifiedFormat(string $parseModifiedFormat = 'Y-m-d_H-i-s')
         return $this;
     }
 
-    public function youngestBackShouldHaveBeenMadeBefore(Carbon $date): self
+    public function youngestBackShouldHaveBeenMadeBefore(CarbonInterface $date): self
     {
         $this->youngestShouldHaveBeenMadeBefore = $date;
 
         return $this;
     }
 
-    public function oldestBackShouldHaveBeenMadeAfter(Carbon $date): self
+    public function oldestBackShouldHaveBeenMadeAfter(CarbonInterface $date): self
     {
         $this->oldestShouldHaveBeenMadeAfter = $date;
 

tests/Checks/BackupsCheckTest.php

@@ -153,7 +153,7 @@
     expect($result)->status->toBe(Status::failed());
 });
 
-it('will pass if the backup is at least than the given size when loaded from filesystem disk', function (int $sizeInMb) {
+it('will pass if the backup is at least the given size when loaded from filesystem disk', function (int $sizeInMb) {
 
     Storage::fake('backups');
 
@@ -199,6 +199,30 @@
     expect($result)->status->toBe(Status::failed());
 });
 
+it('can check if the youngest backup is recent enough when loaded from filesystem disk with an immutable date', function () {
+
+    Storage::fake('backups');
+    Storage::disk('backups')->put('backups/hey.zip', 'content');
+
+    testTime()->addMinutes(4);
+
+    $result = $this->backupsCheck
+        ->onDisk('backups')
+        ->locatedAt('backups')
+        ->youngestBackShouldHaveBeenMadeBefore(now()->subMinutes(5)->startOfMinute()->toImmutable())
+        ->run();
+
+    expect($result)->status->toBe(Status::ok());
+
+    testTime()->addMinutes(2);
+
+    $result = $this->backupsCheck
+        ->locatedAt($this->temporaryDirectory->path('*.zip'))
+        ->youngestBackShouldHaveBeenMadeBefore(now()->subMinutes(5)->toImmutable())
+        ->run();
+    expect($result)->status->toBe(Status::failed());
+});
+
 it('can check if the oldest backup is old enough when loaded from filesystem disk', function () {
 
     Storage::fake('backups');
@@ -223,6 +247,30 @@
     expect($result)->status->toBe(Status::failed());
 });
 
+it('can check if the oldest backup is old enough when loaded from filesystem disk with an immutable date', function () {
+
+    Storage::fake('backups');
+    Storage::disk('backups')->put('backups/hey.zip', 'content');
+
+    testTime()->addMinutes(4);
+
+    $result = $this->backupsCheck
+        ->onDisk('backups')
+        ->locatedAt('backups')
+        ->oldestBackShouldHaveBeenMadeAfter(now()->subMinutes(5)->toImmutable())
+        ->run();
+
+    expect($result)->status->toBe(Status::failed());
+
+    testTime()->addMinutes(2);
+
+    $result = $this->backupsCheck
+        ->locatedAt($this->temporaryDirectory->path('*.zip'))
+        ->oldestBackShouldHaveBeenMadeAfter(now()->subMinutes(5)->toImmutable())
+        ->run();
+    expect($result)->status->toBe(Status::failed());
+});
+
 it('can parse modified time from file name', function ($format) {
     Storage::fake('backups');