Merge pull request #808 from Geolim4/master

Upgraded travis dist to repair broken php8 tests + dropped Riak support definitely.

Author: Geolim4

.travis.yml

@@ -9,13 +9,12 @@
 # @author Georges.L (Geolim4)  <[email protected]>
 #
 os: linux
-dist: trusty
+dist: bionic
 language: php
 services:
   - memcached
   - redis
   - couchdb
-  - riak
   - mongodb
 
 before_script:
@@ -25,33 +24,33 @@ before_script:
     else
       pecl channel-update pecl.php.net;
       yes | pecl install -f mongodb-stable;
+      yes | pecl install -f memcached;
       yes | pecl install -f apcu-stable || true;
       phpenv config-add bin/ci/php_phpfastcache.ini;
     fi
   - sleep 15
   - mongo pfc_test --eval 'db.createUser({user:"travis",pwd:"test",roles:["readWrite"]});'
 
 php:
-  # - 5.3
-  # - 5.4
-  # - 5.5
-  # - 5.6
-  #- 7.0
-  # - 7.1
-  # - 7.2
   - 7.3
   - 7.4
   - 8.0
-  # - nightly # crashes on almost every builds, very unstable
-  - hhvm
-
+  - nightly
 jobs:
   fast_finish: true
   allow_failures:
-    # - php: nightly
-    - php: hhvm
-    - php: 8.0
-
+    - php: nightly
+    # - php: hhvm
+  include:
+    - dist: trusty
+      php: 7.3
+    - dist: trusty
+      php: 7.4
+  exclude:
+    - dist: bionic
+      php: 7.3
+    - dist: bionic
+      php: 7.4
 install:
   - ./bin/ci/install_dependencies.sh
 

README.md

@@ -30,9 +30,9 @@ This ensure you that the library is completely reliable when it come to manipula
 |  `Leveldb`                      | `Mongodb`                          | `Memstatic`                   | `RandomReplicationCluster`        |
 |  `Memcache(d)`                  | `Predis`                           |                               |                                   |
 |  `Sqlite`                       | `Redis`                            |                               |                                   |
-|  `Wincache`                     | `Riak`                             |                               |                                   |
-|  `Zend Disk Cache`              | `Ssdb`                             |                               |                                   |
-|                                 | `Zend Memory Cache`                |                               |                                   |
+|  `Wincache`                     | `Ssdb`                             |                               |                                   |
+|  `Zend Disk Cache`              | `Zend Memory Cache`                |                               |                                   |
+|                                 |                                    |                               |                                   |
 
 \* Driver descriptions available in DOCS/DRIVERS.md
 

bin/ci/install_dependencies.sh

@@ -2,4 +2,4 @@
 
 composer self-update;
 composer install --ignore-platform-reqs;
-composer require "phpfastcache/couchdb:~1.0.0" "phpfastcache/phpssdb:~1.0.0" "predis/predis:~1.1.0" "mongodb/mongodb:^1.1" "phpfastcache/riak-client:^1.4.4" --ignore-platform-reqs;
+composer require "phpfastcache/couchdb:~1.0.0" "phpfastcache/phpssdb:~1.0.0" "predis/predis:~1.1.0" "mongodb/mongodb:^1.1" --ignore-platform-reqs;

composer.json

@@ -44,12 +44,10 @@
         "predis/predis": "~1.1.0",
         "mongodb/mongodb": "^1.1",
         "phpfastcache/phpssdb": "~1.0.0",
