X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FQueryFormatter.php;h=d24ac1635c6795b52ff2926a65736bcb91065548;hb=ead0c08f09f10fc2b62a655c08bbe69a1249f55c;hp=601d4a55caa464d9cbb51b5f85b4a76f9baf980f;hpb=c9baa85a27f776bc2b49bc5d38611f537cf19f30;p=civicrm-core.git

diff --git a/CRM/Utils/QueryFormatter.php b/CRM/Utils/QueryFormatter.php
index 601d4a55ca..d24ac1635c 100644
--- a/CRM/Utils/QueryFormatter.php
+++ b/CRM/Utils/QueryFormatter.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2018                                |
+ | Copyright CiviCRM LLC (c) 2004-2019                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -27,7 +27,7 @@
 
  /**
   * @package CRM
-  * @copyright CiviCRM LLC (c) 2004-2018
+  * @copyright CiviCRM LLC (c) 2004-2019
   */
 
 /**
@@ -88,6 +88,11 @@ class CRM_Utils_QueryFormatter {
    */
   const MODE_WILDWORDS_SUFFIX = 'wildwords-suffix';
 
+  /**
+   * Singleton object.
+   *
+   * @var \CRM_Utils_QueryFormatter|null
+   */
   static protected $singleton;
 
   /**
@@ -192,16 +197,16 @@ class CRM_Utils_QueryFormatter {
       list ($tableName, $tableAlias) = explode(' ', $table);
     }
     if (is_scalar($columns)) {
-      $columns = array($columns);
+      $columns = [$columns];
     }
 
-    $clauses = array();
+    $clauses = [];
     if (CRM_Core_InnoDBIndexer::singleton()
       ->hasDeclaredIndex($tableName, $columns)
     ) {
       $formattedQuery = $this->format($queryText, CRM_Utils_QueryFormatter::LANG_SQL_FTSBOOL);
 
-      $prefixedFieldNames = array();
+      $prefixedFieldNames = [];
       foreach ($columns as $fieldName) {
         $prefixedFieldNames[] = "$tableAlias.$fieldName";
       }
@@ -287,8 +292,8 @@ class CRM_Utils_QueryFormatter {
    */
   protected function _formatFtsBool($text, $mode) {
     $result = NULL;
-    $operators = array('+', '-', '~', '(', ')');
-    $wildCards = array('@', '%', '*');
+    $operators = ['+', '-', '~', '(', ')'];
+    $wildCards = ['@', '%', '*'];
     $expression = preg_quote(implode('', array_merge($operators, $wildCards)), '/');
 
     //Return if searched string ends with an unsupported operator.
@@ -399,7 +404,7 @@ class CRM_Utils_QueryFormatter {
    * @return string
    */
   protected function mapWords($text, $template, $quotes = FALSE) {
-    $result = array();
+    $result = [];
     foreach ($this->parseWords($text, $quotes) as $word) {
       $result[] = str_replace('word', $word, $template);
     }
@@ -407,8 +412,8 @@ class CRM_Utils_QueryFormatter {
   }
 
   /**
-   * @param $text
-   * @bool $quotes
+   * @param string $text
+   * @param bool $quotes
    * @return array
    */
   protected function parseWords($text, $quotes) {
@@ -458,13 +463,13 @@ class CRM_Utils_QueryFormatter {
    * @return array
    */
   public static function getModes() {
-    return array(
+    return [
       self::MODE_NONE,
       self::MODE_PHRASE,
       self::MODE_WILDPHRASE,
       self::MODE_WILDWORDS,
       self::MODE_WILDWORDS_SUFFIX,
-    );
+    ];
   }
 
   /**
@@ -473,12 +478,12 @@ class CRM_Utils_QueryFormatter {
    * @return array
    */
   public static function getLanguages() {
-    return array(
+    return [
       self::LANG_SOLR,
       self::LANG_SQL_FTS,
       self::LANG_SQL_FTSBOOL,
       self::LANG_SQL_LIKE,
-    );
+    ];
   }
 
   /**