gordonbanderson / silverstripe-elastica

code/ElasticaUtil.php

Spacing +22 added lines, -22 removed lines

@@ -28,7 +28,7 @@ 
 	 * @var string $content Text to display when in command line mode
 	 */
 	public static function message($content) {
-		if (\Director::is_cli() && self::$cli_printer_output === true) {
+		if(\Director::is_cli() && self::$cli_printer_output === true) {
 			echo "$content\n";
 		}
 	}
@@ -53,7 +53,7 @@ 
 		$options = $alternativeQuerySuggestions[0]['options'];
 
 		$resultArray = null;
-		if (sizeof($options) > 0) {
+		if(sizeof($options) > 0) {
 			//take the first suggestion
 			$suggestedPhrase = $options[0]['text'];
 			$suggestedPhraseHighlighted = $options[0]['highlighted'];
@@ -62,10 +62,10 @@ 
 			$originalParts = explode(' ', $originalQuery);
 			$suggestedParts = explode(' ', $suggestedPhrase);
 
-			$markedHighlightedParts = ' '.$suggestedPhraseHighlighted.' ';
-			$markedHighlightedParts = str_replace(' '.$preTags, ' '.self::$pre_marker, $markedHighlightedParts);
+			$markedHighlightedParts = ' ' . $suggestedPhraseHighlighted . ' ';
+			$markedHighlightedParts = str_replace(' ' . $preTags, ' ' . self::$pre_marker, $markedHighlightedParts);
 
-			$markedHighlightedParts = str_replace($postTags.' ', self::$post_marker, $markedHighlightedParts);
+			$markedHighlightedParts = str_replace($postTags . ' ', self::$post_marker, $markedHighlightedParts);
 
 			$markedHighlightedParts = trim($markedHighlightedParts);
 			$markedHighlightedParts = trim($markedHighlightedParts);
@@ -76,7 +76,7 @@ 
 			$lowerToUpper = array();
 			$lowerToHighlighted = array();
 			$ctr = 0;
-			foreach ($suggestedParts as $lowercaseWord) {
+			foreach($suggestedParts as $lowercaseWord) {
 				$lowerToUpper[$lowercaseWord] = $originalParts[$ctr];
 				$lowerToHighlighted[$lowercaseWord] = $highlightedParts[$ctr];
 				$ctr++;
@@ -84,19 +84,19 @@ 
 
 			$plain = array();
 			$highlighted = array();
-			foreach ($suggestedParts as $lowercaseWord) {
+			foreach($suggestedParts as $lowercaseWord) {
 				$possiblyUppercase = $lowerToUpper[$lowercaseWord];
 				$possiblyUppercaseHighlighted = $lowerToHighlighted[$lowercaseWord];
 
 				//If the terms are identical other than case, e.g. new => New, then simply swap
-				if (strtolower($possiblyUppercase) == $lowercaseWord) {
+				if(strtolower($possiblyUppercase) == $lowercaseWord) {
 					array_push($plain, $possiblyUppercase);
 					array_push($highlighted, $possiblyUppercase);
 				} else {
 					//Need to check capitalisation of terms suggested that are different
 
-					$chr = mb_substr ($possiblyUppercase, 0, 1, "UTF-8");
-    				if (mb_strtolower($chr, "UTF-8") != $chr) {
+					$chr = mb_substr($possiblyUppercase, 0, 1, "UTF-8");
+    				if(mb_strtolower($chr, "UTF-8") != $chr) {
     					$upperLowercaseWord = $lowercaseWord;
     					$upperLowercaseWord[0] = $chr;
     					$withHighlights = str_replace($lowercaseWord, $upperLowercaseWord, $possiblyUppercaseHighlighted);
@@ -113,9 +113,9 @@ 
 				}
 			}
 
-			$highlighted = ' '.implode(' ', $highlighted).' ';
-			$highlighted = str_replace(self::$pre_marker, ' '.$preTags, $highlighted);
-			$highlighted = str_replace(self::$post_marker, $postTags.' ', $highlighted);
+			$highlighted = ' ' . implode(' ', $highlighted) . ' ';
+			$highlighted = str_replace(self::$pre_marker, ' ' . $preTags, $highlighted);
+			$highlighted = str_replace(self::$post_marker, $postTags . ' ', $highlighted);
 
 			$resultArray['suggestedQuery'] = implode(' ', $plain);
 			$resultArray['suggestedQueryHighlighted'] = trim($highlighted);
@@ -142,10 +142,10 @@ 
 		$explanation = explode('-ConstantScore', $explanation)[0];
         $bracketPos = strpos($explanation, ')~');
 
-        if (substr($explanation, 0,2) == '((') {
-        	$explanation = substr($explanation, 2, $bracketPos-2);
-        } elseif (substr($explanation, 0,1) == '(') {
-        	$explanation = substr($explanation, 1, $bracketPos-2);
+        if(substr($explanation, 0, 2) == '((') {
+        	$explanation = substr($explanation, 2, $bracketPos - 2);
+        } elseif(substr($explanation, 0, 1) == '(') {
+        	$explanation = substr($explanation, 1, $bracketPos - 2);
         }
 
        	$terms = array();
@@ -153,18 +153,18 @@ 
         //Field name(s) => terms
         $splits = explode(' ', $explanation);
 
-        foreach ($splits as $fieldAndTerm) {
+        foreach($splits as $fieldAndTerm) {
         	$splits = explode(':', $fieldAndTerm);
 
         	// This is the no terms case
-        	if (sizeof($splits) < 2) {
+        	if(sizeof($splits) < 2) {
         		break;
         	}
 
         	$fieldname = $splits[0];
         	$term = $splits[1];
 
-        	if (!isset($terms[$fieldname])) {
+        	if(!isset($terms[$fieldname])) {
         		$terms[$fieldname] = array();
         	}
 
@@ -191,8 +191,8 @@ 
 	 * @return function print content to either web browser or command line.  Can be optionally supressed
 	 */
 	public static function getPrinter() {
-		return function ($content) {
-			if (self::$cli_printer_output === true) {
+		return function($content) {
+			if(self::$cli_printer_output === true) {
 				print(\Director::is_cli() ? "T1 $content\n" : "T2 <p>$content</p>");
 			}