[Cache] Fix expiration time for CouchbaseCollection

alexandre-daubois · alexandre-daubois · commit 9f26aca8f28c · 2023-12-13T11:15:11.000+01:00
diff --git a/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php b/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php
@@ -183,7 +183,7 @@ protected function doSave(array $values, $lifetime): array|bool
         }
 
         $upsertOptions = new UpsertOptions();
-        $upsertOptions->expiry($lifetime);
+        $upsertOptions->expiry((new \DateTimeImmutable())->modify('+'.$lifetime.' seconds'));
 
         $ko = [];
         foreach ($values as $key => $value) {
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseCollectionAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseCollectionAdapterTest.php
@@ -18,7 +18,7 @@
 
 /**
  * @requires extension couchbase <4.0.0
- * @requires extension couchbase >=3.0.0
+ * @requires extension couchbase >=3.0.5
  *
  * @group integration
  *
@@ -36,7 +36,7 @@ class CouchbaseCollectionAdapterTest extends AdapterTestCase
     public static function setupBeforeClass(): void
     {
         if (!CouchbaseCollectionAdapter::isSupported()) {
-            self::markTestSkipped('Couchbase >= 3.0.0 < 4.0.0 is required.');
+            self::markTestSkipped('Couchbase >= 3.0.5 < 4.0.0 is required.');
         }
 
         self::$client = AbstractAdapter::createConnection('couchbase://'.getenv('COUCHBASE_HOST').'/cache',
@@ -47,7 +47,7 @@ public static function setupBeforeClass(): void
     public function createCachePool($defaultLifetime = 0): CacheItemPoolInterface
     {
         if (!CouchbaseCollectionAdapter::isSupported()) {
-            self::markTestSkipped('Couchbase >= 3.0.0 < 4.0.0 is required.');
+            self::markTestSkipped('Couchbase >= 3.0.5 < 4.0.0 is required.');
         }
 
         $client = $defaultLifetime

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ protected function doSave(array $values, $lifetime): array\|bool`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`$upsertOptions = new UpsertOptions();`
`186`		`- $upsertOptions->expiry($lifetime);`
	`186`	`+ $upsertOptions->expiry((new \DateTimeImmutable())->modify('+'.$lifetime.' seconds'));`
`187`	`187`
`188`	`188`	`$ko = [];`
`189`	`189`	`foreach ($values as $key => $value) {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* @requires extension couchbase <4.0.0`
`21`		`- * @requires extension couchbase >=3.0.0`
	`21`	`+ * @requires extension couchbase >=3.0.5`
`22`	`22`	`*`
`23`	`23`	`* @group integration`
`24`	`24`	`*`
`@@ -36,7 +36,7 @@ class CouchbaseCollectionAdapterTest extends AdapterTestCase`
`36`	`36`	`public static function setupBeforeClass(): void`
`37`	`37`	`{`
`38`	`38`	`if (!CouchbaseCollectionAdapter::isSupported()) {`
`39`		`- self::markTestSkipped('Couchbase >= 3.0.0 < 4.0.0 is required.');`
	`39`	`+ self::markTestSkipped('Couchbase >= 3.0.5 < 4.0.0 is required.');`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`self::$client = AbstractAdapter::createConnection('couchbase://'.getenv('COUCHBASE_HOST').'/cache',`
`@@ -47,7 +47,7 @@ public static function setupBeforeClass(): void`
`47`	`47`	`public function createCachePool($defaultLifetime = 0): CacheItemPoolInterface`
`48`	`48`	`{`
`49`	`49`	`if (!CouchbaseCollectionAdapter::isSupported()) {`
`50`		`- self::markTestSkipped('Couchbase >= 3.0.0 < 4.0.0 is required.');`
	`50`	`+ self::markTestSkipped('Couchbase >= 3.0.5 < 4.0.0 is required.');`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`$client = $defaultLifetime`