Attempting to fix issue #445

Author: Geolim4

examples/memcache.php

@@ -17,14 +17,21 @@
 // Include composer autoloader
 require __DIR__ . '/../vendor/autoload.php';
 
-$InstanceCache = CacheManager::getInstance('memcache');
+$InstanceCache = CacheManager::getInstance('memcache', ['servers' => [
+  [
+    'host' =>'127.0.0.1',
+    'port' => 11211,
+    // 'sasl_user' => false, // optional
+    // 'sasl_password' => false // optional
+  ],
+]]);
+
 /**
  * In case you need to enable compress_data option:
  * $InstanceCache = CacheManager::getInstance('memcache', ['compress_data' => true]);
  *
  * In case you need SASL authentication:
- * $InstanceCache = CacheManager::getInstance('memcache', ['sasl_user' => 'hackerman', 'sasl_password' => '12345']);
- * Warning: Memcache needs to be compiled with a specific option (--enable-memcached-sasl) to use sasl authentication, see:
+ * Memcache needs to be compiled with a specific option (--enable-memcached-sasl) to use sasl authentication, see:
  * http://php.net/manual/fr/memcached.installation.php
  */
 

examples/memcached.php

@@ -17,11 +17,18 @@
 // Include composer autoloader
 require __DIR__ . '/../vendor/autoload.php';
 
-$InstanceCache = CacheManager::getInstance('memcached');
+$InstanceCache = CacheManager::getInstance(['servers' => [
+  [
+    'host' =>'127.0.0.1',
+    'port' => 11211,
+    // 'sasl_user' => false, // optional
+    // 'sasl_password' => false // optional
+  ],
+]]);
+
 /**
  * In case you need SASL authentication:
- * $InstanceCache = CacheManager::getInstance('memcache', ['sasl_user' => 'hackerman', 'sasl_password' => '12345']);
- * Warning: Memcache needs to be compiled with a specific option (--enable-memcached-sasl) to use sasl authentication, see:
+ * Memcache needs to be compiled with a specific option (--enable-memcached-sasl) to use sasl authentication, see:
  * http://php.net/manual/fr/memcached.installation.php
  */
 

src/phpFastCache/Drivers/Memcache/Driver.php

@@ -17,7 +17,6 @@
 use Memcache as MemcacheSoftware;
 use phpFastCache\Core\DriverAbstract;
 use phpFastCache\Core\MemcacheDriverCollisionDetectorTrait;
-use phpFastCache\Core\StandardPsr6StructureTrait;
 use phpFastCache\Entities\driverStatistic;
 use phpFastCache\Exceptions\phpFastCacheDriverCheckException;
 use phpFastCache\Exceptions\phpFastCacheDriverException;
@@ -26,6 +25,7 @@
 /**
  * Class Driver
  * @package phpFastCache\Drivers
+ * @property MemcacheSoftware $instance
  */
 class Driver extends DriverAbstract
 {
@@ -49,7 +49,6 @@ public function __construct(array $config = [])
         if (!$this->driverCheck()) {
             throw new phpFastCacheDriverCheckException(sprintf(self::DRIVER_CHECK_FAILURE, $this->getDriverName()));
         } else {
-            $this->instance = new MemcacheSoftware();
             $this->driverConnect();
 
             if (array_key_exists('compress_data', $config) && $config[ 'compress_data' ] === true) {
@@ -128,16 +127,23 @@ protected function driverClear()
      */
     protected function driverConnect()
     {
-        $servers = (!empty($this->config[ 'memcache' ]) && is_array($this->config[ 'memcache' ]) ? $this->config[ 'memcache' ] : []);
+        $this->instance = new MemcacheSoftware();
+
+        $servers = (!empty($this->config[ 'servers' ]) && is_array($this->config[ 'servers' ]) ? $this->config[ 'servers' ] : []);
         if (count($servers) < 1) {
             $servers = [
-              ['127.0.0.1', 11211],
+              [
+                'host' =>'127.0.0.1',
+                'port' => 11211,
+                'sasl_user' => false,
+                'sasl_password' => false
+              ],
             ];
         }
 
         foreach ($servers as $server) {
             try {
-                if (!$this->instance->addserver($server[ 0 ], $server[ 1 ])) {
+                if (!$this->instance->addServer($server['host'], $server['port'])) {
                     $this->fallback = true;
                 }
                 if(!empty($server[ 'sasl_user' ]) && !empty($server[ 'sasl_password'])){

src/phpFastCache/Drivers/Memcached/Driver.php

@@ -17,7 +17,6 @@
 use Memcached as MemcachedSoftware;
 use phpFastCache\Core\DriverAbstract;
 use phpFastCache\Core\MemcacheDriverCollisionDetectorTrait;
-use phpFastCache\Core\StandardPsr6StructureTrait;
 use phpFastCache\Entities\driverStatistic;
 use phpFastCache\Exceptions\phpFastCacheDriverCheckException;
 use phpFastCache\Exceptions\phpFastCacheDriverException;
@@ -26,6 +25,7 @@
 /**
  * Class Driver
  * @package phpFastCache\Drivers
+ * @property MemcachedSoftware $instance
  */
 class Driver extends DriverAbstract
 {
@@ -44,7 +44,6 @@ public function __construct(array $config = [])
         if (!$this->driverCheck()) {
             throw new phpFastCacheDriverCheckException(sprintf(self::DRIVER_CHECK_FAILURE, $this->getDriverName()));
         } else {
-            $this->instance = new MemcachedSoftware();
             $this->driverConnect();
         }
     }
@@ -127,16 +126,23 @@ protected function driverClear()
      */
     protected function driverConnect()
     {
-        $servers = (!empty($this->config[ 'memcache' ]) && is_array($this->config[ 'memcache' ]) ? $this->config[ 'memcache' ] : []);
+        $this->instance = new MemcachedSoftware();
+
+        $servers = (!empty($this->config[ 'servers' ]) && is_array($this->config[ 'servers' ]) ? $this->config[ 'servers' ] : []);
         if (count($servers) < 1) {
             $servers = [
-              ['127.0.0.1', 11211],
+              [
+                'host' =>'127.0.0.1',
+                'port' => 11211,
+                'sasl_user' => false,
+                'sasl_password' => false
+              ],
             ];
         }
 
         foreach ($servers as $server) {
             try {
-                if (!$this->instance->addServer($server[ 0 ], $server[ 1 ])) {
+                if (!$this->instance->addServer($server['host'], $server['port'])) {
                     $this->fallback = true;
                 }
                 if(!empty($server[ 'sasl_user' ]) && !empty($server[ 'sasl_password'])){