Fixed Couchdb tests & driver

Author: Geolim4

lib/Phpfastcache/Drivers/Couchdb/Config.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/Drivers/Couchdb/Driver.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);
             }

tests/Couchdb.test.php

@@ -17,11 +17,16 @@
 $config = new CouchdbConfig();
 
 try{
+    $config->setUsername('admin');
+    $config->setPassword('travis');
     $cacheInstance = CacheManager::getInstance('Couchdb', $config);
 } catch (PhpfastcacheDriverConnectException $e){
     $config->setUsername('admin');
     $config->setPassword('travis');
     $cacheInstance = CacheManager::getInstance('Couchdb', $config);
+} catch(PhpfastcacheDriverConnectException $e){
+    $testHelper->printSkipText('Couchdb server unavailable: ' . $e->getMessage());
+    $testHelper->terminateTest();
 }
 
 $cacheKey = str_shuffle(uniqid('pfc', true));