#2867682; Corrected normalization of lock key.

Author: kalpaitch

src/DrupalMemcacheBase.php

@@ -14,7 +14,7 @@
  */
 abstract class DrupalMemcacheBase implements DrupalMemcacheInterface {
 
-  use MemcacheCacheNormalizer;
+  use MemcacheCacheNormalizerTrait;
 
   /**
    * The memcache config object.

src/MemcacheBackend.php

@@ -17,7 +17,7 @@
  */
 class MemcacheBackend implements CacheBackendInterface {
 
-  use MemcacheCacheNormalizer;
+  use MemcacheCacheNormalizerTrait;
 
   /**
    * The cache bin to use.
@@ -130,7 +130,7 @@ public function getMultiple(&$cids, $allow_invalid = FALSE) {
    * @return bool
    */
   protected function valid($cid, \stdClass $cache) {
-    $lock_key = "memcache_$cid:$this->bin";
+    $lock_key = $this->normalizeKey("memcache_$cid:$this->bin");
     $cache->valid = FALSE;
 
     if ($cache) {

src/MemcacheCacheNormalizer.php renamed to src/MemcacheCacheNormalizerTrait.php

@@ -5,7 +5,7 @@
 /**
  * Class MemcacheCacheNormalizer.
  */
-trait MemcacheCacheNormalizer {
+trait MemcacheCacheNormalizerTrait {
 
   /**
    * Normalizes a cache ID in order to comply with key length limitations.
@@ -29,6 +29,7 @@ protected function normalizeKey($key) {
     // quickly with minimal collisions.
     // Return a string that uses as much as possible of the original cache ID
     // with the hash appended.
+    /** @var DrupalMemcacheConfig $this->settings */
     $hash_algorithm = $this->settings->get('key_hash_algorithm', 'sha1');
     $hash = hash($hash_algorithm, $key);
     if (!$key_is_ascii) {