From e186ffc6d35c70330250042a064263a87864f17a Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Mon, 14 Nov 2016 09:42:19 +0100
Subject: [PATCH] Change cacheMethodHashAlgo to be a method

---
 lib/Cake/Model/Datasource/DboSource.php | 42 ++++++++++++++-----------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/lib/Cake/Model/Datasource/DboSource.php b/lib/Cake/Model/Datasource/DboSource.php
index 32081a332..173afa06f 100644
--- a/lib/Cake/Model/Datasource/DboSource.php
+++ b/lib/Cake/Model/Datasource/DboSource.php
@@ -51,35 +51,24 @@ class DboSource extends DataSource {
 	public $alias = 'AS ';
 
 /**
- * Caches result from query parsing operations. Cached results for both DboSource::name(), DboSource::fields() and
- * DboSource::conditions() will be stored here.
+ * Caches result from query parsing operations. Cached results for both DboSource::name() and DboSource::fields()
+ * will be stored here.
  *
- * Method caching uses `md5` (by default) to construct cache keys.
- * If you have problems with collisions, try a different hashing algorithm in DboSource::$cacheMethodHashAlgo or
- * set DboSource::$cacheMethods to false.
+ * Method caching uses `md5` (by default) to construct cache keys. If you have problems with collisions,
+ * try a different hashing algorithm by overriding DboSource::cacheMethodHasher or set DboSource::$cacheMethods to false.
  *
  * @var array
  */
 	public static $methodCache = array();
 
 /**
- * Whether or not to cache the results of DboSource::name(), DboSource::fields() and DboSource::conditions()
- * into the memory cache. Set to false to disable the use of the memory cache.
+ * Whether or not to cache the results of DboSource::name() and DboSource::fields() into the memory cache.
+ * Set to false to disable the use of the memory cache.
  *
  * @var bool
  */
 	public $cacheMethods = true;
 
-/**
- * Method caching uses `md5` (by default) to construct cache keys. If you have problems with collisions,
- * try a different hashing algorithm or set DboSource::$cacheMethods to false.
- *
- * @var string
- * @see http://php.net/manual/en/function.hash-algos.php
- * @see http://softwareengineering.stackexchange.com/questions/49550/which-hashing-algorithm-is-best-for-uniqueness-and-speed
- */
-	public $cacheMethodHashAlgo = 'md5';
-
 /**
  * Flag to support nested transactions. If it is set to false, you will be able to use
  * the transaction methods (begin/commit/rollback), but just the global transaction will
@@ -803,6 +792,21 @@ class DboSource extends DataSource {
 		return static::$methodCache[$method][$key] = $value;
 	}
 
+/**
+ * Hashes a given value.
+ *
+ * Method caching uses `md5` (by default) to construct cache keys. If you have problems with collisions,
+ * try a different hashing algorithm or set DboSource::$cacheMethods to false.
+ *
+ * @param string $value Value to hash
+ * @return string Hashed value
+ * @see http://php.net/manual/en/function.hash-algos.php
+ * @see http://softwareengineering.stackexchange.com/questions/49550/which-hashing-algorithm-is-best-for-uniqueness-and-speed
+ */
+	public function cacheMethodHasher($value) {
+		return md5($value);
+	}
+
 /**
  * Returns a quoted name of $data for use in an SQL statement.
  * Strips fields out of SQL functions before quoting.
@@ -828,7 +832,7 @@ class DboSource extends DataSource {
 			}
 			return $data;
 		}
-		$cacheKey = hash($this->cacheMethodHashAlgo, $this->startQuote . $data . $this->endQuote);
+		$cacheKey = $this->cacheMethodHasher($this->startQuote . $data . $this->endQuote);
 		if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) {
 			return $return;
 		}
@@ -2546,7 +2550,7 @@ class DboSource extends DataSource {
 			$Model->schemaName,
 			$Model->table
 		);
-		$cacheKey = hash($this->cacheMethodHashAlgo, serialize($cacheKey));
+		$cacheKey = $this->cacheMethodHasher(serialize($cacheKey));
 		if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) {
 			return $return;
 		}