-        "phpfastcache/couchdb": "~1.0.0",
-        "phpfastcache/riak-client": "~1.4.4"
+        "phpfastcache/couchdb": "~1.0.0"
     },
     "conflict": {
-        "doctrine/couchdb": "*",
-        "basho/riak": "*"
+        "doctrine/couchdb": "*"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -33,7 +33,7 @@
   * A high-performance memory driver using a in-memory data structure storage. Less efficient than Redis driver as it is an embedded library
 * Redis
   * A very high-performance memory driver using a in-memory data structure storage. More efficient than Predis driver as it is an compiled library
-* Riak
+* Riak **(REMOVED in V8.0.6)**
   * A very high-performance NoSQL driver using a key-value pair system
 * Sqlite
   * A Sqlite driver that use serialization for storing data for regular performances. A _$path_ config must be specified, else the system temporary directory will be used.
@@ -46,4 +46,4 @@
 * Zend Disk Cache ( * Requires ZendServer Version 4 or higher * )
   * The Zend Data Cache is a by ZendServer supported file cache. The cache is for regular performance.
 * Zend Memory Cache ( * Requires ZendServer Version 4 or higher * )
-  * The Zend Memory Cache is a by ZendServer supported memory cache. The cache is for high-performance applications.
+  * The Zend Memory Cache is a by ZendServer supported memory cache. The cache is for high-performance applications.

docs/DRIVERS.md

@@ -50,7 +50,6 @@
  * @method static ExtendedCacheItemPoolInterface Mongodb() Mongodb($config = []) Return a driver "Mongodb" instance
  * @method static ExtendedCacheItemPoolInterface Predis() Predis($config = []) Return a driver "Predis" instance
  * @method static ExtendedCacheItemPoolInterface Redis() Redis($config = []) Return a driver "Pedis" instance
- * @method static ExtendedCacheItemPoolInterface Riak() Riak($config = []) Return a driver "Riak" instance
  * @method static ExtendedCacheItemPoolInterface Sqlite() Sqlite($config = []) Return a driver "Sqlite" instance
  * @method static ExtendedCacheItemPoolInterface Ssdb() Ssdb($config = []) Return a driver "Ssdb" instance
  * @method static ExtendedCacheItemPoolInterface Wincache() Wincache($config = []) Return a driver "Wincache" instance

docs/examples/riak.php

@@ -24,16 +24,12 @@ class Config extends ConfigurationOption
      * @var string
      */
     protected $host = '127.0.0.1';
+
     /**
      * @var int
      */
     protected $port = 5984;
 
-    /**
-     * @var string
-     */
-    protected $path = '/';
-
     /**
      * @var string
      */
@@ -181,4 +177,4 @@ public function setTimeout(int $timeout): self
         $this->timeout = $timeout;
         return $this;
     }
-}
+}

lib/Phpfastcache/CacheManager.php

@@ -94,7 +94,7 @@ protected function driverConnect(): bool
         }
         $url .= $clientConfig->getHost();
         $url .= ":{$clientConfig->getPort()}";
-        $url .= $clientConfig->getPath();
+        $url .= '/' . $this->getDatabaseName();
 
         $this->instance = CouchDBClient::create(
             [
@@ -122,11 +122,16 @@ protected function getDatabaseName(): string
      */
     protected function createDatabase()
     {
-        if (!in_array($this->instance->getDatabase(), $this->instance->getAllDatabases(), true)) {
-            $this->instance->createDatabase($this->instance->getDatabase());
+        if (!in_array($this->getDatabaseName(), $this->instance->getAllDatabases(), true)) {
+            $this->instance->createDatabase($this->getDatabaseName());
         }
     }
 
+    protected function getCouchDbItemKey(CacheItemInterface $item)
+    {
+        return 'pfc_' . $item->getEncodedKey();
+    }
+
     /**
      * @param CacheItemInterface $item
      * @return null|array
@@ -135,7 +140,7 @@ protected function createDatabase()
     protected function driverRead(CacheItemInterface $item)
     {
         try {
-            $response = $this->instance->findDocument($item->getEncodedKey());
+            $response = $this->instance->findDocument($this->getCouchDbItemKey($item));
         } catch (CouchDBException $e) {
             throw new PhpfastcacheDriverException('Got error while trying to get a document: ' . $e->getMessage(), 0, $e);
         }
@@ -166,8 +171,8 @@ protected function driverWrite(CacheItemInterface $item): bool
             try {
                 $this->instance->putDocument(
                     ['data' => $this->encode($this->driverPreWrap($item))],
-                    $item->getEncodedKey(),
-                    $this->getLatestDocumentRevision($item->getEncodedKey())
+                    $this->getCouchDbItemKey($item),
+                    $this->getLatestDocumentRevision($this->getCouchDbItemKey($item))
                 );
             } catch (CouchDBException $e) {
                 throw new PhpfastcacheDriverException('Got error while trying to upsert a document: ' . $e->getMessage(), 0, $e);
@@ -217,7 +222,7 @@ protected function driverDelete(CacheItemInterface $item): bool
          */
         if ($item instanceof Item) {
             try {
-                $this->instance->deleteDocument($item->getEncodedKey(), $this->getLatestDocumentRevision($item->getEncodedKey()));
+                $this->instance->deleteDocument($this->getCouchDbItemKey($item), $this->getLatestDocumentRevision($this->getCouchDbItemKey($item)));
             } catch (CouchDBException $e) {
                 throw new PhpfastcacheDriverException('Got error while trying to delete a document: ' . $e->getMessage(), 0, $e);
             }