From 5e72d09eb0a7e9fa7558f009314d8ca6c08cf57d Mon Sep 17 00:00:00 2001 From: David Pede Date: Thu, 6 Dec 2018 14:28:47 +0000 Subject: [PATCH] Fix 'xPDO::OPT_CACHE_KEY' option Option ignored when value set in getInstance() method due to incorrect getOption() key being used in xPDO class. Update xPDO.php --- src/xPDO/xPDO.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/xPDO/xPDO.php b/src/xPDO/xPDO.php index 75824ea9..5903a538 100644 --- a/src/xPDO/xPDO.php +++ b/src/xPDO/xPDO.php @@ -890,7 +890,7 @@ public function updateCollection($className, array $set, $criteria= null) { $relatedClasses = array_unique($relatedClasses); foreach ($relatedClasses as $relatedClass) { $this->cacheManager->delete($relatedClass, array( - xPDO::OPT_CACHE_KEY => $this->getOption('cache_db_key', null, 'db'), + xPDO::OPT_CACHE_KEY => $this->getOption(xPDO::OPT_CACHE_KEY, null, 'db'), xPDO::OPT_CACHE_HANDLER => $this->getOption(xPDO::OPT_CACHE_DB_HANDLER, null, $this->getOption(xPDO::OPT_CACHE_HANDLER, null, 'xPDO\\Cache\\xPDOFileCache')), xPDO::OPT_CACHE_FORMAT => (integer) $this->getOption('cache_db_format', null, $this->getOption(xPDO::OPT_CACHE_FORMAT, null, Cache\xPDOCacheManager::CACHE_PHP)), xPDO::OPT_CACHE_PREFIX => $this->getOption('cache_db_prefix', null, Cache\xPDOCacheManager::CACHE_DIR), @@ -2252,7 +2252,7 @@ public function fromCache($signature, $class= '', $options= array()) { } if (is_string($sig) && !empty($sig)) { $result= $this->cacheManager->get($sig, array( - xPDO::OPT_CACHE_KEY => $this->getOption('cache_db_key', $options, 'db'), + xPDO::OPT_CACHE_KEY => $this->getOption(xPDO::OPT_CACHE_KEY, $options, 'db'), xPDO::OPT_CACHE_HANDLER => $this->getOption(xPDO::OPT_CACHE_DB_HANDLER, $options, $this->getOption(xPDO::OPT_CACHE_HANDLER, $options, 'xPDO\\Cache\\xPDOFileCache')), xPDO::OPT_CACHE_FORMAT => (integer) $this->getOption('cache_db_format', null, $this->getOption(xPDO::OPT_CACHE_FORMAT, null, Cache\xPDOCacheManager::CACHE_PHP)), 'cache_prefix' => $this->getOption('cache_db_prefix', $options, Cache\xPDOCacheManager::CACHE_DIR), @@ -2339,7 +2339,7 @@ public function toCache($signature, $object, $lifetime= 0, $options = array()) { foreach ($sigGraph as $gAlias => $gMeta) { $gClass = $gMeta['class']; $removed= $this->cacheManager->delete($gClass, array_merge($options, array( - xPDO::OPT_CACHE_KEY => $this->getOption('cache_db_key', $options, 'db'), + xPDO::OPT_CACHE_KEY => $this->getOption(xPDO::OPT_CACHE_KEY, $options, 'db'), xPDO::OPT_CACHE_HANDLER => $this->getOption(xPDO::OPT_CACHE_DB_HANDLER, $options, $this->getOption(xPDO::OPT_CACHE_HANDLER, $options, 'xPDO\\Cache\\xPDOFileCache')), xPDO::OPT_CACHE_FORMAT => (integer) $this->getOption('cache_db_format', $options, $this->getOption(xPDO::OPT_CACHE_FORMAT, $options, Cache\xPDOCacheManager::CACHE_PHP)), xPDO::OPT_CACHE_EXPIRES => (integer) $this->getOption(xPDO::OPT_CACHE_DB_EXPIRES, null, $this->getOption(xPDO::OPT_CACHE_EXPIRES, null, 0)), @@ -2353,7 +2353,7 @@ public function toCache($signature, $object, $lifetime= 0, $options = array()) { } } $cacheOptions = array_merge($options, array( - xPDO::OPT_CACHE_KEY => $this->getOption('cache_db_key', $options, 'db'), + xPDO::OPT_CACHE_KEY => $this->getOption(xPDO::OPT_CACHE_KEY, $options, 'db'), xPDO::OPT_CACHE_HANDLER => $this->getOption(xPDO::OPT_CACHE_DB_HANDLER, $options, $this->getOption(xPDO::OPT_CACHE_HANDLER, $options, 'xPDO\\Cache\\xPDOFileCache')), xPDO::OPT_CACHE_FORMAT => (integer) $this->getOption('cache_db_format', $options, $this->getOption(xPDO::OPT_CACHE_FORMAT, $options, Cache\xPDOCacheManager::CACHE_PHP)), xPDO::OPT_CACHE_EXPIRES => (integer) $this->getOption(xPDO::OPT_CACHE_DB_EXPIRES, null, $this->getOption(xPDO::OPT_CACHE_EXPIRES, null, 0)),