Added keyspace prefix option

Author: Geolim4

config/install/phpfastcache.settings.yml

@@ -1,5 +1,6 @@
 phpfastcache_enabled: false
 phpfastcache_env: prod
+phpfastcache_prefix: ''
 phpfastcache_default_ttl: 900
 phpfastcache_htaccess: true
 phpfastcache_default_driver: files

src/Cache/PhpFastCacheBackend.php

@@ -33,18 +33,25 @@ class PhpFastCacheBackend implements CacheBackendInterface
      */
     protected $binPrefix;
 
+    /**
+     * @var array
+     */
+    protected $settings;
+
     /**
      * Constructs a new PhpFastCacheBackend instance.
      *
      * @param $bin string
      *   The name of the cache bin.
      * @param ExtendedCacheItemPoolInterface $cachePool
+     * @param array $settings
      */
-    public function __construct($bin, $cachePool)
+    public function __construct($bin, $cachePool, $settings)
     {
         $this->cachePool = $cachePool;
         $this->bin = $bin;
         $this->binPrefix = 'pfc::' . $this->bin . '::';
+        $this->settings = $settings;
     }
 
 
@@ -102,7 +109,6 @@ public function set($cid, $data, $expire = Cache::PERMANENT, array $tags = [])
         $cacheObject = $this->getDrupalCacheStdObject();
         $cacheObject->cid = $cid;
         $cacheObject->data = $data;
-        $cacheObject->expire = time();
         $cacheObject->expire = $expire;
         $cacheObject->tags = $tags;
         $cacheObject->serialized = false;
@@ -244,14 +250,25 @@ protected function getDrupalCacheStdObject()
      * @see DatabaseBackend::normalizeCid()
      */
     protected function normalizeCid($cid) {
-        // Nothing to do if the ID is a US ASCII string of 255 characters or less.
+        /**
+         * Add PhpFastCache Prefix
+         */
+        $cid = $this->settings['phpfastcache_prefix'] . '-' . $cid;
+
+        /**
+         * Nothing to do if the ID is a US ASCII string of 255 characters or less.
+         */
         $cid_is_ascii = mb_check_encoding($cid, 'ASCII');
         if (strlen($cid) <= 255 && $cid_is_ascii) {
             return $cid;
         }
-        // Return a string that uses as much as possible of the original cache ID
-        // with the hash appended.
+
+        /**
+         * Return a string that uses as much as possible of the original cache ID
+         * with the hash appended.
+         */
         $hash = Crypt::hashBase64($cid);
+
         if (!$cid_is_ascii) {
             return $hash;
         }

src/Cache/PhpFastCacheBackendFactory.php

@@ -66,7 +66,7 @@ public function __construct(Connection $connection)
         require_once __DIR__ . '/../../phpfastcache-php/src/autoload.php';
         require_once __DIR__ . '/../../phpssdb-php/src/autoload.php';
 
-        $this->backendClass = 'Drupal\phpfastcache\Cache\PhpFastCacheBackend';
+        $this->backendClass = PhpFastCacheBackend::class;
         $this->connection = $connection;
         $this->settings = $this->getSettingsFromDatabase();
         $this->cachePool = $this->getPhpFastCacheInstance();
@@ -245,10 +245,10 @@ protected function getSettingsFromDatabase()
      *   The cache backend object for the specified cache bin.
      */
     public function get($bin) {
-        if(in_array($bin, $this->settings['phpfastcache_bins'])){
-          return new $this->backendClass($bin, $this->cachePool);
+        if(in_array($bin, $this->settings['phpfastcache_bins']) || in_array('default', $this->settings['phpfastcache_bins'])){
+          return new $this->backendClass($bin, $this->cachePool, $this->settings);
         }else{
-          return new PhpFastCacheVoidBackend($bin, $this->cachePool);
+          return new PhpFastCacheVoidBackend($bin, $this->cachePool, $this->settings);
         }
     }
 }

src/Cache/PhpFastCacheVoidBackend.php

@@ -5,13 +5,13 @@
 namespace Drupal\phpfastcache\Cache;
 
 use Drupal\Core\Cache\Cache;
-use Drupal\Core\Cache\CacheTagsChecksumInterface;
-
+use Drupal\Core\Cache\CacheBackendInterface;
+use phpFastCache\Cache\ExtendedCacheItemPoolInterface;
 
 /**
  * Class PhpFastCacheService
  */
-class PhpFastCacheVoidBackend implements \Drupal\Core\Cache\CacheBackendInterface
+class PhpFastCacheVoidBackend implements CacheBackendInterface
 {
     /**
      * The name of the cache bin to use.
@@ -29,18 +29,16 @@ class PhpFastCacheVoidBackend implements \Drupal\Core\Cache\CacheBackendInterfac
      */
     protected $binPrefix;
 
-    public function __construct($bin, $cachePool)
+    /**
+     * Constructs a new PhpFastCacheBackend instance.
+     *
+     * @param $bin string
+     *   The name of the cache bin.
+     * @param ExtendedCacheItemPoolInterface $cachePool
+     * @param array $settings
+     */
+    public function __construct($bin, $cachePool, $settings)
     {
-        /**
-         * Constructs a new ApcuBackend instance.
-         *
-         * @param string $bin
-         *   The name of the cache bin.
-         * @param string $site_prefix
-         *   The prefix to use for all keys in the storage that belong to this site.
-         * @param \Drupal\Core\Cache\CacheTagsChecksumInterface $checksum_provider
-         *   The cache tags checksum provider.
-         */
     }