X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fmodules%2Fcontrib%2Fmemcache%2Fsrc%2FMemcacheBackendFactory.php;h=ea958178693225be57e1ec81714126bbf34e0321;hb=059867c3f96750652c80f39e44c442a58c2549ee;hp=04f0c6f8a0adda19ff3a47fbaf82319dd619dc9f;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/web/modules/contrib/memcache/src/MemcacheBackendFactory.php b/web/modules/contrib/memcache/src/MemcacheBackendFactory.php
index 04f0c6f8a..ea9581786 100644
--- a/web/modules/contrib/memcache/src/MemcacheBackendFactory.php
+++ b/web/modules/contrib/memcache/src/MemcacheBackendFactory.php
@@ -1,38 +1,21 @@
 <?php
 
-/**
- * @file
- * Contains \Drupal\memcache\MemcacheBackendFactory.
- */
-
 namespace Drupal\memcache;
 
-use Drupal\Core\Lock\LockBackendInterface;
+use Drupal\Core\Cache\CacheFactoryInterface;
 use Drupal\Core\Cache\CacheTagsChecksumInterface;
+use Drupal\memcache\Driver\MemcacheDriverFactory;
+use Drupal\memcache\Invalidator\TimestampInvalidatorInterface;
 
 /**
- * Class DatabaseBackendFactory.
+ * Class MemcacheBackendFactory.
  */
-class MemcacheBackendFactory {
-
-  /**
-   * The lock backend that should be used.
-   *
-   * @var \Drupal\Core\Lock\LockBackendInterface
-   */
-  protected $lock;
-
-  /**
-   * The settings object.
-   *
-   * @var \Drupal\memcache\DrupalMemcacheConfig
-   */
-  protected $settings;
+class MemcacheBackendFactory implements CacheFactoryInterface {
 
   /**
    * The memcache factory object.
    *
-   * @var \Drupal\memcache\DrupalMemcacheFactory
+   * @var \Drupal\memcache\Driver\MemcacheDriverFactory
    */
   protected $memcacheFactory;
 
@@ -44,23 +27,32 @@ class MemcacheBackendFactory {
   protected $checksumProvider;
 
   /**
-   * Constructs the DatabaseBackendFactory object.
+   * The timestamp invalidation provider.
+   *
+   * @var \Drupal\memcache\Invalidator\TimestampInvalidatorInterface
+   */
+  protected $timestampInvalidator;
+
+  /**
+   * Constructs the MemcacheBackendFactory object.
    *
-   * @param \Drupal\Core\Lock\LockBackendInterface $lock
-   * @param \Drupal\memcache\DrupalMemcacheConfig $settings
-   * @param \Drupal\memcache\DrupalMemcacheFactory $memcache_factory
+   * @param \Drupal\memcache\Driver\MemcacheDriverFactory $memcache_factory
+   *   The memcache factory object.
+   * @param \Drupal\Core\Cache\CacheTagsChecksumInterface $checksum_provider
+   *   The cache tags checksum provider.
+   * @param \Drupal\memcache\Invalidator\TimestampInvalidatorInterface $timestamp_invalidator
+   *   The timestamp invalidation provider.
    */
-  function __construct(LockBackendInterface $lock, DrupalMemcacheConfig $settings, DrupalMemcacheFactory $memcache_factory, CacheTagsChecksumInterface $checksum_provider) {
-    $this->lock = $lock;
-    $this->settings = $settings;
+  public function __construct(MemcacheDriverFactory $memcache_factory, CacheTagsChecksumInterface $checksum_provider, TimestampInvalidatorInterface $timestamp_invalidator) {
     $this->memcacheFactory = $memcache_factory;
     $this->checksumProvider = $checksum_provider;
+    $this->timestampInvalidator = $timestamp_invalidator;
   }
 
   /**
    * Gets MemcacheBackend for the specified cache bin.
    *
-   * @param $bin
+   * @param string $bin
    *   The cache bin for which the object is created.
    *
    * @return \Drupal\memcache\MemcacheBackend
@@ -70,9 +62,8 @@ class MemcacheBackendFactory {
     return new MemcacheBackend(
       $bin,
       $this->memcacheFactory->get($bin),
-      $this->lock,
-      $this->settings,
-      $this->checksumProvider
+      $this->checksumProvider,
+      $this->timestampInvalidator
     );
   }