[Cache] Fix CouchbaseCollectionAdapterTest

derrabus · derrabus · commit 817420fe8c8f · 2024-05-17T20:46:25.000+02:00
diff --git a/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php b/src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
@@ -118,7 +118,7 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra
             return MemcachedAdapter::createConnection($dsn, $options);
         }
         if (str_starts_with($dsn, 'couchbase:')) {
-            if (CouchbaseBucketAdapter::isSupported()) {
+            if (class_exists('CouchbaseBucket') && CouchbaseBucketAdapter::isSupported()) {
                 return CouchbaseBucketAdapter::createConnection($dsn, $options);
             }
 
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseCollectionAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseCollectionAdapterTest.php
@@ -12,30 +12,25 @@
 namespace Symfony\Component\Cache\Tests\Adapter;
 
 use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
 use Symfony\Component\Cache\Adapter\CouchbaseCollectionAdapter;
 
 /**
  * @requires extension couchbase <4.0.0
  * @requires extension couchbase >=3.0.5
  *
- * @group legacy integration
+ * @group integration
  *
  * @author Antonio Jose Cerezo Aranda <aj.cerezo@gmail.com>
  */
 class CouchbaseCollectionAdapterTest extends AdapterTestCase
 {
-    use ExpectDeprecationTrait;
-
     protected $skippedTests = [
         'testClearPrefix' => 'Couchbase cannot clear by prefix',
     ];
 
     public function createCachePool($defaultLifetime = 0): CacheItemPoolInterface
     {
-        $this->expectDeprecation('Since symfony/cache 7.1: The "Symfony\Component\Cache\Adapter\CouchbaseBucketAdapter" class is deprecated, use "Symfony\Component\Cache\Adapter\CouchbaseCollectionAdapter" instead.');
-
         $client = AbstractAdapter::createConnection('couchbase://'.getenv('COUCHBASE_HOST').'/cache',
             ['username' => getenv('COUCHBASE_USER'), 'password' => getenv('COUCHBASE_PASS')]
         );

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public static function createConnection(#[\SensitiveParameter] string $dsn, arra`
`118`	`118`	`return MemcachedAdapter::createConnection($dsn, $options);`
`119`	`119`	`}`
`120`	`120`	`if (str_starts_with($dsn, 'couchbase:')) {`
`121`		`- if (CouchbaseBucketAdapter::isSupported()) {`
	`121`	`+ if (class_exists('CouchbaseBucket') && CouchbaseBucketAdapter::isSupported()) {`
`122`	`122`	`return CouchbaseBucketAdapter::createConnection($dsn, $options);`
`123`	`123`	`}`
`124`	`124`