Merge branch 'master' into master

Author: Geolim4

lib/Phpfastcache/Drivers/Mongodb/Config.php

@@ -38,9 +38,9 @@ class Config extends ConfigurationOption
     protected $password = '';
 
     /**
-     * @var string
+     * @var array
      */
-    protected $servers = '';
+    protected $servers = [];
 
     /**
      * @var string
@@ -52,6 +52,11 @@ class Config extends ConfigurationOption
      */
     protected $databaseName = Driver::MONGODB_DEFAULT_DB_NAME;
 
+    /**
+     * @var array
+     */
+    protected $options = [];
+
     /**
      * @return string
      */
@@ -145,7 +150,7 @@ public function setPassword(string $password): self
     /**
      * @return string
      */
-    public function getServers(): string
+    public function getServers(): array
     {
         return $this->servers;
     }
@@ -154,7 +159,7 @@ public function getServers(): string
      * @param string $servers
      * @return self
      */
-    public function setServers(string $servers): self
+    public function setServers(array $servers): self
     {
         $this->servers = $servers;
         return $this;
@@ -195,4 +200,23 @@ public function setDatabaseName(string $databaseName): self
         $this->databaseName = $databaseName;
         return $this;
     }
+
+    /**
+     * @return array
+     */
+    public function getOptions(): array
+    {
+        return $this->options;
+    }
+
+    /**
+     * @see https://docs.mongodb.com/manual/reference/connection-string/#connections-connection-options
+     * @param array $options
+     * @return Config
+     */
+    public function setOptions(array $options): self
+    {
+        $this->options = $options;
+        return $this;
+    }
 }

lib/Phpfastcache/Drivers/Mongodb/Driver.php

@@ -224,19 +224,31 @@ protected function collectionExists($collectionName): bool
      */
     protected function buildConnectionURI($databaseName = ''): string
     {
+        $servers = $this->getConfig()->getServers();
+        $options = $this->getConfig()->getOptions();
+
         $host = $this->getConfig()->getHost();
         $port = $this->getConfig()->getPort();
         $username = $this->getConfig()->getUsername();
         $password = $this->getConfig()->getPassword();
 
+        if( \count($servers) > 0 ){
+            $host = \array_reduce($servers, function($carry, $data){
+                $carry .= ($carry === '' ? '' : ',').$data['host'].':'.$data['port'];
+                return $carry;
+            }, '');
+            $port = false;
+        }
+
         return implode('', [
             'mongodb://',
             ($username ?: ''),
             ($password ? ":{$password}" : ''),
             ($username ? '@' : ''),
             $host,
-            ($port !== 27017 ? ":{$port}" : ''),
+            ($port !== 27017 && $port !== false ? ":{$port}" : ''),
             ($databaseName ? "/{$databaseName}" : ''),
+            (\count($options) > 0 ? '?'.\http_build_query($options) : ''),
         ]);
     }