Merge pull request #26052 from eileenmcnaughton/nfc

Remove a couple of unused variables
civicrm · Apr 11, 2023 · d74cb94 · d74cb94
2 parents 2d28c12 + a4379b4
commit d74cb94
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
@@ -1866,10 +1866,10 @@ private static function getTree(
     $queryString = "$strSelect $strFrom $strWhere $orderBy";
 
     // lets see if we can retrieve the groupTree from cache
-    $cacheString = $queryString . '_Inline';;
+    $cacheString = $queryString . '_Inline';
 
-    $cacheKey = "CRM_Core_DAO_CustomGroup_Query " . md5($cacheString);
-    $multipleFieldGroupCacheKey = "CRM_Core_DAO_CustomGroup_QueryMultipleFields " . md5($cacheString);
+    $cacheKey = 'CRM_Core_DAO_CustomGroup_Query ' . md5($cacheString);
+    $multipleFieldGroupCacheKey = 'CRM_Core_DAO_CustomGroup_QueryMultipleFields ' . md5($cacheString);
     $cache = CRM_Utils_Cache::singleton();
     $groupTree = $cache->get($cacheKey);
     $multipleFieldGroups = $cache->get($multipleFieldGroupCacheKey);
@@ -1891,7 +1891,6 @@ private static function getTree(
     if (isset($groupTree['info']) && !empty($groupTree['info']) &&
       !empty($groupTree['info']['tables'])
     ) {
-      $select = $from = $where = [];
       $groupTree['info']['where'] = NULL;
 
       foreach ($groupTree['info']['tables'] as $table => $fields) {
@@ -1937,8 +1936,10 @@ private static function getTree(
    * @param string $column
    * @param string $value
    * @param string $delimiter
+   *
    * @return string
    *   SQL condition.
+   * @throws \CRM_Core_Exception
    */
   private static function whereListHas($column, $value, $delimiter = CRM_Core_DAO::VALUE_SEPARATOR) {
     // ?