CRM_Core_BAO_Cache - When delegating to an adapter, don't expect it t…

…o return a reference This is following up on the code-review comments from #13489 (comment)
civicrm · Feb 4, 2019 · b5e7d57 · b5e7d57
1 parent 88dfeb5
commit b5e7d57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CRM/Core/BAO/Cache.php b/CRM/Core/BAO/Cache.php
@@ -68,7 +68,8 @@ class CRM_Core_BAO_Cache extends CRM_Core_DAO_Cache {
    */
   public static function &getItem($group, $path, $componentID = NULL) {
     if (($adapter = CRM_Utils_Constant::value('CIVICRM_BAO_CACHE_ADAPTER')) !== NULL) {
-      return $adapter::getItem($group, $path, $componentID);
+      $value = $adapter::getItem($group, $path, $componentID);
+      return $value;
     }
 
     if (self::$_cache === NULL) {

diff --git a/CRM/Core/BAO/Cache/Psr16.php b/CRM/Core/BAO/Cache/Psr16.php
@@ -86,7 +86,7 @@ protected static function getGroup($group) {
    * @return object
    *   The data if present in cache, else null
    */
-  public static function &getItem($group, $path, $componentID = NULL) {
+  public static function getItem($group, $path, $componentID = NULL) {
     // TODO: Generate a general deprecation notice.
     if ($componentID) {
       Civi::log()
@@ -95,8 +95,7 @@ public static function &getItem($group, $path, $componentID = NULL) {
           'path' => $path,
         ]);
     }
-    $value = self::getGroup($group)->get(CRM_Core_BAO_Cache::cleanKey($path));
-    return $value;
+    return self::getGroup($group)->get(CRM_Core_BAO_Cache::cleanKey($path));
   }
 
   /**