gordonbanderson / silverstripe-elastica

src/SilverStripe/Elastica/indexing/EnglishIndexSettings.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 		$englishWithURLs = array(
 			'tokenizer' => 'uax_url_email',
 			//'filter' => array('english_possessive_stemmer', 'lowercase', 'english_stop', /*'english_keywords',*/ 'english_stemmer' ),
-			'filter' => array('no_single_chars', 'english_snowball', 'lowercase', $this->stopWordFilter ),
+			'filter' => array('no_single_chars', 'english_snowball', 'lowercase', $this->stopWordFilter),
 			'type' => 'custom'
 		);
 

src/SilverStripe/Elastica/DeleteIndexTask.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	 * Execute the task to delete the currently configured index
 	 */
 	public function run($request) {
-		$message = function ($content) {
+		$message = function($content) {
 			print(\Director::is_cli() ? "$content\n" : "<p>$content</p>");
 		};
 

src/SilverStripe/Elastica/Searchable.php

Indentation +41 added lines, -41 removed lines

@@ -340,10 +340,10 @@ 
 
 
 	/**
-	* Get an elasticsearch document
-	*
-	* @return \Elastica\Document
-	*/
+	 * Get an elasticsearch document
+	 *
+	 * @return \Elastica\Document
+	 */
 	public function getElasticaDocument() {
 		self::$index_ctr++;
 		$fields = $this->getFieldValuesAsArray();
@@ -754,7 +754,7 @@ 
 	}
 
 
-    public function updateCMSFields(\FieldList $fields) {
+	public function updateCMSFields(\FieldList $fields) {
 		$isIndexed = false;
 		// SIteTree object must have a live record, ShowInSearch = true
 		if ($this->isInSiteTree($this->owner->ClassName)) {
@@ -781,47 +781,47 @@ 
 				$terms = new \ArrayList();
 
 				foreach (array_keys($termVectors[$field]['terms']) as $term) {
-		        	$do = new \DataObject();
-			        $do->Term = $term;
-			        $stats = $termVectors[$field]['terms'][$term];
-			        if (isset($stats['ttf'])) {
-			        	$do->TTF = $stats['ttf'];
-			        }
-
-			        if (isset($stats['doc_freq'])) {
-			        	$do->DocFreq = $stats['doc_freq'];
-			        }
-
-			        if (isset($stats['term_freq'])) {
-			        	$do->TermFreq = $stats['term_freq'];
-			        }
-			        $terms->push($do);
-		        }
-
-		        $config = \GridFieldConfig_RecordViewer::create(100);
+					$do = new \DataObject();
+					$do->Term = $term;
+					$stats = $termVectors[$field]['terms'][$term];
+					if (isset($stats['ttf'])) {
+						$do->TTF = $stats['ttf'];
+					}
+
+					if (isset($stats['doc_freq'])) {
+						$do->DocFreq = $stats['doc_freq'];
+					}
+
+					if (isset($stats['term_freq'])) {
+						$do->TermFreq = $stats['term_freq'];
+					}
+					$terms->push($do);
+				}
+
+				$config = \GridFieldConfig_RecordViewer::create(100);
 				$config->getComponentByType('GridFieldDataColumns')->setDisplayFields(array(
-		            'Term' => 'Term',
-		            'TTF' => 'Total term frequency (how often a term occurs in all documents)',
-		            'DocFreq' => 'n documents with this term',
-		            'TermFreq'=> 'n times this term appears in this field'
-		        ));
-
-		       $underscored = str_replace('.', '_', $field);
-
-		        $gridField = new \GridField(
-		            'TermsFor'.$underscored, // Field name
-		            $field.'TITLE'.$field, // Field title
-		            $terms,
-		            $config
-		        );
-
-		      // $tab = new \Tab($field, new \TextField('Test'.$field, 'Testing'));
-		       $fields->addFieldToTab('Root.ElasticaTerms.'.$underscored, $gridField);
+					'Term' => 'Term',
+					'TTF' => 'Total term frequency (how often a term occurs in all documents)',
+					'DocFreq' => 'n documents with this term',
+					'TermFreq'=> 'n times this term appears in this field'
+				));
+
+			   $underscored = str_replace('.', '_', $field);
+
+				$gridField = new \GridField(
+					'TermsFor'.$underscored, // Field name
+					$field.'TITLE'.$field, // Field title
+					$terms,
+					$config
+				);
+
+			  // $tab = new \Tab($field, new \TextField('Test'.$field, 'Testing'));
+			   $fields->addFieldToTab('Root.ElasticaTerms.'.$underscored, $gridField);
 			}
 
 		}
 
-	    return $fields;
+		return $fields;
 	}
 
 

Braces +11 added lines, -6 removed lines

@@ -555,8 +555,7 @@ 
 				// this goes to elastica service
 				$this->service->remove($this->owner);
 			}
-		}
-		catch(\Elastica\Exception\NotFoundException $e) {
+		} catch(\Elastica\Exception\NotFoundException $e) {
 			trigger_error("Deleted document ".$this->owner->ClassName." (".$this->owner->ID.
 				") not found in search index.", E_USER_NOTICE);
 		}
@@ -574,7 +573,9 @@ 
 		$fields = \Config::inst()->get(get_class($this->owner), 'searchable_fields');
 
 		// fallback to default method
-		if(!$fields) user_error('The field $searchable_fields must be set for the class '.$this->owner->ClassName);
+		if(!$fields) {
+			user_error('The field $searchable_fields must be set for the class '.$this->owner->ClassName);
+		}
 
 		// get the values of these fields
 		$elasticaMapping = $this->fieldsToElasticaConfig($this->owner, $fields);
@@ -595,7 +596,9 @@ 
 
 						$relClass = $has_lists[$methodName];
 						$fields = \Config::inst()->get($relClass, 'searchable_fields');
-						if(!$fields) user_error('The field $searchable_fields must be set for the class '.$relClass);
+						if(!$fields) {
+							user_error('The field $searchable_fields must be set for the class '.$relClass);
+						}
 						$rewrite = $this->fieldsToElasticaConfig($relClass, $fields);
 
 						// mark as a method, the resultant fields are correct
