Display debug info

jderusse · jderusse · commit fcbf0bf76ea1 · 2020-11-20T23:06:42.000+01:00
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -93,17 +93,12 @@ jobs:
 
             -   name: Install system dependencies
                 run: |
-                    echo "::group::add apt sources"
-                    sudo wget -O - http://packages.couchbase.com/ubuntu/couchbase.key | sudo apt-key add -
-                    echo "deb http://packages.couchbase.com/ubuntu bionic bionic/main" | sudo tee /etc/apt/sources.list.d/couchbase.list
-                    echo "::endgroup::"
-
                     echo "::group::apt-get update"
                     sudo apt-get update
                     echo "::endgroup::"
 
                     echo "::group::install tools & libraries"
-                    sudo apt-get install libcouchbase-dev librdkafka-dev
+                    sudo apt-get install librdkafka-dev
                     echo "::endgroup::"
 
             -   name: Configure Couchbase
@@ -122,6 +117,11 @@ jobs:
                     php-version: "${{ matrix.php }}"
                     tools: pecl
 
+            -   name: Display versions
+                run: |
+                    php -r 'foreach (get_loaded_extensions() as $extension) echo $extension . " " . phpversion($extension) . PHP_EOL;'
+                    php -i
+
             -   name: Load fixtures
                 uses: docker://bitnami/openldap
                 with:
diff --git a/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php b/src/Symfony/Component/Cache/Adapter/CouchbaseBucketAdapter.php
@@ -42,7 +42,7 @@ class CouchbaseBucketAdapter extends AbstractAdapter
     public function __construct(\CouchbaseBucket $bucket, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
     {
         if (!static::isSupported()) {
-            throw new CacheException('Couchbase >= 2.6.0 is required.');
+            throw new CacheException('Couchbase >= 2.6.0 < 3.0.0 is required.');
         }
 
         $this->maxIdLength = static::MAX_KEY_LENGTH;
@@ -66,7 +66,7 @@ public static function createConnection($servers, array $options = []): \Couchba
         }
 
         if (!static::isSupported()) {
-            throw new CacheException('Couchbase >= 2.6.0 is required.');
+            throw new CacheException('Couchbase >= 2.6.0 < 3.0.0 is required.');
         }
 
         set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });
@@ -125,7 +125,7 @@ public static function createConnection($servers, array $options = []): \Couchba
 
     public static function isSupported(): bool
     {
-        return \extension_loaded('couchbase') && version_compare(phpversion('couchbase'), '2.6.0', '>=');
+        return \extension_loaded('couchbase') && version_compare(phpversion('couchbase'), '2.6.0', '>=') && version_compare(phpversion('couchbase'), '3.0', '<');
     }
 
     private static function getOptions(string $options): array
diff --git a/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseBucketAdapterTest.php b/src/Symfony/Component/Cache/Tests/Adapter/CouchbaseBucketAdapterTest.php
@@ -16,7 +16,8 @@
 use Symfony\Component\Cache\Adapter\CouchbaseBucketAdapter;
 
 /**
- * @requires extension couchbase 2.6.0
+ * @requires extension couchbase <3.0.0
+ * @requires extension couchbase >=2.6.0
  * @group integration
  *
  * @author Antonio Jose Cerezo Aranda <aj.cerezo@gmail.com>
@@ -32,6 +33,10 @@ class CouchbaseBucketAdapterTest extends AdapterTestCase
 
     public static function setupBeforeClass(): void
     {
+        if (!CouchbaseBucketAdapter::isSupported()) {
+            self::markTestSkipped('Couchbase >= 2.6.0 < 3.0.0 is required.');
+        }
+
         self::$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
`@@ -42,7 +42,7 @@ class CouchbaseBucketAdapter extends AbstractAdapter`
`42`	`42`	`public function __construct(\CouchbaseBucket $bucket, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)`
`43`	`43`	`{`
`44`	`44`	`if (!static::isSupported()) {`
`45`		`- throw new CacheException('Couchbase >= 2.6.0 is required.');`
	`45`	`+ throw new CacheException('Couchbase >= 2.6.0 < 3.0.0 is required.');`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`$this->maxIdLength = static::MAX_KEY_LENGTH;`
`@@ -66,7 +66,7 @@ public static function createConnection($servers, array $options = []): \Couchba`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`if (!static::isSupported()) {`
`69`		`- throw new CacheException('Couchbase >= 2.6.0 is required.');`
	`69`	`+ throw new CacheException('Couchbase >= 2.6.0 < 3.0.0 is required.');`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });`
`@@ -125,7 +125,7 @@ public static function createConnection($servers, array $options = []): \Couchba`
`125`	`125`
`126`	`126`	`public static function isSupported(): bool`
`127`	`127`	`{`
`128`		`- return \extension_loaded('couchbase') && version_compare(phpversion('couchbase'), '2.6.0', '>=');`
	`128`	`+ return \extension_loaded('couchbase') && version_compare(phpversion('couchbase'), '2.6.0', '>=') && version_compare(phpversion('couchbase'), '3.0', '<');`
`129`	`129`	`}`
`130`	`130`
`131`	`131`	`private static function getOptions(string $options): array`