gordonbanderson / silverstripe-elastica

src/SilverStripe/Elastica/ResultList.php

Spacing +42 added lines, -42 removed lines

@@ -101,17 +101,17 @@ 
 	 * @return array
 	 */
 	public function getResults() {
-		if (!isset($this->_cachedResults)) {
-			$ers = $this->service->search($this->query,$this->types);
+		if(!isset($this->_cachedResults)) {
+			$ers = $this->service->search($this->query, $this->types);
 
-			if (isset($ers->MoreLikeThisTerms)) {
+			if(isset($ers->MoreLikeThisTerms)) {
 				$this->MoreLikeThisTerms = $ers->MoreLikeThisTerms;
 			}
 
-			if (isset($ers->getSuggests()['query-phrase-suggestions'])) {
+			if(isset($ers->getSuggests()['query-phrase-suggestions'])) {
 				$suggest = $ers->getSuggests()['query-phrase-suggestions'];
 				$suggestedPhraseAndHL = ElasticaUtil::getPhraseSuggestion($suggest);
-				if ($suggestedPhraseAndHL) {
+				if($suggestedPhraseAndHL) {
 					$this->SuggestedQuery = $suggestedPhraseAndHL['suggestedQuery'];
 					$this->SuggestedQueryHighlighted = $suggestedPhraseAndHL['suggestedQueryHighlighted'];
 				}
@@ -128,7 +128,7 @@ 
 			$indexedFieldTitleMapping = array();
 
 			// optionally remap keys and store chosen aggregations from get params
-			if (isset($this->SearchHelper)) {
+			if(isset($this->SearchHelper)) {
 				$manipulator = \Injector::inst()->create($this->SearchHelper);
 				$manipulator->query = $this->query;
 				$manipulator->updateAggregation($aggs);
@@ -141,7 +141,7 @@ 
 			$queryText = $this->originalQueryText;
 
 			// if not search term remove it and aggregate with a blank query
-			if ($qqueryText== '' && sizeof($aggs) > 0) {
+			if($qqueryText == '' && sizeof($aggs) > 0) {
 				$params = $this->query->getParams();
 				unset($params['query']);
 				$this->query->setParams($params);
@@ -149,87 +149,87 @@ 
 			}
 
 			// get the base URL for the current facets selected
-			$baseURL = \Controller::curr()->Link().'?';
+			$baseURL = \Controller::curr()->Link() . '?';
 			$prefixAmp = false;
-			if ($queryText !== '') {
-				$baseURL .= 'q='.urlencode($queryText);
+			if($queryText !== '') {
+				$baseURL .= 'q=' . urlencode($queryText);
 				$prefixAmp = true;
 			}
 
 			// now add the selected facets
-			foreach ($this->filters as $key => $value) {
-				if ($prefixAmp) {
+			foreach($this->filters as $key => $value) {
+				if($prefixAmp) {
 					$baseURL .= '&';
 				} else {
 					$prefixAmp = true;
 				}
-				$baseURL .= $key.'='.urlencode($value);
+				$baseURL .= $key . '=' . urlencode($value);
 			}
 
-			foreach (array_keys($aggs) as $key) {
+			foreach(array_keys($aggs) as $key) {
 				//echo "MARKING SELECTED AGGS FOR $key \n";
 				$aggDO = new \DataObject();
 				//FIXME - Camel case separate here
-				if (isset($indexedFieldTitleMapping[$key])) {
+				if(isset($indexedFieldTitleMapping[$key])) {
 					$aggDO->Name = $indexedFieldTitleMapping[$key];
 				} else {
 					$aggDO->Name = $key;
 				}
 
 				// now the buckets
-				if (isset($aggs[$key]['buckets'])) {
+				if(isset($aggs[$key]['buckets'])) {
 					//echo "Buckets found for $key \n";
 					$bucketsAL = new \ArrayList();
-					foreach ($aggs[$key]['buckets'] as $value) {
+					foreach($aggs[$key]['buckets'] as $value) {
 						$ct = new \DataObject();
 						$ct->Key = $value['key'];
 						$ct->DocumentCount = $value['doc_count'];
 						$query[$key] = $value;
-						if ($prefixAmp) {
-							$url = $baseURL.'&';
+						if($prefixAmp) {
+							$url = $baseURL . '&';
 						} else {
 							$url = $baseURL;
 							$prefixAmp = true;
 						}
 
 						// check if currently selected
-						if (isset($this->filters[$key])) {
+						if(isset($this->filters[$key])) {
 
-							if ($this->filters[$key] === (string)$value['key']) {
+							if($this->filters[$key] === (string)$value['key']) {
 								//echo "     - Marked as selected \n";
 								$ct->IsSelected = true;
 								// mark this facet as having been selected, so optional toggling
 								// of the display of the facet can be done via the template.
 								$aggDO->IsSelected = true;
 
-								$urlParam = $key.'='.urlencode($this->filters[$key]);
+								$urlParam = $key . '=' . urlencode($this->filters[$key]);
 
 								//echo "    - URL PARAM : $urlParam \n";
 
 								// possible ampersand combos to remove
-								$v2 = '&'.$urlParam;
-								$v3 = $urlParam.'&';
+								$v2 = '&' . $urlParam;
+								$v3 = $urlParam . '&';
 								$url = str_replace($v2, '', $url);
 								$url = str_replace($v3, '', $url);
 								$url = str_replace($urlParam, '', $url);
 								$ct->URL = $url;
 							}
 						} else {
-							$url .= $key .'='.urlencode($value['key']);
+							$url .= $key . '=' . urlencode($value['key']);
 							$prefixAmp = true;
 						}
 
-						$url = rtrim($url,'&');
+						$url = rtrim($url, '&');
 
 						$ct->URL = $url;
 						$bucketsAL->push($ct);
 					}
 
 					// in the case of range queries we wish to remove the non selected ones
-					if ($aggDO->IsSelected) {
+					if($aggDO->IsSelected) {
 						$newList = new \ArrayList();
-						foreach ($bucketsAL->getIterator() as $bucket) {
-							if ($bucket->IsSelected) {
+						foreach($bucketsAL->getIterator() as $bucket) {
+							if($bucket->IsSelected) {
 								$newList->push($bucket);
 								break;
 							}
@@ -286,10 +286,10 @@ 
 		$needed = array();
 		$retrieved = array();
 
-		foreach ($found as $item) {
+		foreach($found as $item) {
 			$type = $item->getType();
 
-			if (!array_key_exists($type, $needed)) {
+			if(!array_key_exists($type, $needed)) {
 				$needed[$type] = array($item->getId());
 				$retrieved[$type] = array();
 			} else {
@@ -297,8 +297,8 @@ 
 			}
 		}
 
-		foreach ($needed as $class => $ids) {
-			foreach ($class::get()->byIDs($ids) as $record) {
+		foreach($needed as $class => $ids) {
+			foreach($class::get()->byIDs($ids) as $record) {
 				$retrieved[$class][$record->ID] = $record;
 			}
 		}
@@ -306,7 +306,7 @@ 
 		// Title and Link are special cases
 		$ignore = array('Title', 'Link', 'Title.standard', 'Link.standard');
 
-		foreach ($found as $item) {
+		foreach($found as $item) {
 			// Safeguards against indexed items which might no longer be in the DB
 			if(array_key_exists($item->getId(), $retrieved[$item->getType()])) {
 
@@ -319,31 +319,31 @@ 
                 $snippets = new \ArrayList();
                 $namedSnippets = new \ArrayList();
 
-                foreach (array_keys($highlights) as $fieldName) {
+                foreach(array_keys($highlights) as $fieldName) {
                 	$fieldSnippets = new \ArrayList();
 
-                	foreach ($highlights[$fieldName] as $snippet) {
+                	foreach($highlights[$fieldName] as $snippet) {
                 		$do = new \DataObject();
                 		$do->Snippet = $snippet;
 
                 		// skip title and link in the summary of highlights
-                		if (!in_array($fieldName, $ignore)) {
+                		if(!in_array($fieldName, $ignore)) {
                 			$snippets->push($do);
                 		}
 
                 		$fieldSnippets->push($do);
                 	}
 
-                	if ($fieldSnippets->count() > 0) {
+                	if($fieldSnippets->count() > 0) {
                 		//Fields may have a dot in their name, e.g. Title.standard - take this into account
                 		//As dots are an issue with template syntax, store as Title_standard
                 		$splits = explode('.', $fieldName);
-                		if (sizeof($splits) == 1) {
+                		if(sizeof($splits) == 1) {
                 			$namedSnippets->$fieldName = $fieldSnippets;
                 		} else {
                 			// The Title.standard case, for example
                 			$splits = explode('.', $fieldName);
-                			$compositeFielddName = $splits[0].'_'.$splits[1];
+                			$compositeFielddName = $splits[0] . '_' . $splits[1];
                 			$namedSnippets->$compositeFielddName = $fieldSnippets;
                 		}
 
@@ -372,7 +372,7 @@ 
 	public function toNestedArray() {
 		$result = array();
 
-		foreach ($this as $record) {
+		foreach($this as $record) {
 			$result[] = $record->toMap();
 		}
 
@@ -397,7 +397,7 @@ 
 		if($col == 'ID') {
 			$ids = array();
 
-			foreach ($this->getResults() as $result) {
+			foreach($this->getResults() as $result) {
 				$ids[] = $result->getId();
 			}