Skip to content

[Cache] Fix irrelevant deprecation when connecting to Couchbase #54979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 21, 2024
Merged

[Cache] Fix irrelevant deprecation when connecting to Couchbase #54979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Component/Cache/Adapter/AbstractAdapter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
7 changes: 1 addition & 6 deletions src/Symfony/Component/Cache/Tests/Adapter/CouchbaseCollectionAdapterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')]
);
Expand Down
Loading