Merge pull request #812 from Geolim4/master

Improved Couchdb config

Author: Geolim4

lib/Phpfastcache/Drivers/Couchdb/Config.php

@@ -17,6 +17,7 @@
 namespace Phpfastcache\Drivers\Couchdb;
 
 use Phpfastcache\Config\ConfigurationOption;
+use Phpfastcache\Exceptions\PhpfastcacheInvalidArgumentException;
 
 class Config extends ConfigurationOption
 {
@@ -66,8 +67,16 @@ public function getDatabase(): string
      */
     public function setDatabase(string $database): Config
     {
-        $this->database = $database;
-        return $this;
+        /** @see https://docs.couchdb.org/en/latest/api/database/common.html#put--db */
+        if(\preg_match('#^[a-z][a-z0-9_\-+\$()/]+$#', $database)){
+            $this->database = $database;
+            return $this;
+        }
+
+        throw new PhpfastcacheInvalidArgumentException(sprintf(
+            "Error: illegal_database_name Name: '%s'. Only lowercase characters (a-z), digits (0-9), and any of the characters _, $, (, ), +, -, and / are allowed. Must begin with a letter.",
+            $database
+        ));
     }
 
     /**

lib/Phpfastcache/Drivers/Couchdb/Driver.php

@@ -16,7 +16,7 @@
 
 namespace Phpfastcache\Drivers\Couchdb;
 
-use Doctrine\CouchDB\{CouchDBClient, CouchDBException};
+use Doctrine\CouchDB\{CouchDBClient, CouchDBException, HTTP\HTTPException};
 use Phpfastcache\Cluster\AggregatablePoolInterface;
 use Phpfastcache\Core\Pool\{DriverBaseTrait, ExtendedCacheItemPoolInterface};
 use Phpfastcache\Entities\DriverStatistic;
@@ -94,7 +94,7 @@ protected function driverConnect(): bool
         }
         $url .= $clientConfig->getHost();
         $url .= ":{$clientConfig->getPort()}";
-        $url .= '/' . $this->getDatabaseName();
+        $url .= '/' . \urlencode($this->getDatabaseName());
 
         $this->instance = CouchDBClient::create(
             [
@@ -122,7 +122,9 @@ protected function getDatabaseName(): string
      */
     protected function createDatabase()
     {
-        if (!in_array($this->getDatabaseName(), $this->instance->getAllDatabases(), true)) {
+        try{
+            $this->instance->getDatabaseInfo($this->getDatabaseName());
+        } catch(HTTPException $e){
             $this->instance->createDatabase($this->getDatabaseName());
         }
     }
@@ -188,7 +190,7 @@ protected function driverWrite(CacheItemInterface $item): bool
      */
     protected function getLatestDocumentRevision($docId)
     {
-        $path = '/' . $this->getDatabaseName() . '/' . urlencode($docId);
+        $path = '/' . \urlencode($this->getDatabaseName()) . '/' . urlencode($docId);
 
         $response = $this->instance->getHttpClient()->request(
             'HEAD',

tests/Couchdb.test.php

@@ -13,7 +13,9 @@
 chdir(__DIR__);
 require_once __DIR__ . '/../vendor/autoload.php';
 $testHelper = new TestHelper('Couchdb driver');
+
 $config = new CouchdbConfig();
+$config->setDatabase('phpfastcache($test/-)+1337');
 $config->setItemDetailedDate(true);
 try{
     $cacheInstance = CacheManager::getInstance('Couchdb', $config);