bug #53054 [Cache] Fix expiration time for CouchbaseCollection (alexandre-daubois)

nicolas-grekas · nicolas-grekas · commit c7f40f3ba583 · 2023-12-29T16:28:14.000+01:00
This PR was merged into the 6.3 branch. Discussion ---------- [Cache] Fix expiration time for CouchbaseCollection | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT A refactoring has been done in Couchbase extension 3.0.5 about expiry time: https://github.com/couchbase/php-couchbase/releases/tag/v3.0.5 (see PCBC-715) In order to put things together, let's constantly use an absolute time point here. This also fixes a failing test of integration tests in 6.3. Tests skipping messages have been updated to match `CouchbaseCollectionAdapter::isSupported()`. Commits ------- e286f38 [Cache] Fix expiration time for CouchbaseCollection
diff --git a/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php b/src/Symfony/Component/Cache/Adapter/CouchbaseCollectionAdapter.php
@@ -35,7 +35,7 @@ class CouchbaseCollectionAdapter extends AbstractAdapter
     public function __construct(Collection $connection, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
     {
         if (!static::isSupported()) {
-            throw new CacheException('Couchbase >= 3.0.0 < 4.0.0 is required.');
+            throw new CacheException('Couchbase >= 3.0.5 < 4.0.0 is required.');
         }
 
         $this->maxIdLength = static::MAX_KEY_LENGTH;
@@ -54,7 +54,7 @@ public static function createConnection(#[\SensitiveParameter] array|string $dsn
         }
 
         if (!static::isSupported()) {
-            throw new CacheException('Couchbase >= 3.0.0 < 4.0.0 is required.');
+            throw new CacheException('Couchbase >= 3.0.5 < 4.0.0 is required.');
         }
 
         set_error_handler(function ($type, $msg, $file, $line): bool { throw new \ErrorException($msg, 0, $type, $file, $line); });
@@ -183,7 +183,7 @@ protected function doSave(array $values, $lifetime): array|bool
         }
 
         $upsertOptions = new UpsertOptions();
-        $upsertOptions->expiry($lifetime);
+        $upsertOptions->expiry(time() + $lifetime);
 
         $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
`@@ -35,7 +35,7 @@ class CouchbaseCollectionAdapter extends AbstractAdapter`
`35`	`35`	`public function __construct(Collection $connection, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)`
`36`	`36`	`{`
`37`	`37`	`if (!static::isSupported()) {`
`38`		`- throw new CacheException('Couchbase >= 3.0.0 < 4.0.0 is required.');`
	`38`	`+ throw new CacheException('Couchbase >= 3.0.5 < 4.0.0 is required.');`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`$this->maxIdLength = static::MAX_KEY_LENGTH;`
`@@ -54,7 +54,7 @@ public static function createConnection(#[\SensitiveParameter] array\|string $dsn`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`if (!static::isSupported()) {`
`57`		`- throw new CacheException('Couchbase >= 3.0.0 < 4.0.0 is required.');`
	`57`	`+ throw new CacheException('Couchbase >= 3.0.5 < 4.0.0 is required.');`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`set_error_handler(function ($type, $msg, $file, $line): bool { throw new \ErrorException($msg, 0, $type, $file, $line); });`
`@@ -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(time() + $lifetime);`
`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`