#2867682; Moved hash_algorithm variable.

Author: kalpaitch

src/DrupalMemcacheBase.php

@@ -31,13 +31,6 @@ abstract class DrupalMemcacheBase implements DrupalMemcacheInterface {
    */
   protected $memcache;
 
-  /**
-   * The hash algorithm to pass to hash(). Defaults to 'sha1'
-   *
-   * @var string
-   */
-  protected $hashAlgorithm;
-
   /**
    * The prefix memcache key for all keys.
    *
@@ -54,7 +47,6 @@ abstract class DrupalMemcacheBase implements DrupalMemcacheInterface {
   public function __construct(DrupalMemcacheConfig $settings) {
     $this->settings = $settings;
 
-    $this->hashAlgorithm = $this->settings->get('key_hash_algorithm', 'sha1');
     $this->prefix = $this->settings->get('key_prefix', '');
   }
 

src/MemcacheCacheNormalizer.php

@@ -29,7 +29,8 @@ 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.
-    $hash = hash($this->hashAlgorithm, $this->prefix . '-' . $key);
+    $hash_algorithm = $this->settings->get('key_hash_algorithm', 'sha1');
+    $hash = hash($hash_algorithm, $key);
     if (!$key_is_ascii) {
       return $hash;
     }