Ensure datetime cache durations account for script execution time

Author: timacdonald

src/Illuminate/Cache/Repository.php

@@ -624,7 +624,9 @@ protected function getSeconds($ttl)
         $duration = $this->parseDateInterval($ttl);
 
         if ($duration instanceof DateTimeInterface) {
-            $duration = Carbon::now()->diffInSeconds($duration, false);
+            $duration = (int) ceil(
+                Carbon::now()->diffInMilliseconds($duration, false) / 1000
+            );
         }
 
         return (int) ($duration > 0 ? $duration : 0);

tests/Integration/Cache/RepositoryTest.php

@@ -2,9 +2,11 @@
 
 namespace Illuminate\Tests\Integration\Cache;
 
+use Illuminate\Cache\Events\KeyWritten;
 use Illuminate\Foundation\Testing\LazilyRefreshDatabase;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Event;
 use Orchestra\Testbench\Attributes\WithMigration;
 use Orchestra\Testbench\TestCase;
 
@@ -235,4 +237,21 @@ public function testItImplicitlyClearsTtlKeysFromFileDriver()
         $this->assertFalse($cache->getFilesystem()->exists($cache->path('illuminate:cache:flexible:created:count')));
         $this->assertTrue($cache->missing('illuminate:cache:flexible:created:count'));
     }
+
+    public function testItRoundsDateTimeValuesToAccountForTimePassedDuringScriptExecution()
+    {
+        // do not freeze time as this test depends on time progressing duration execution.
+        $cache = Cache::driver('array');
+        $events = [];
+        Event::listen(function (KeyWritten $event) use (&$events) {
+            $events[] = $event;
+        });
+
+        $result = $cache->put('foo', 'bar', now()->addSecond());
+
+        $this->assertTrue($result);
+        $this->assertCount(1, $events);
+        $this->assertSame('foo', $events[0]->key);
+        $this->assertSame(1, $events[0]->seconds);
+    }
 }