projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[REF] final cleanup - call bulkCreate from migrate_utils
[civicrm-core.git]
/
CRM
/
Utils
/
QueryFormatter.php
diff --git
a/CRM/Utils/QueryFormatter.php
b/CRM/Utils/QueryFormatter.php
index d45bad66034be5967d56774f5511de72c23b3955..d24ac1635c6795b52ff2926a65736bcb91065548 100644
(file)
--- a/
CRM/Utils/QueryFormatter.php
+++ b/
CRM/Utils/QueryFormatter.php
@@
-88,6
+88,11
@@
class CRM_Utils_QueryFormatter {
*/
const MODE_WILDWORDS_SUFFIX = 'wildwords-suffix';
*/
const MODE_WILDWORDS_SUFFIX = 'wildwords-suffix';
+ /**
+ * Singleton object.
+ *
+ * @var \CRM_Utils_QueryFormatter|null
+ */
static protected $singleton;
/**
static protected $singleton;
/**
@@
-192,16
+197,16
@@
class CRM_Utils_QueryFormatter {
list ($tableName, $tableAlias) = explode(' ', $table);
}
if (is_scalar($columns)) {
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);
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";
}
foreach ($columns as $fieldName) {
$prefixedFieldNames[] = "$tableAlias.$fieldName";
}
@@
-287,8
+292,8
@@
class CRM_Utils_QueryFormatter {
*/
protected function _formatFtsBool($text, $mode) {
$result = NULL;
*/
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.
$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) {
* @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);
}
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) {
* @return array
*/
protected function parseWords($text, $quotes) {
@@
-458,13
+463,13
@@
class CRM_Utils_QueryFormatter {
* @return array
*/
public static function getModes() {
* @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,
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
*/
public static function getLanguages() {
- return
array(
+ return
[
self::LANG_SOLR,
self::LANG_SQL_FTS,
self::LANG_SQL_FTSBOOL,
self::LANG_SQL_LIKE,
self::LANG_SOLR,
self::LANG_SQL_FTS,
self::LANG_SQL_FTSBOOL,
self::LANG_SQL_LIKE,
-
)
;
+
]
;
}
/**
}
/**