@@ -605,7 +608,9 @@ 
 					} else if (isset($has_ones[$methodName])) {
 						$relClass = $has_ones[$methodName];
 						$fields = \Config::inst()->get($relClass, 'searchable_fields');
-						if(!$fields) user_error('The field $searchable_fields must be set for the class '.$relClass);
+						if(!$fields) {
+							user_error('The field $searchable_fields must be set for the class '.$relClass);
+						}
 						$rewrite = $this->fieldsToElasticaConfig($relClass, $fields);
 						$classname = $has_ones[$methodName];
 
@@ -687,7 +692,7 @@ 
 
 				if (isset($searchableField['type'])) {
 					$doSF->Type = $searchableField['type'];
-				}  else {
+				} else {
 					$doSF->Name = $searchableField['properties']['__method'];
 					$doSF->Type = 'relationship';
 				}

Spacing +88 added lines, -88 removed lines

@@ -131,32 +131,32 @@ 
 		$fields = $this->getAllSearchableFields();
 		$result = array();
 
-		foreach ($fields as $name => $params) {
+		foreach($fields as $name => $params) {
 			$spec = array();
 			$name = str_replace('()', '', $name);
 
-			if (array_key_exists($name, $db)) {
+			if(array_key_exists($name, $db)) {
 				$class = $db[$name];
 
-				if (($pos = strpos($class, '('))) {
+				if(($pos = strpos($class, '('))) {
 					// Valid in the case of Varchar(255)
 					$class = substr($class, 0, $pos);
 				}
 
-				if (array_key_exists($class, self::$mappings)) {
+				if(array_key_exists($class, self::$mappings)) {
 					$spec['type'] = self::$mappings[$class];
-					if ($spec['type'] === 'date') {
-						if ($class == 'Date') {
+					if($spec['type'] === 'date') {
+						if($class == 'Date') {
 							$spec['format'] = 'y-M-d';
-						} elseif ($class == 'SS_Datetime') {
+						} elseif($class == 'SS_Datetime') {
 							$spec['format'] = 'y-M-d H:m:s';
-						} elseif ($class == 'Datetime') {
+						} elseif($class == 'Datetime') {
 							$spec['format'] = 'y-M-d H:m:s';
-						} elseif ($class == 'Time') {
+						} elseif($class == 'Time') {
 							$spec['format'] = 'H:m:s';
 						}
 					}
-					if ($class === 'HTMLText' || $class === 'HTMLVarchar') {
+					if($class === 'HTMLText' || $class === 'HTMLVarchar') {
 						array_push($this->html_fields, $name);
 					}
 				}
@@ -167,7 +167,7 @@ 
 				$has_ones = $this->owner->has_one();
 
 				// check has_many and many_many relations
-				if (isset($has_lists[$name])) {
+				if(isset($has_lists[$name])) {
 					// FIX ME how to do nested mapping
 					// See https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-array-type.html
 
@@ -178,13 +178,13 @@ 
 					$resultTypeMapping = array();
 
 					// get the fields for the result type, but do not recurse
-					if ($recurse) {
+					if($recurse) {
 						$resultTypeMapping = $resultTypeInstance->getElasticaFields($storeMethodName, false);
 					}
 
 					$resultTypeMapping['ID'] = array('type' => 'integer');
 
-					if ($storeMethodName) {
+					if($storeMethodName) {
 						$resultTypeMapping['__method'] = $name;
 					}
 
@@ -193,20 +193,20 @@ 
 
 					// we now change the name to the result type, not the method name
 					$name = $resultType;
-				} else if (isset($has_ones[$name])) {
+				} else if(isset($has_ones[$name])) {
 					$resultType = $has_ones[$name];
 					$resultTypeInstance = \Injector::inst()->create($resultType);
 
 					$resultTypeMapping = array();
 
 					// get the fields for the result type, but do not recurse
-					if ($recurse) {
+					if($recurse) {
 						$resultTypeMapping = $resultTypeInstance->getElasticaFields($storeMethodName, false);
 					}
 
 					$resultTypeMapping['ID'] = array('type' => 'integer');
 
-					if ($storeMethodName) {
+					if($storeMethodName) {
 						$resultTypeMapping['__method'] = $name;
 					}
 					$spec = array('properties' => $resultTypeMapping);
@@ -220,8 +220,8 @@ 
 			}
 
 			// in the case of a relationship type will not be set
-			if (isset($spec['type'])) {
-				if ($spec['type'] == 'string') {
+			if(isset($spec['type'])) {
+				if($spec['type'] == 'string') {
 					$unstemmed = array();
 					$unstemmed['type'] = "string";
 					$unstemmed['analyzer'] = "unstemmed";
@@ -237,7 +237,7 @@ 
 					//Add autocomplete field if so required
 					$autocomplete = \Config::inst()->get($this->owner->ClassName, 'searchable_autocomplete');
 
-					if (isset($autocomplete) && in_array($name, $autocomplete)) {
+					if(isset($autocomplete) && in_array($name, $autocomplete)) {
 						$autocompleteField = array();
 						$autocompleteField['type'] = "string";
 						$autocompleteField['index_analyzer'] = "autocomplete_index_analyzer";
@@ -256,7 +256,7 @@ 
 			$result[$name] = $spec;
 		}
 
-		if ($this->owner->hasMethod('updateElasticHTMLFields')) {
+		if($this->owner->hasMethod('updateElasticHTMLFields')) {
 			$this->html_fields = $this->owner->updateElasticHTMLFields($this->html_fields);
 		}
 
@@ -276,7 +276,7 @@ 
 
 		$localeMapping = array();
 
-		if ($this->owner->hasField('Locale')) {
+		if($this->owner->hasField('Locale')) {
 			$localeMapping['type'] = 'string';
 			// we wish the locale to be stored as is
 			$localeMapping['index'] = 'not_analyzed';
@@ -295,7 +295,7 @@ 
 		//_all field picks up all possible suggestions
 		$mapping->enableAllField();
 
-		if ($this->owner->hasMethod('updateElasticsearchMapping')) {
+		if($this->owner->hasMethod('updateElasticsearchMapping')) {
 			$mapping = $this->owner->updateElasticsearchMapping($mapping);
 		}
 		return $mapping;
@@ -311,20 +311,20 @@ 
 		self::$index_ctr++;
 		$fields = $this->getFieldValuesAsArray();
 
-		if (isset($_GET['progress'])) {
+		if(isset($_GET['progress'])) {
 			$progress = $_GET['progress'];
-			self::$progressInterval = (int) $progress;
+			self::$progressInterval = (int)$progress;
 		}
 
-		if (self::$progressInterval > 0) {
-			if (self::$index_ctr % self::$progressInterval === 0) {
-				ElasticaUtil::message("\t".$this->owner->ClassName." - Prepared ".self::$index_ctr." for indexing...");
+		if(self::$progressInterval > 0) {
+			if(self::$index_ctr % self::$progressInterval === 0) {
+				ElasticaUtil::message("\t" . $this->owner->ClassName . " - Prepared " . self::$index_ctr . " for indexing...");
 			}
 		}
 
 		// Optionally update the document
 		$document = new Document($this->owner->ID, $fields);
-		if ($this->owner->hasMethod('updateElasticsearchDocument')) {
+		if($this->owner->hasMethod('updateElasticsearchDocument')) {
 			$document = $this->owner->updateElasticsearchDocument($document);
 		}
 
@@ -335,11 +335,11 @@ 
 
 		$document->set('IsInSiteTree', $inSiteTree);
 
-		if ($inSiteTree) {
+		if($inSiteTree) {
 			$document->set('Link', $this->owner->AbsoluteLink());
 		}
 
-		if (isset($this->owner->Locale)) {
+		if(isset($this->owner->Locale)) {
 			$document->set('Locale', $this->owner->Locale);
 		}
 
@@ -351,10 +351,10 @@ 
 		$fields = array();
 		$has_ones = $this->owner->has_one();
 
-		foreach ($this->getElasticaFields($recurse) as $field => $config) {
-			if (null === $this->owner->$field && is_callable(get_class($this->owner) . "::" . $field)) {
+		foreach($this->getElasticaFields($recurse) as $field => $config) {
+			if(null === $this->owner->$field && is_callable(get_class($this->owner) . "::" . $field)) {
 				// call a method to get a field value
-				if (in_array($field, $this->html_fields)) {
+				if(in_array($field, $this->html_fields)) {
 					// Parse short codes in HTML, and then convert to text
 					$fields[$field] = $this->owner->$field;
 					$html = ShortcodeParser::get_active()->parse($this->owner->$field());
@@ -366,30 +366,30 @@ 
 				}
 
 			} else {
-				if (in_array($field, $this->html_fields)) {
+				if(in_array($field, $this->html_fields)) {
 					$fields[$field] = $this->owner->$field;
-					if (gettype($this->owner->$field) !== 'NULL') {
+					if(gettype($this->owner->$field) !== 'NULL') {
 						$html = ShortcodeParser::get_active()->parse($this->owner->$field);
 						$txt = \Convert::html2raw($html);
 						$fields[$field] = $txt;
 					}
 				} else {
-					if (isset($config['properties']['__method'])) {
+					if(isset($config['properties']['__method'])) {
 						$methodName = $config['properties']['__method'];
 						$data = $this->owner->$methodName();
 						$relArray = array();
 
 						// get the fields of a has_one relational object
-						if (isset($has_ones[$methodName])) {
-							if ($data->ID > 0) {
+						if(isset($has_ones[$methodName])) {
+							if($data->ID > 0) {
 								$item = $data->getFieldValuesAsArray(false);
 								$relArray = $item;
 							}
 
 						// get the fields for a has_many or many_many relational list
 						} else {
-							foreach ($data->getIterator() as $item) {
-								if ($recurse) {
+							foreach($data->getIterator() as $item) {
+								if($recurse) {
 									// populate the subitem but do not recurse any further if more relationships
 									$itemDoc = $item->getFieldValuesAsArray(false);
 									array_push($relArray, $itemDoc);
@@ -426,8 +426,8 @@ 
 	 * Delete the record from the search index if ShowInSearch is deactivated (non-SiteTree).
 	 */
 	public function onBeforeWrite() {
-		if (($this->owner instanceof \SiteTree)) {
-			if ($this->owner->hasField('ShowInSearch') &&
+		if(($this->owner instanceof \SiteTree)) {
+			if($this->owner->hasField('ShowInSearch') &&
 				$this->owner->isChanged('ShowInSearch', 2) && false == $this->owner->ShowInSearch) {
 				$this->doDeleteDocument();
 			}
@@ -439,11 +439,11 @@ 
 	 * Delete the record from the search index if ShowInSearch is deactivated (SiteTree).
 	 */
 	public function onBeforePublish() {
-		if (false == $this->owner->ShowInSearch) {
-			if ($this->owner->isPublished()) {
+		if(false == $this->owner->ShowInSearch) {
+			if($this->owner->isPublished()) {
 				$liveRecord = \Versioned::get_by_stage(get_class($this->owner), 'Live')->
 					byID($this->owner->ID);
-				if ($liveRecord->ShowInSearch != $this->owner->ShowInSearch) {
+				if($liveRecord->ShowInSearch != $this->owner->ShowInSearch) {
 					$this->doDeleteDocument();
 				}
 			}
@@ -471,8 +471,8 @@ 
 	 * Updates the record in the search index.
 	 */
 	protected function doIndexDocument() {
-		if ($this->showRecordInSearch()) {
-			if (!$this->owner->IndexingOff) {
+		if($this->showRecordInSearch()) {
+			if(!$this->owner->IndexingOff) {
 				$this->service->index($this->owner);
 			}
 		}
@@ -499,7 +499,7 @@ 
 	 * Removes the record from the search index if the "ShowInSearch" attribute is set to true.
 	 */
 	protected function doDeleteDocumentIfInSearch() {
-		if ($this->showRecordInSearch()) {
+		if($this->showRecordInSearch()) {
 			$this->doDeleteDocument();
 		}
 	}
@@ -509,14 +509,14 @@ 
 	 * Removes the record from the search index.
 	 */
 	protected function doDeleteDocument() {
-		try{
-			if (!$this->owner->IndexingOff) {
+		try {
+			if(!$this->owner->IndexingOff) {
 				// this goes to elastica service
 				$this->service->remove($this->owner);
 			}
 		}
-		catch(\Elastica\Exception\NotFoundException $e) {
-			trigger_error("Deleted document ".$this->owner->ClassName." (".$this->owner->ID.
+		catch (\Elastica\Exception\NotFoundException $e) {
+			trigger_error("Deleted document " . $this->owner->ClassName . " (" . $this->owner->ID .
 				") not found in search index.", E_USER_NOTICE);
 		}
 
@@ -533,42 +533,42 @@ 
 		$fields = \Config::inst()->get(get_class($this->owner), 'searchable_fields');
 
 		// fallback to default method
-		if(!$fields) user_error('The field $searchable_fields must be set for the class '.$this->owner->ClassName);
+		if(!$fields) user_error('The field $searchable_fields must be set for the class ' . $this->owner->ClassName);
 
 		// get the values of these fields
 		$elasticaMapping = $this->fieldsToElasticaConfig($fields);
 
-		if ($recurse) {
+		if($recurse) {
 			// now for the associated methods and their results
 			$methodDescs = \Config::inst()->get(get_class($this->owner), 'searchable_relationships');
 			$has_ones = $this->owner->has_one();
 			$has_lists = $this->getListRelationshipMethods();
 
-			if (isset($methodDescs) && is_array($methodDescs)) {
-				foreach ($methodDescs as $methodDesc) {
+			if(isset($methodDescs) && is_array($methodDescs)) {
+				foreach($methodDescs as $methodDesc) {
 					// split before the brackets which can optionally list which fields to index
 					$splits = explode('(', $methodDesc);
 					$methodName = $splits[0];
 
-					if (isset($has_lists[$methodName])) {
+					if(isset($has_lists[$methodName])) {
 
 						$relClass = $has_lists[$methodName];
 						$fields = \Config::inst()->get($relClass, 'searchable_fields');
-						if(!$fields) user_error('The field $searchable_fields must be set for the class '.$relClass);
+						if(!$fields) user_error('The field $searchable_fields must be set for the class ' . $relClass);
 						$rewrite = $this->fieldsToElasticaConfig($fields);
 
 						// mark as a method, the resultant fields are correct
-						$elasticaMapping[$methodName.'()'] = $rewrite;
-					} else if (isset($has_ones[$methodName])) {
+						$elasticaMapping[$methodName . '()'] = $rewrite;
+					} else if(isset($has_ones[$methodName])) {
 						$relClass = $has_ones[$methodName];
 						$fields = \Config::inst()->get($relClass, 'searchable_fields');
-						if(!$fields) user_error('The field $searchable_fields must be set for the class '.$relClass);
+						if(!$fields) user_error('The field $searchable_fields must be set for the class ' . $relClass);
 						$rewrite = $this->fieldsToElasticaConfig($fields);
 
 						// mark as a method, the resultant fields are correct
-						$elasticaMapping[$methodName.'()'] = $rewrite;
+						$elasticaMapping[$methodName . '()'] = $rewrite;
 					} else {
-						user_error('The method '.$methodName.' not found in class '.$this->owner->ClassName.
+						user_error('The method ' . $methodName . ' not found in class ' . $this->owner->ClassName .
 								', please check configuration');
 					}
 				}
@@ -604,11 +604,11 @@ 
 	public function requireDefaultRecords() {
 		parent::requireDefaultRecords();
 
-		$searchableFields = $this->getElasticaFields(true,true);
+		$searchableFields = $this->getElasticaFields(true, true);
 
 
 		$doSC = \SearchableClass::get()->filter(array('Name' => $this->owner->ClassName))->first();
-		if (!$doSC) {
+		if(!$doSC) {
 			$doSC = new \SearchableClass();
 			$doSC->Name = $this->owner->ClassName;
 
@@ -618,9 +618,9 @@ 
 			$doSC->write();
 		}
 
-		foreach ($searchableFields as $name => $searchableField) {
+		foreach($searchableFields as $name => $searchableField) {
 			// check for existence of methods and if they exist use that as the name
-			if (!isset($searchableField['type'])) {
+			if(!isset($searchableField['type'])) {
 				$name = $searchableField['properties']['__method'];
 			}
 
@@ -628,25 +628,25 @@ 
 			$doSF = \SearchableField::get()->filter($filter)->first();
 
 
-			if (!$doSF) {
+			if(!$doSF) {
 				$doSF = new \SearchableField();
 				$doSF->ClazzName = $this->owner->ClassName;
 				$doSF->Name = $name;
 
-				if (isset($searchableField['type'])) {
+				if(isset($searchableField['type'])) {
 					$doSF->Type = $searchableField['type'];
-				}  else {
+				} else {
 					$doSF->Name = $searchableField['properties']['__method'];
 					$doSF->Type = 'relationship';
 				}
 				$doSF->SearchableClassID = $doSC->ID;
 
-				if (isset($searchableField['fields']['autocomplete'])) {
+				if(isset($searchableField['fields']['autocomplete'])) {
 					$doSF->Autocomplete = true;
 				}
 
 				$doSF->write();
-				\DB::alteration_message("Created new searchable editable field ".$name,"changed");
+				\DB::alteration_message("Created new searchable editable field " . $name, "changed");
 			}
 
 			// FIXME deal with deletions
@@ -660,7 +660,7 @@ 
 
 		// array of method name to retuned object ClassName for relationships returning lists
 		$has_lists = $has_manys;
-		foreach (array_keys($many_manys) as $key) {
+		foreach(array_keys($many_manys) as $key) {
 			$has_lists[$key] = $many_manys[$key];
 		}
 
@@ -671,11 +671,11 @@ 
 	private function isInSiteTree($classname) {
 		$inSiteTree = $classname === 'SiteTree' ? true : false;
 
-		if (!$inSiteTree) {
+		if(!$inSiteTree) {
 			$class = new \ReflectionClass($this->owner->ClassName);
-			while ($class = $class->getParentClass()) {
+			while($class = $class->getParentClass()) {
 				$parentClass = $class->getName();
-				if ($parentClass == 'SiteTree') {
+				if($parentClass == 'SiteTree') {
 					$inSiteTree = true;
 					break;
 				}
@@ -691,7 +691,7 @@ 
 	 */
 	public function RenderResult($linkToContainer = '') {
 		$vars = new \ArrayData(array('SearchResult' => $this->owner, 'ContainerLink' => $linkToContainer));
-		$possibleTemplates = array($this->owner->ClassName.'ElasticSearchResult', 'ElasticSearchResult');
+		$possibleTemplates = array($this->owner->ClassName . 'ElasticSearchResult', 'ElasticSearchResult');
 		return $this->owner->customise($vars)->renderWith($possibleTemplates);
 	}
 
@@ -705,10 +705,10 @@ 
     public function updateCMSFields(\FieldList $fields) {
 		$isIndexed = false;
 		// SIteTree object must have a live record, ShowInSearch = true
-		if ($this->isInSiteTree($this->owner->ClassName)) {
+		if($this->isInSiteTree($this->owner->ClassName)) {
 			$liveRecord = \Versioned::get_by_stage(get_class($this->owner), 'Live')->
 				byID($this->owner->ID);
-			if ($liveRecord->ShowInSearch) {
+			if($liveRecord->ShowInSearch) {
 				$isIndexed = true;
 			} else {
 				$isIndexed = false;
@@ -718,27 +718,27 @@ 
 			$isIndexed = true;
 		}
 
-		if ($isIndexed) {
+		if($isIndexed) {
 			$termVectors = $this->getTermVectors();
 			$termFields = array_keys($termVectors);
 			sort($termFields);
 
-			foreach ($termFields as $field) {
+			foreach($termFields as $field) {
 				$terms = new \ArrayList();
 
-				foreach (array_keys($termVectors[$field]['terms']) as $term) {
+				foreach(array_keys($termVectors[$field]['terms']) as $term) {
 		        	$do = new \DataObject();
 			        $do->Term = $term;
 			        $stats = $termVectors[$field]['terms'][$term];
-			        if (isset($stats['ttf'])) {
+			        if(isset($stats['ttf'])) {
 			        	$do->TTF = $stats['ttf'];
 			        }
 
-			        if (isset($stats['doc_freq'])) {
+			        if(isset($stats['doc_freq'])) {
 			        	$do->DocFreq = $stats['doc_freq'];
 			        }
 
-			        if (isset($stats['term_freq'])) {
+			        if(isset($stats['term_freq'])) {
 			        	$do->TermFreq = $stats['term_freq'];
 			        }
 			        $terms->push($do);
@@ -755,14 +755,14 @@ 
 		       $underscored = str_replace('.', '_', $field);
 
 		        $gridField = new \GridField(
-		            'TermsFor'.$underscored, // Field name
-		            $field.'TITLE'.$field, // Field title
+		            'TermsFor' . $underscored, // Field name
+		            $field . 'TITLE' . $field, // Field title
 		            $terms,
 		            $config
 		        );
 
 		      // $tab = new \Tab($field, new \TextField('Test'.$field, 'Testing'));
-		       $fields->addFieldToTab('Root.ElasticaTerms.'.$underscored, $gridField);
+		       $fields->addFieldToTab('Root.ElasticaTerms.' . $underscored, $gridField);
 			}
 
 		}

searchpage/ElasticSearchForm.php

Indentation +10 added lines, -10 removed lines

@@ -27,17 +27,17 @@ 
 	 */
 	public function __construct($controller, $name, $fields = null, $actions = null) {
 		$searchText = isset($this->Query) ? $this->Query : '';
-        $fields = new FieldList(
-           $tf = new TextField("q", "", $searchText)
-        );
+		$fields = new FieldList(
+		   $tf = new TextField("q", "", $searchText)
+		);
 
 
-        $buttonText = _t('SearchPage.SEARCH', 'Search');
-        $actions = new FieldList(
-            $fa = new FormAction('submit', $buttonText)
-        );
+		$buttonText = _t('SearchPage.SEARCH', 'Search');
+		$actions = new FieldList(
+			$fa = new FormAction('submit', $buttonText)
+		);
 
-        $this->SubmitButton = $fa;
+		$this->SubmitButton = $fa;
 
 		if(class_exists('Translatable') && singleton('SiteTree')->hasExtension('Translatable')) {
 			$fields->push(new HiddenField('searchlocale', 'searchlocale', Translatable::get_current_locale()));
@@ -64,7 +64,7 @@ 
 	 */
 	public function setButtonText($newButtonText) {
 		$this->actions = new FieldList(
-            $fa = new FormAction('submit', $newButtonText)
-        );
+			$fa = new FormAction('submit', $newButtonText)
+		);
 	}
 }

tests/ElasticSearcherUnitTest.php

Doc Comments +3 added lines

@@ -233,6 +233,9 @@
 
 
 
+	/**
+	 * @param PaginatedList $paginated
+	 */
 	private function makeCode($paginated) {
 		$results = $paginated->getList()->toArray();
 		$ctr = 0;

Spacing +13 added lines, -13 removed lines

@@ -49,7 +49,7 @@ 
 		$results = $es->moreLikeThis($fp, $fields, true);
 
 		echo "RESULTS:\n";
-		foreach ($results as $result) {
+		foreach($results as $result) {
 			echo "-\t{$result->Title}\n";
 		}
 
@@ -129,7 +129,7 @@ 
 		$es->setClasses('FlickrPhotoTO');
 		$fields = array('Title.standard' => 1, 'Description.standard' => 1);
 		$paginated = $es->moreLikeThis($fp, $fields, true);
-		foreach ($paginated->getList() as $result) {
+		foreach($paginated->getList() as $result) {
 			echo $result->ID . ' : ' . $result->Title . "\n";
 		}
 		$this->assertEquals(32, $paginated->getTotalItems());
@@ -155,7 +155,7 @@ 
 		$es->setClasses('FlickrPhotoTO');
 		$fields = array('Title.standard' => 1, 'Description.standard' => 1);
 		$paginated = $es->moreLikeThis($fp, $fields, true);
-		foreach ($paginated->getList() as $result) {
+		foreach($paginated->getList() as $result) {
 			echo $result->ID . ' : ' . $result->Title . "\n";
 		}
 		$this->assertEquals(14, $paginated->getTotalItems());
@@ -211,16 +211,16 @@ 
 		$paginated = $es->search($query, $fields);
 		$ctr = 0;
 
-		foreach ($paginated->getList()->toArray() as $result) {
+		foreach($paginated->getList()->toArray() as $result) {
 			$ctr++;
-			foreach ($result->SearchHighlightsByField->Description_standard->getIterator() as $highlight) {
+			foreach($result->SearchHighlightsByField->Description_standard->getIterator() as $highlight) {
 				$snippet = $highlight->Snippet;
 				$snippet = strtolower($snippet);
 				$wordFound = false;
 				$lcquery = explode(' ', strtolower($query));
-				foreach ($lcquery as $part) {
+				foreach($lcquery as $part) {
 					$bracketed = '<strong class="hl">' . $part . '</strong>';
-					if (strpos($snippet, $bracketed) > 0) {
+					if(strpos($snippet, $bracketed) > 0) {
 						$wordFound = true;
 					}
 				}
@@ -240,17 +240,17 @@ 
 		$paginated = $es->search($query, $fields);
 		$ctr = 0;
 
-		foreach ($paginated->getList()->toArray() as $result) {
+		foreach($paginated->getList()->toArray() as $result) {
 			$ctr++;
 
-			foreach ($result->SearchHighlightsByField->Description->getIterator() as $highlight) {
+			foreach($result->SearchHighlightsByField->Description->getIterator() as $highlight) {
 				$snippet = $highlight->Snippet;
 				$snippet = strtolower($snippet);
 				$wordFound = false;
 				$lcquery = explode(' ', strtolower($query));
-				foreach ($lcquery as $part) {
+				foreach($lcquery as $part) {
 					$bracketed = '<strong class="hl">' . $part . '</strong>';
-					if (strpos($snippet, $bracketed) > 0) {
+					if(strpos($snippet, $bracketed) > 0) {
 						$wordFound = true;
 					}
 				}
@@ -267,7 +267,7 @@ 
 		$query = 'Lond';
 		$results = $es->autocomplete_search($query, 'Title');
 		$this->assertEquals(7, $results->getTotalItems());
-		foreach ($results->toArray() as $result) {
+		foreach($results->toArray() as $result) {
 			$this->assertTrue(strpos($result->Title, $query) > 0);
 		}
 	}
@@ -277,7 +277,7 @@ 
 		$results = $paginated->getList()->toArray();
 		$ctr = 0;
 		echo '$result = $paginated->getList()->toArray();' . "\n";
-		foreach ($results as $result) {
+		foreach($results as $result) {
 			echo '$this->assertEquals("' . $result->Title . '", $results[' . $ctr . ']->Title);' . "\n";
 			$ctr++;
 		}

tests/TranslatableSearchableTest.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
 	public function setUp() {
 		// this needs to be called in order to create the list of searchable
 		// classes and fields that are available.  Simulates part of a build
-		$classes = array('SearchableTestPage','SiteTree','Page','FlickrPhotoTO','FlickrSetTO',
+		$classes = array('SearchableTestPage', 'SiteTree', 'Page', 'FlickrPhotoTO', 'FlickrSetTO',
 			'FlickrTagTO', 'FlickrAuthorTO', 'FlickrSetTO');
 		$this->requireDefaultRecordsFrom = $classes;
 

src/SilverStripe/Elastica/ElasticaService.php

Doc Comments +1 added lines, -1 removed lines

@@ -133,7 +133,7 @@
 	 *
 	 * @param \Elastica\Query|string|array $query
 	 * @param string|array $types List of comma separated SilverStripe classes to search, or blank for all
-	 * @return \Elastica\ResultList
+	 * @return \Elastica\ResultSet
 	 */
 	public function search($query, $types = '') {
 		$query = Query::create($query); // may be a string

searchpage/ElasticSearchPage.php

Indentation +27 added lines, -27 removed lines

@@ -62,7 +62,7 @@ 
 	);
 
 	private static $many_many_extraFields = array(
-    	'ElasticaSearchableFields' => array(
+		'ElasticaSearchableFields' => array(
 		'Searchable' => 'Boolean', // allows the option of turning off a single field for searching
 		'SimilarSearchable' => 'Boolean', // allows field to be used in more like this queries.
 		'Active' => 'Boolean', // preserve previous edits of weighting when classes changed
@@ -104,10 +104,10 @@ 
 		$sortedWords = $this->SimilarityStopWords;
 
 		$stopwordsField = StringTagField::create(
-		    'SimilarityStopWords',
-		    'Stop Words for Similar Search',
-		    $sortedWords,
-		    $sortedWords
+			'SimilarityStopWords',
+			'Stop Words for Similar Search',
+			$sortedWords,
+			$sortedWords
 		);
 
 		$stopwordsField->setShouldLazyLoad(true); // tags should be lazy loaded
@@ -190,15 +190,15 @@ 
 		$fields->addFieldToTab('Root.Search.Aggregations', new TextField('SearchHelper',
 			'ClassName of object to manipulate search details and results.  Leave blank for standard search'));
 
-        $ottos = AutoCompleteOption::get()->Filter('Locale', $this->Locale)->map('ID', 'Name')->
-        									toArray();
-        $df = DropdownField::create('AutoCompleteFunctionID', 'Autocomplete Function')->
-        							setSource($ottos);
-        $df->setEmptyString('-- Please select what do do after find as you type has occurred --');
+		$ottos = AutoCompleteOption::get()->Filter('Locale', $this->Locale)->map('ID', 'Name')->
+											toArray();
+		$df = DropdownField::create('AutoCompleteFunctionID', 'Autocomplete Function')->
+									setSource($ottos);
+		$df->setEmptyString('-- Please select what do do after find as you type has occurred --');
 
-        $ottos = $this->ElasticaSearchableFields()->filter('EnableAutocomplete',1)->Map('ID', 'Name')->toArray();
-        $autoCompleteFieldDF = DropDownField::create('AutoCompleteFieldID', 'Field to use for autocomplete')->setSource($ottos);
-        $autoCompleteFieldDF->setEmptyString('-- Please select which field to use for autocomplete --');
+		$ottos = $this->ElasticaSearchableFields()->filter('EnableAutocomplete',1)->Map('ID', 'Name')->toArray();
+		$autoCompleteFieldDF = DropDownField::create('AutoCompleteFieldID', 'Field to use for autocomplete')->setSource($ottos);
+		$autoCompleteFieldDF->setEmptyString('-- Please select which field to use for autocomplete --');
 
 		$fields->addFieldToTab("Root.Search.AutoComplete",
 		  		FieldGroup::create(
@@ -223,7 +223,7 @@ 
 		$pickerConfig->removeComponentsByType(new PickerFieldAddExistingSearchButton());
 		$pickerConfig->getComponentByType('GridFieldPaginator')->setItemsPerPage(100);
 
-        $searchPicker->enableEdit();
+		$searchPicker->enableEdit();
 		$edittest = $pickerConfig->getComponentByType('GridFieldDetailForm');
 		$edittest->setFields(FieldList::create(
 			TextField::create('Name', 'Field Name'),
@@ -257,23 +257,23 @@ 
 
 		// What do display on the grid of searchable fields
 		$dataColumns = $pickerConfig->getComponentByType('GridFieldDataColumns');
-        $dataColumns->setDisplayFields(array(
+		$dataColumns->setDisplayFields(array(
 			'Name' => 'Name',
-        	'ClazzName' => 'Class',
+			'ClazzName' => 'Class',
 			'Type' => 'Type',
 			'Searchable' => 'Use for Search?',
 			'SimilarSearchable' => 'Use for Similar Search?',
 			'ShowHighlights' => 'Show Search Highlights',
 			'Weight' => 'Weighting'
-        ));
+		));
 
 		return $fields;
 	}
 
 
 	public function getCMSValidator() {
-        return new ElasticSearchPage_Validator();
-    }
+		return new ElasticSearchPage_Validator();
+	}
 
 
 	/**
@@ -358,7 +358,7 @@ 
 		$esfs = $this->ElasticaSearchableFields();
 
 		// Remove existing searchable fields for this page from the list of all available
-    	$delta = array_keys($esfs->map()->toArray());
+		$delta = array_keys($esfs->map()->toArray());
 		$newSearchableFields = $sfs->exclude('ID', $delta);
 
 		if ($newSearchableFields->count() > 0) {
@@ -448,7 +448,7 @@ 
 		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
 		Requirements::javascript("elastica/javascript/jquery.autocomplete.js");
 		Requirements::javascript("elastica/javascript/elastica.js");
-        Requirements::css("elastica/css/elastica.css");
+		Requirements::css("elastica/css/elastica.css");
 	}
 
 
@@ -522,9 +522,9 @@ 
 
 		try {
 			// Simulate server being down for testing purposes
-	        if (isset($_GET['ServerDown'])) {
-	        	throw new Elastica\Exception\Connection\HttpException('Unable to reach search server');
-	        }
+			if (isset($_GET['ServerDown'])) {
+				throw new Elastica\Exception\Connection\HttpException('Unable to reach search server');
+			}
 			if (class_exists($class)) {
 				$instance = \DataObject::get_by_id($class,$instanceID);
 
@@ -664,9 +664,9 @@ 
 		$paginated = null;
 		try {
 			// Simulate server being down for testing purposes
-	        if (isset($_GET['ServerDown'])) {
-	        	throw new Elastica\Exception\Connection\HttpException('Unable to reach search server');
-	        }
+			if (isset($_GET['ServerDown'])) {
+				throw new Elastica\Exception\Connection\HttpException('Unable to reach search server');
+			}
 
 			// now actually perform the search using the original query
 			$paginated = $es->search($queryText, $fieldsToSearch, $testMode);

Spacing +75 added lines, -75 removed lines

@@ -118,29 +118,29 @@ 
 			'Default values are those used by Elastica'));
 		$fields->addFieldToTab("Root.Search.Similarity", $lf);
 		$fields->addFieldToTab("Root.Search.Similarity", new TextField('MinTermFreq',
-			'The minimum term frequency below which the terms will be ignored from the input '.
+			'The minimum term frequency below which the terms will be ignored from the input ' .
 			'document. Defaults to 2.'));
 		$fields->addFieldToTab("Root.Search.Similarity", new TextField('MaxTermFreq',
-			'The maximum number of query terms that will be selected. Increasing this value gives '.
+			'The maximum number of query terms that will be selected. Increasing this value gives ' .
 			'greater accuracy at the expense of query execution speed. Defaults to 25.'));
 		$fields->addFieldToTab("Root.Search.Similarity", new TextField('MinWordLength',
 			'The minimum word length below which the terms will be ignored.  Defaults to 0.'));
 		$fields->addFieldToTab("Root.Search.Similarity", new TextField('MinDocFreq',
-			'The minimum document frequency below which the terms will be ignored from the input '.
+			'The minimum document frequency below which the terms will be ignored from the input ' .
 			'document. Defaults to 5.'));
 		$fields->addFieldToTab("Root.Search.Similarity", new TextField('MaxDocFreq',
-			'The maximum document frequency above which the terms will be ignored from the input '.
-			'document. This could be useful in order to ignore highly frequent words such as stop '.
+			'The maximum document frequency above which the terms will be ignored from the input ' .
+			'document. This could be useful in order to ignore highly frequent words such as stop ' .
 			'words. Defaults to unbounded (0).'));
 		$fields->addFieldToTab("Root.Search.Similarity", new TextField('MinWordLength',
-			'The minimum word length below which the terms will be ignored. The old name min_'.
+			'The minimum word length below which the terms will be ignored. The old name min_' .
 			'word_len is deprecated. Defaults to 0.'));
 		$fields->addFieldToTab("Root.Search.Similarity", new TextField('MaxWordLength',
-			'The maximum word length above which the terms will be ignored. The old name max_word_'.
+			'The maximum word length above which the terms will be ignored. The old name max_word_' .
 			'len is deprecated. Defaults to unbounded (0).'));
 		$fields->addFieldToTab("Root.Search.Similarity", new TextField('MinShouldMatch',
-			'This parameter controls the number of terms that must match. This can be either a '.
-			'number or a percentage.  See '.
+			'This parameter controls the number of terms that must match. This can be either a ' .
+			'number or a percentage.  See ' .
 			'https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-minimum-should-match.html'));
 
 		// ---- search details tab ----
@@ -157,7 +157,7 @@ 
 
 		$classes = array();
 		$records = DB::query($sql);
-		foreach ($records as $record) {
+		foreach($records as $record) {
 			array_push($classes, $record['ClassName']);
 		}
 		$list = implode(',', $classes);
@@ -177,9 +177,9 @@ 
 
 		$html = '<div class="field text" id="SiteTreeOnlyInfo">';
 		$html .= "<p>Copy the following into the above field to ensure that all SiteTree classes are searched</p>";
-		$html .= '<p class="message">'.$list;
+		$html .= '<p class="message">' . $list;
 		$html .= "</p></div>";
-		$infoField = new LiteralField('InfoField',$html);
+		$infoField = new LiteralField('InfoField', $html);
 		$fields->addFieldToTab('Root.Search.SearchFor', $infoField);
 
 		$fields->addFieldToTab('Root.Main', new HTMLEditorField('ContentForEmptySearch'));
@@ -196,7 +196,7 @@ 
         							setSource($ottos);
         $df->setEmptyString('-- Please select what do do after find as you type has occurred --');
 
-        $ottos = $this->ElasticaSearchableFields()->filter('EnableAutocomplete',1)->Map('ID', 'Name')->toArray();
+        $ottos = $this->ElasticaSearchableFields()->filter('EnableAutocomplete', 1)->Map('ID', 'Name')->toArray();
         $autoCompleteFieldDF = DropDownField::create('AutoCompleteFieldID', 'Field to use for autocomplete')->setSource($ottos);
         $autoCompleteFieldDF->setEmptyString('-- Please select which field to use for autocomplete --');
 
@@ -208,9 +208,9 @@ 
 		 );
 
 		// ---- grid of searchable fields ----
-		$html = '<p id="SearchFieldIntro">'._t('SiteConfig.ELASTICA_SEARCH_INFO',
-				"Select a field to edit it's properties").'</p>';
-		$fields->addFieldToTab('Root.Search.Fields', $h1=new LiteralField('SearchInfo', $html));
+		$html = '<p id="SearchFieldIntro">' . _t('SiteConfig.ELASTICA_SEARCH_INFO',
+				"Select a field to edit it's properties") . '</p>';
+		$fields->addFieldToTab('Root.Search.Fields', $h1 = new LiteralField('SearchInfo', $html));
 		$searchPicker = new PickerField('ElasticaSearchableFields', 'Searchable Fields',
 			$this->ElasticaSearchableFields()->filter('Active', 1)->sort('Name'));
 
@@ -246,7 +246,7 @@ 
 			$fields->dataFieldByName('Name')->setReadOnly(true);
 			$fields->dataFieldByName('Name')->setDisabled(true);
 
-			if (!$fieldAutocomplete->Value() == '1') {
+			if(!$fieldAutocomplete->Value() == '1') {
 				$fieldEnableAutcomplete->setDisabled(true);
 				$fieldEnableAutcomplete->setReadOnly(true);
 				$fieldEnableAutcomplete->setTitle("Autcomplete is not available for this field");
@@ -283,49 +283,49 @@ 
 	public function validate() {
 		$result = parent::validate();
 		$mode = Versioned::get_reading_mode();
-		$suffix =  '';
-		if ($mode == 'Stage.Live') {
+		$suffix = '';
+		if($mode == 'Stage.Live') {
 			$suffix = '_Live';
 		}
 
-		if (!$this->Identifier) {
+		if(!$this->Identifier) {
 			$result->error('The identifier cannot be blank');
 		}
 
-		$where = 'ElasticSearchPage'.$suffix.'.ID != '.$this->ID." AND `Identifier` = '{$this->Identifier}'";
+		$where = 'ElasticSearchPage' . $suffix . '.ID != ' . $this->ID . " AND `Identifier` = '{$this->Identifier}'";
 		$existing = ElasticSearchPage::get()->where($where)->count();
-		if ($existing > 0) {
-			$result->error('The identifier '.$this->Identifier.' already exists');
+		if($existing > 0) {
+			$result->error('The identifier ' . $this->Identifier . ' already exists');
 		}
 
 
-		error_log('CTS:'.$this->ClassesToSearch);
+		error_log('CTS:' . $this->ClassesToSearch);
 
 		// now check classes to search actually exist, assuming in site tree not set
-		error_log('STO:'.$this->SiteTreeOnly);
-		if (!$this->SiteTreeOnly) {
-			if ($this->ClassesToSearch == '') {
+		error_log('STO:' . $this->SiteTreeOnly);
+		if(!$this->SiteTreeOnly) {
+			if($this->ClassesToSearch == '') {
 				$result->error('At least one searchable class must be available, or SiteTreeOnly flag set');
 			} else {
 				$toSearch = explode(',', $this->ClassesToSearch);
-				foreach ($toSearch as $clazz) {
+				foreach($toSearch as $clazz) {
 					try {
 						$instance = Injector::inst()->create($clazz);
-						if (!$instance->hasExtension('SilverStripe\Elastica\Searchable')) {
-							$result->error('The class '.$clazz.' must have the Searchable extension');
+						if(!$instance->hasExtension('SilverStripe\Elastica\Searchable')) {
+							$result->error('The class ' . $clazz . ' must have the Searchable extension');
 						}
 					} catch (ReflectionException $e) {
-						$result->error('The class '.$clazz.' does not exist');
+						$result->error('The class ' . $clazz . ' does not exist');
 					}
 				}
 			}
 		}
 
 
-		foreach ($this->ElasticaSearchableFields() as $esf) {
-			if ($esf->Weight == 0) {
+		foreach($this->ElasticaSearchableFields() as $esf) {
+			if($esf->Weight == 0) {
 				$result->error("The field {$esf->ClazzName}.{$esf->Name} has a zero weight. ");
-			} else if ($esf->Weight < 0) {
+			} else if($esf->Weight < 0) {
 				$result->error("The field {$esf->ClazzName}.{$esf->Name} has a negative weight. ");
 			}
 		}
@@ -341,7 +341,7 @@ 
 
 		#FIXME -  SiteTree only
 		$relevantClasses = $this->ClassesToSearch; // due to validation this will be valid
-		if ($this->SiteTreeOnly) {
+		if($this->SiteTreeOnly) {
 			$relevantClasses = SearchableClass::get()->filter('InSiteTree', true)->Map('Name')->toArray();
 
 		}
@@ -361,9 +361,9 @@ 
     	$delta = array_keys($esfs->map()->toArray());
 		$newSearchableFields = $sfs->exclude('ID', $delta);
 
-		if ($newSearchableFields->count() > 0) {
-			foreach ($newSearchableFields->getIterator() as $newSearchableField) {
-				error_log('NEW FIELD:'.$newSearchableField->Name);
+		if($newSearchableFields->count() > 0) {
+			foreach($newSearchableFields->getIterator() as $newSearchableField) {
+				error_log('NEW FIELD:' . $newSearchableField->Name);
 				$newSearchableField->Active = true;
 				$newSearchableField->Weight = 1;
 
@@ -371,7 +371,7 @@ 
 
 				// Note 1 used instead of true for SQLite3 testing compatibility
 				$sql = "UPDATE ElasticSearchPage_ElasticaSearchableFields SET ";
-				$sql .= 'Active=1, Weight=1 WHERE ElasticSearchPageID = '.$this->ID;
+				$sql .= 'Active=1, Weight=1 WHERE ElasticSearchPageID = ' . $this->ID;
 				DB::query($sql);
 			}
 		}
@@ -406,19 +406,19 @@ 
 		$qField = $fields->fieldByName('q');
 
 
-		if ($buttonTextOverride) {
+		if($buttonTextOverride) {
 			$result->setButtonText($buttonTextOverride);
 		}
 
 		/*
 		A field needs to be chosen for autocompletion, if not no autocomplete
 		 */
-		if ($this->AutoCompleteFieldID > 0) {
+		if($this->AutoCompleteFieldID > 0) {
 			$qField->setAttribute('data-autocomplete', 'true');
 			$qField->setAttribute('data-autocomplete-field', 'Title');
 			$qField->setAttribute('data-autocomplete-classes', $this->ClassesToSearch);
 			$qField->setAttribute('data-autocomplete-sitetree', $this->SiteTreeOnly);
-			$qField->setAttribute('data-autocomplete-source',$this->Link());
+			$qField->setAttribute('data-autocomplete-source', $this->Link());
 			$qField->setAttribute('data-autocomplete-function',
 			$this->AutocompleteFunction()->Slug);
 		}
@@ -440,7 +440,7 @@ 
 
 class ElasticSearchPage_Controller extends Page_Controller {
 
-	private static $allowed_actions = array('SearchForm', 'submit','index','similar');
+	private static $allowed_actions = array('SearchForm', 'submit', 'index', 'similar');
 
 	public function init() {
 		parent::init();
@@ -494,7 +494,7 @@ 
 
 
 		// filter by class or site tree
-		if ($ep->SiteTreeOnly) {
+		if($ep->SiteTreeOnly) {
 			T7; //FIXME test missing
 			$es->addFilter('IsInSiteTree', true);
 		} else {
@@ -510,23 +510,23 @@ 
 			'SimilarSearchable' => true
 		));
 
-		foreach ($editedSearchFields->getIterator() as $searchField) {
+		foreach($editedSearchFields->getIterator() as $searchField) {
 			$fieldsToSearch[$searchField->Name] = $searchField->Weight;
 		}
 
 		// Use the standard field for more like this, ie not stemmed
-		foreach ($fieldsToSearch as $field => $value) {
-			$fieldsToSearch[$field.'.standard'] = $value;
+		foreach($fieldsToSearch as $field => $value) {
+			$fieldsToSearch[$field . '.standard'] = $value;
 			unset($fieldsToSearch[$field]);
 		}
 
 		try {
 			// Simulate server being down for testing purposes
-	        if (isset($_GET['ServerDown'])) {
+	        if(isset($_GET['ServerDown'])) {
 	        	throw new Elastica\Exception\Connection\HttpException('Unable to reach search server');
 	        }
-			if (class_exists($class)) {
-				$instance = \DataObject::get_by_id($class,$instanceID);
+			if(class_exists($class)) {
+				$instance = \DataObject::get_by_id($class, $instanceID);
 
 				$paginated = $es->moreLikeThis($instance, $fieldsToSearch);
 
@@ -540,10 +540,10 @@ 
 
 				$moreLikeThisTerms = $paginated->getList()->MoreLikeThisTerms;
 				$fieldToTerms = new ArrayList();
-				foreach (array_keys($moreLikeThisTerms) as $fieldName) {
+				foreach(array_keys($moreLikeThisTerms) as $fieldName) {
 					$readableFieldName = str_replace('.standard', '', $fieldName);
 					$fieldTerms = new ArrayList();
-					foreach ($moreLikeThisTerms[$fieldName] as $value) {
+					foreach($moreLikeThisTerms[$fieldName] as $value) {
 						$do = new DataObject();
 						$do->Term = $value;
 						$fieldTerms->push($do);
@@ -570,14 +570,14 @@ 
 
 		// calculate time
 		$endTime = microtime(true);
-		$elapsed = round(100*($endTime-$startTime))/100;
+		$elapsed = round(100 * ($endTime - $startTime)) / 100;
 
 		// store variables for the template to use
 		$data['ElapsedTime'] = $elapsed;
 		$data['Elapsed'] = $elapsed;
 
 		// allow the optional use of overriding the search result page, e.g. for photos, maps or facets
-		if ($this->hasExtension('PageControllerTemplateOverrideExtension')) {
+		if($this->hasExtension('PageControllerTemplateOverrideExtension')) {
 			return $this->useTemplateOverride($data);
 		} else {
 			return $data;
@@ -617,23 +617,23 @@ 
 
 		// query string
 		$queryText = '';
-		if (isset($_GET['q'])) {
+		if(isset($_GET['q'])) {
 			$queryText = $_GET['q'];
 		}
 
 		$testMode = isset($_GET['TestMode']);
 
 		// filters for aggregations
-		$ignore = array('url', 'start','q','is');
+		$ignore = array('url', 'start', 'q', 'is');
 		$ignore = \Config::inst()->get('Elastica', 'BlackList');
-		foreach ($this->request->getVars() as $key => $value) {
-			if (!in_array($key, $ignore)) {
-				$es->addFilter($key,$value);
+		foreach($this->request->getVars() as $key => $value) {
+			if(!in_array($key, $ignore)) {
+				$es->addFilter($key, $value);
 			}
 		}
 
 		// filter by class or site tree
-		if ($ep->SiteTreeOnly) {
+		if($ep->SiteTreeOnly) {
 			$es->addFilter('IsInSiteTree', true);
 		} else {
 			$es->setClasses($ep->ClassesToSearch);
@@ -642,7 +642,7 @@ 
 		// set the optional aggregation manipulator
 		// In the event of a manipulator being present, show all the results for search
 		// Otherwise aggregations are all zero
-		if ($this->SearchHelper) {
+		if($this->SearchHelper) {
 			$es->setQueryResultManipulator($this->SearchHelper);
 			$es->showResultsForEmptySearch();
 		} else {
@@ -657,14 +657,14 @@ 
 			'Searchable' => true
 		));
 
-		foreach ($editedSearchFields->getIterator() as $searchField) {
+		foreach($editedSearchFields->getIterator() as $searchField) {
 			$fieldsToSearch[$searchField->Name] = $searchField->Weight;
 		}
 
 		$paginated = null;
 		try {
 			// Simulate server being down for testing purposes
-	        if (isset($_GET['ServerDown'])) {
+	        if(isset($_GET['ServerDown'])) {
 	        	throw new Elastica\Exception\Connection\HttpException('Unable to reach search server');
 	        }
 
@@ -673,11 +673,11 @@ 
 
 			// This is the case of the original query having a better one suggested.  Do a
 			// second search for the suggested query, throwing away the original
-			if ($es->hasSuggestedQuery() && !$ignoreSuggestions) {
+			if($es->hasSuggestedQuery() && !$ignoreSuggestions) {
 				$data['SuggestedQuery'] = $es->getSuggestedQuery();
 				$data['SuggestedQueryHighlighted'] = $es->getSuggestedQueryHighlighted();
 				//Link for if the user really wants to try their original query
-				$sifLink = rtrim($this->Link(),'/').'?q='.$queryText.'&is=1';
+				$sifLink = rtrim($this->Link(), '/') . '?q=' . $queryText . '&is=1';
 				$data['SearchInsteadForLink'] = $sifLink;
 				$paginated = $es->search($es->getSuggestedQuery(), $fieldsToSearch);
 
@@ -685,7 +685,7 @@ 
 
 			// calculate time
 			$endTime = microtime(true);
-			$elapsed = round(100*($endTime-$startTime))/100;
+			$elapsed = round(100 * ($endTime - $startTime)) / 100;
 
 			// store variables for the template to use
 			$data['ElapsedTime'] = $elapsed;
@@ -702,7 +702,7 @@ 
 		$data['OriginalQuery'] = $queryText;
 		$data['IgnoreSuggestions'] = $ignoreSuggestions;
 
-		if ($this->has_extension('PageControllerTemplateOverrideExtension')) {
+		if($this->has_extension('PageControllerTemplateOverrideExtension')) {
 			return $this->useTemplateOverride($data);
 		} else {
 			return $data;
@@ -716,9 +716,9 @@ 
 	 */
 	public function QueryIsEmpty() {
 		$result = !isset($_GET['q']);
-		if (isset($_GET['q']))	{
+		if(isset($_GET['q'])) {
 			$queryText = $_GET['q'];
-			if ($queryText == '') {
+			if($queryText == '') {
 				$result = true;
 			}
 		}
@@ -735,7 +735,7 @@ 
 		$queryText = $data['q'];
 		$url = $this->Link();
 		$url = rtrim($url, '/');
-		$link = rtrim($url, '/').'?q='.$queryText.'&sfid='.$data['identifier'];
+		$link = rtrim($url, '/') . '?q=' . $queryText . '&sfid=' . $data['identifier'];
 		$this->redirect($link);
 	}
 
@@ -752,8 +752,8 @@ 
 		$fields->push($identifierField);
 		$queryField = $fields->fieldByName('q');
 
-		 if (isset($_GET['q']) && isset($_GET['sfid'])) {
-			if ($_GET['sfid'] == $ep->Identifier) {
+		 if(isset($_GET['q']) && isset($_GET['sfid'])) {
+			if($_GET['sfid'] == $ep->Identifier) {
 				$queryField->setValue($_GET['q']);
 			}
 
@@ -762,7 +762,7 @@ 
 		if($this->action == 'similar') {
 			$queryField->setDisabled(true);
 			$actions = $form->Actions();
-			foreach ($actions as $field) {
+			foreach($actions as $field) {
 				$field->setDisabled(true);
 			}
 		}
@@ -770,12 +770,12 @@ 
 		/*
 		A field needs to be chosen for autocompletion, if not no autocomplete
 		 */
-		if ($this->AutoCompleteFieldID > 0) {
+		if($this->AutoCompleteFieldID > 0) {
 			$queryField->setAttribute('data-autocomplete', 'true');
 			$queryField->setAttribute('data-autocomplete-field', 'Title');
 			$queryField->setAttribute('data-autocomplete-classes', $this->ClassesToSearch);
 			$queryField->setAttribute('data-autocomplete-sitetree', $this->SiteTreeOnly);
-			$queryField->setAttribute('data-autocomplete-source',$this->Link());
+			$queryField->setAttribute('data-autocomplete-source', $this->Link());
 			$queryField->setAttribute('data-autocomplete-function',
 			$this->AutocompleteFunction()->Slug);
 		}

code/AutoCompleteOption.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
 		parent::requireDefaultRecords();
 
 		$similar = AutoCompleteOption::get()->filter('Name', 'Similar')->first();
-		if (!$similar) {
+		if(!$similar) {
 			$similar = new AutoCompleteOption();
 			$similar->Name = 'Similar';
 			$similar->Slug = 'SIMILAR';
@@ -37,7 +37,7 @@ 
 		}
 
 		$search = AutoCompleteOption::get()->filter('Name', 'Search')->first();
-		if (!$search) {
+		if(!$search) {
 			$search = new AutoCompleteOption();
 			$search->Name = 'Search';
 			$search->Description = 'Find records similar to the selected item';
@@ -47,7 +47,7 @@ 
 		}
 
 		$goto = AutoCompleteOption::get()->filter('Name', 'GoToRecord')->first();
-		if (!$goto) {
+		if(!$goto) {
 			$goto = new AutoCompleteOption();
 			$goto->Name = 'GoToRecord';
 			$goto->Description = 'Go to the page of the selected item, found by the Link() method';