gordonbanderson / silverstripe-elastica

src/SilverStripe/Elastica/FindElasticaSearchPageExtension.php

Spacing +5 added lines, -5 removed lines

@@ -12,7 +12,7 @@ 
 
 		$searchPage = $this->getSearchPage($identifier);
 
-		if ($searchPage) {
+		if($searchPage) {
 			$result = $searchPage->AbsoluteLink();
 		}
 		return $result;
@@ -24,7 +24,7 @@ 
 
 		$searchPage = $this->getSearchPage($identifier);
 
-		if ($searchPage) {
+		if($searchPage) {
 			$result = $searchPage->SearchForm($buttonTextOverride);
 		}
 		return $result;
@@ -32,7 +32,7 @@ 
 
 
 	public function getSearchPage($identifier) {
-		if (!isset($this->_CachedLastEdited)) {
+		if(!isset($this->_CachedLastEdited)) {
 			$this->_CachedLastEdited = ElasticSearchPage::get()->max('LastEdited');
 		}
 		$ck = $this->_CachedLastEdited;
@@ -42,10 +42,10 @@ 
 
 		$cache = SS_Cache::factory('searchpagecache');
 		$searchPage = null;
-		$cachekeyname = 'searchpageuri'.$identifier.$this->owner->Locale.$ck;
+		$cachekeyname = 'searchpageuri' . $identifier . $this->owner->Locale . $ck;
 
 		if(!($searchPage = unserialize($cache->load($cachekeyname)))) {
-			$searchPage = ElasticSearchPage::get()->filter('Identifier',$identifier)->first();
+			$searchPage = ElasticSearchPage::get()->filter('Identifier', $identifier)->first();
 			$cache->save(serialize($searchPage), $cachekeyname);
 		}
 		return $searchPage;

src/SilverStripe/Elastica/ReindexTask.php

Spacing +8 added lines, -8 removed lines

@@ -27,13 +27,13 @@ 
 	*/
 
 	public function run($request) {
-		$message = function ($content) {
+		$message = function($content) {
 			print(\Director::is_cli() ? "$content\n" : "<p>$content</p>");
 		};
 
 		$locales = array();
 		if(class_exists('Translatable') && singleton('SiteTree')->hasExtension('Translatable')) {
-			foreach (\Translatable::get_existing_content_languages('SiteTree') as $code => $val) {
+			foreach(\Translatable::get_existing_content_languages('SiteTree') as $code => $val) {
 				array_push($locales, $code);
 			}
 		} else {
@@ -41,11 +41,11 @@ 
 		}
 
 		// now iterate all the locales indexing each locale in turn using it's owner index settings
-		foreach ($locales as $locale) {
+		foreach($locales as $locale) {
 			Searchable::$index_ctr = 0;
-			$message('Indexing locale '.$locale);
+			$message('Indexing locale ' . $locale);
 
-			if (class_exists('Translatable')) {
+			if(class_exists('Translatable')) {
 				\Translatable::set_current_locale($locale);
 			}
 
@@ -62,10 +62,10 @@ 
 			$this->service->refresh();
 			// display indexing speed stats
 			$endTime = microtime(true);
-			$elapsed = $endTime-$startTime;
+			$elapsed = $endTime - $startTime;
 			$perSecond = Searchable::$index_ctr / $elapsed;
-			$info = "\nReindexing $locale completed \n ".Searchable::$index_ctr." docs in ".round($elapsed,2)." seconds ";
-			$info .= "at ".round($perSecond,2)." documents per second\n\n";
+			$info = "\nReindexing $locale completed \n " . Searchable::$index_ctr . " docs in " . round($elapsed, 2) . " seconds ";
+			$info .= "at " . round($perSecond, 2) . " documents per second\n\n";
 			$message($info);
 		}
 

src/SilverStripe/Elastica/SearchIndexTask.php

Spacing +9 added lines, -9 removed lines

@@ -21,17 +21,17 @@ 
 	}
 
 	public function run($request) {
-		$message = function ($content) {
+		$message = function($content) {
 			print(\Director::is_cli() ? "$content\n" : "<p>$content</p>");
 		};
 
 		$locales = array();
 
-		if ($this->locale == null) {
-			if (class_exists('Translatable') && \SiteTree::has_extension('Translatable')) {
+		if($this->locale == null) {
+			if(class_exists('Translatable') && \SiteTree::has_extension('Translatable')) {
 				$this->locale = \Translatable::get_current_locale();
 			} else {
-				foreach (\Translatable::get_existing_content_languages('SiteTree') as $code => $val) {
+				foreach(\Translatable::get_existing_content_languages('SiteTree') as $code => $val) {
 					array_push($locales, $code);
 				}
 			}
@@ -44,13 +44,13 @@ 
 		$es->setPageLength(20);
 		$es->addFilter('IsInSiteTree', true);
 		$results = $es->search($query);
-		foreach ($results as $result) {
-			$title = '['.$result->ClassName.', '.$result->ID.']  ';
+		foreach($results as $result) {
+			$title = '[' . $result->ClassName . ', ' . $result->ID . ']  ';
 			$title .= $result->Title;
 			$message($title);
-			if ($result->SearchHighlightsByField->Content) {
-				foreach ($result->SearchHighlightsByField->Content as $highlight) {
-					$message("- ".$highlight->Snippet);
+			if($result->SearchHighlightsByField->Content) {
+				foreach($result->SearchHighlightsByField->Content as $highlight) {
+					$message("- " . $highlight->Snippet);
 				}
 			}
 

tests/AutocompleteControllerTest.php

Spacing +6 added lines, -6 removed lines

@@ -21,17 +21,17 @@ 
 
 		// Delete and assert that it does not exist
 		echo "Displaying searchable fields\n";
-		$sql =  "SELECT ID,Name,ClazzName from SearchableField";
+		$sql = "SELECT ID,Name,ClazzName from SearchableField";
 		$records = DB::query($sql);
-		foreach ($records as $record) {
+		foreach($records as $record) {
 			print_r($record);
 		}
 
 		$filter = array('Name' => 'Title', 'ClazzName' => 'FlickrPhotoTO');
 		$sf = SearchableField::get()->filter($filter)->first();
 		print_r($sf);
-		$sql = "UPDATE ElasticSearchPage_ElasticaSearchableFields SET Searchable=1,".
-				"EnableAutocomplete=1 where SearchableFieldID=".$sf->ID;
+		$sql = "UPDATE ElasticSearchPage_ElasticaSearchableFields SET Searchable=1," .
+				"EnableAutocomplete=1 where SearchableFieldID=" . $sf->ID;
 		echo $sql;
 
 		DB::query($sql);
@@ -56,7 +56,7 @@ 
 
 		$this->assertEquals('the', $result->Query);
 		$lquery = strtolower($result->Query);
-		foreach ($result->suggestions as $suggestion) {
+		foreach($result->suggestions as $suggestion) {
 			$value = $suggestion->value;
 			$value = strtolower($value);
 			$this->assertContains($lquery, $value);
@@ -110,7 +110,7 @@ 
 
 		$this->assertEquals('the', $result->Query);
 		$lquery = strtolower($result->Query);
-		foreach ($result->suggestions as $suggestion) {
+		foreach($result->suggestions as $suggestion) {
 			$value = $suggestion->value;
 			$value = strtolower($value);
 			$this->assertContains($lquery, $value);

tests/ElasticSearchPageTest.php

Spacing +28 added lines, -28 removed lines

@@ -13,15 +13,15 @@ 
 
 		$fields = $searchPage->getCMSFields();
 
-		$mainTab = $this->checkTabExists($fields,'Main');
+		$mainTab = $this->checkTabExists($fields, 'Main');
 		$this->checkFieldExists($mainTab, 'Identifier');
 		$this->checkFieldExists($mainTab, 'ContentForEmptySearch');
 
-		$searchTab = $this->checkTabExists($fields,'Search.SearchFor');
-		$fieldsTab = $this->checkTabExists($fields,'Search.Fields');
-		$autoCompleteTab = $this->checkTabExists($fields,'Search.AutoComplete');
-		$aggTab = $this->checkTabExists($fields,'Search.Aggregations');
-		$simTab = $this->checkTabExists($fields,'Search.Similarity');
+		$searchTab = $this->checkTabExists($fields, 'Search.SearchFor');
+		$fieldsTab = $this->checkTabExists($fields, 'Search.Fields');
+		$autoCompleteTab = $this->checkTabExists($fields, 'Search.AutoComplete');
+		$aggTab = $this->checkTabExists($fields, 'Search.Aggregations');
+		$simTab = $this->checkTabExists($fields, 'Search.Similarity');
 
 		$this->checkFieldExists($searchTab, 'InfoField');
 		$this->checkFieldExists($searchTab, 'SiteTreeOnly');
@@ -49,7 +49,7 @@ 
 		$tab = $fields->findOrMakeTab("Root.Search.Fields");
 		$fieldsTab = $tab->Fields();
 
-		foreach ($fieldsTab as $field) {
+		foreach($fieldsTab as $field) {
 			echo "FIELD:{$field->getName()}\n";
 		}
 
@@ -58,7 +58,7 @@ 
 		$gridDetailForm = $pickerConfig->getComponentByType('GridFieldDetailForm');
 
 		echo "SEARCHABLE FIELDS\n";
-		foreach ($searchPage->ElasticaSearchableFields()->getIterator() as $sf) {
+		foreach($searchPage->ElasticaSearchableFields()->getIterator() as $sf) {
 			echo "SEARCHABLE FIELD {$sf->ClazzName},{$sf->Name}!\n";
 
 		}
@@ -185,7 +185,7 @@ 
 		$pageLength = 10; // the default
 		$searchPageObj->ResultsPerPage = $pageLength;
 		$searchPageObj->write();
-		$searchPageObj->publish('Stage','Live');
+		$searchPageObj->publish('Stage', 'Live');
 
 		$form = $searchPageObj->SearchForm();
 		$fields = $form->Fields();
@@ -317,11 +317,11 @@ 
 		$filter = array('ClazzName' => 'FlickrPhotoTO', 'Name' => 'Title');
 
 		//Check fieldnames as expected
-		$searchableFields = $searchPage->ElasticaSearchableFields()->filter('Active',1);
+		$searchableFields = $searchPage->ElasticaSearchableFields()->filter('Active', 1);
 		$sfs = $searchableFields->map('Name')->toArray();
 		sort($sfs);
-		$expected = array('Aperture','AspectRatio','Description','FirstViewed','FlickrID',
-			'FlickrSetTOs','FlickrTagTOs','FocalLength35mm','ISO','Photographer','ShutterSpeed',
+		$expected = array('Aperture', 'AspectRatio', 'Description', 'FirstViewed', 'FlickrID',
+			'FlickrSetTOs', 'FlickrTagTOs', 'FocalLength35mm', 'ISO', 'Photographer', 'ShutterSpeed',
 			'TakenAt', 'TakenAtDT', 'TestMethod', 'TestMethodHTML', 'Title');
 		$this->assertEquals($expected, $sfs);
 
@@ -331,7 +331,7 @@ 
 		$searchPage->Title = '**** SiteTree Search ****';
 		$searchPage->write();
 
-		$searchableFields = $searchPage->ElasticaSearchableFields()->filter('Active',1);
+		$searchableFields = $searchPage->ElasticaSearchableFields()->filter('Active', 1);
 		$sfs = $searchableFields->map('Name')->toArray();
 		sort($sfs);
 		$expected = array('Content', 'Country', 'PageDate', 'Title');
@@ -351,15 +351,15 @@ 
 		// expected mapping of searchable classes to searchable fields that will be
 		// stored in the database as SearchableClass and SearchableField
 		$expected = array(
-			'Page' => array('Title','Content'),
-			'SiteTree' => array('Title','Content'),
-			'SearchableTestPage' => array('Title','Content','Country','PageDate'),
+			'Page' => array('Title', 'Content'),
+			'SiteTree' => array('Title', 'Content'),
+			'SearchableTestPage' => array('Title', 'Content', 'Country', 'PageDate'),
 			'FlickrTagTO' => array('RawValue'),
-			'FlickrAuthorTO' => array('PathAlias','DisplayName','FlickrPhotoTOs'),
-			'FlickrPhotoTO' => array('Title','FlickrID','Description','TakenAt', 'TakenAtDT', 'Aperture',
-				'ShutterSpeed','FocalLength35mm','ISO','Photographer','FlickrTagTOs','FlickrSetTOs',
-				'FirstViewed','AspectRatio', 'TestMethod', 'TestMethodHTML'),
-			'FlickrSetTO' => array('Title','FlickrID','Description')
+			'FlickrAuthorTO' => array('PathAlias', 'DisplayName', 'FlickrPhotoTOs'),
+			'FlickrPhotoTO' => array('Title', 'FlickrID', 'Description', 'TakenAt', 'TakenAtDT', 'Aperture',
+				'ShutterSpeed', 'FocalLength35mm', 'ISO', 'Photographer', 'FlickrTagTOs', 'FlickrSetTOs',
+				'FirstViewed', 'AspectRatio', 'TestMethod', 'TestMethodHTML'),
+			'FlickrSetTO' => array('Title', 'FlickrID', 'Description')
 		);
 
 		// check the expected classes
@@ -380,21 +380,21 @@ 
 		// check the names expected to appear
 
 		$fieldCtr = 0;
-		foreach ($expectedClasses as $expectedClass) {
+		foreach($expectedClasses as $expectedClass) {
 			$expectedFields = array();
 			$sc = SearchableClass::get()->filter('Name', $expectedClass)->first();
-			$this->assertEquals($expectedClass,$sc->Name);
+			$this->assertEquals($expectedClass, $sc->Name);
 
 			$inSiteTree = 1;
-			$start = substr($expectedClass, 0,6);
-			if ($start == 'Flickr') {
+			$start = substr($expectedClass, 0, 6);
+			if($start == 'Flickr') {
 				$inSiteTree = 0;
 			};
-			$this->assertEquals($inSiteTree,$sc->InSiteTree);
+			$this->assertEquals($inSiteTree, $sc->InSiteTree);
 
 			$expectedNames = $expected[$expectedClass];
-			foreach ($expectedNames as $expectedName) {
-				$filter = array('Name' => $expectedName, 'SearchableClassID' => $sc->ID );
+			foreach($expectedNames as $expectedName) {
+				$filter = array('Name' => $expectedName, 'SearchableClassID' => $sc->ID);
 				$sf = SearchableField::get()->filter($filter)->first();
 				$this->assertEquals($expectedName, $sf->Name);
 				$fieldCtr++;

tests/InheritanceTest.php

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 		$expected = array('first');
 		$this->assertEquals($expected, array_keys($terms['Title.standard']['terms']));
 
-		$expected = array('fi','fir','firs','first','ir','irs','irst','rs','rst','st');
+		$expected = array('fi', 'fir', 'firs', 'first', 'ir', 'irs', 'irst', 'rs', 'rst', 'st');
 		$this->assertEquals($expected, array_keys($terms['Title.autocomplete']['terms']));
 
 		// ---- now a parental class page ----
@@ -60,20 +60,20 @@ 
 		$terms = $page->getTermVectors();
 
 		//Check the expected fields are indexed
-		$expected = array('Content','Content.shingles','Content.standard','FatherText','FatherText.shingles','FatherText.standard',
-			'GrandFatherText','GrandFatherText.shingles','GrandFatherText.standard','Link','Title','Title.autocomplete',
-			'Title.shingles','Title.standard');
+		$expected = array('Content', 'Content.shingles', 'Content.standard', 'FatherText', 'FatherText.shingles', 'FatherText.standard',
+			'GrandFatherText', 'GrandFatherText.shingles', 'GrandFatherText.standard', 'Link', 'Title', 'Title.autocomplete',
+			'Title.shingles', 'Title.standard');
 		$indexedFields = array_keys($terms);
 		sort($indexedFields);
-		foreach ($indexedFields as $field) {
-			echo "'".$field."',";
+		foreach($indexedFields as $field) {
+			echo "'" . $field . "',";
 		}
 		$this->assertEquals($expected, $indexedFields);
 
 		$fatherTerms = $terms['FatherText.standard']['terms'];
 		$grandFatherTerms = $terms['GrandFatherText.standard']['terms'];
 
-		$expected = array('father', 'field', 'grandfather', 'page', 'trace3');;
+		$expected = array('father', 'field', 'grandfather', 'page', 'trace3'); ;
 		$this->assertEquals($expected, array_keys($fatherTerms));
 
 		$expected = array('grandfather', 'page', 'trace4');

tests/SearchableFieldTest.php

Spacing +7 added lines, -7 removed lines

@@ -15,7 +15,7 @@ 
 
 		$fields = $sf->getCMSFields();
 
-		$tab = $this->checkTabExists($fields,'Main');
+		$tab = $this->checkTabExists($fields, 'Main');
 
 		//Check fields
 		$nf = $this->checkFieldExists($tab, 'Name');
@@ -33,8 +33,8 @@ 
 		$extraFields = array('Searchable' => 1, 'SimilarSearchable' => 1, 'Active' => 1,
 			'Weight' => 0);
 		$esfs = $searchPage->ElasticaSearchableFields();
-		foreach ($esfs as $sf) {
-			if ($sf->Name == 'Title' || $sf->Name == 'Description') {
+		foreach($esfs as $sf) {
+			if($sf->Name == 'Title' || $sf->Name == 'Description') {
 				$esfs->remove($sf);
 				$esfs->add($sf, $extraFields);
 			}
@@ -45,7 +45,7 @@ 
 			$this->fail('Searchable fail should have failed to write');
 		} catch (ValidationException $e) {
 			$this->assertInstanceOf('ValidationException', $e);
-			$expected = 'The field SearchableTestPage.Title has a zero weight. ; The field '.
+			$expected = 'The field SearchableTestPage.Title has a zero weight. ; The field ' .
 			'SiteTree.Title has a zero weight. ; The field Page.Title has a zero weight. ';
 			$this->assertEquals($expected, $e->getMessage());
 		}
@@ -64,8 +64,8 @@ 
 		$extraFields = array('Searchable' => 1, 'SimilarSearchable' => 1, 'Active' => 1,
 			'Weight' => -1);
 		$esfs = $searchPage->ElasticaSearchableFields();
-		foreach ($esfs as $sf) {
-			if ($sf->Name == 'Title' || $sf->Name == 'Description') {
+		foreach($esfs as $sf) {
+			if($sf->Name == 'Title' || $sf->Name == 'Description') {
 				$esfs->remove($sf);
 				$esfs->add($sf, $extraFields);
 			}
@@ -76,7 +76,7 @@ 
 			$this->fail('Searchable fail should have failed to write');
 		} catch (ValidationException $e) {
 			$this->assertInstanceOf('ValidationException', $e);
-			$expected = 'The field SearchableTestPage.Title has a negative weight. ; The field '.
+			$expected = 'The field SearchableTestPage.Title has a negative weight. ; The field ' .
 			'SiteTree.Title has a negative weight. ; The field Page.Title has a negative weight. ';
 			$this->assertEquals($expected, $e->getMessage());
 		}

searchpage/ElasticSearchPage.php

Indentation +20 added lines, -20 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) {

Spacing +42 added lines, -42 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);
 		}

searchpage/ElasticSearchPage_Controller.php

Indentation +7 added lines, -7 removed lines

@@ -10,7 +10,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");
 	}
 
 
@@ -84,9 +84,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);
 
@@ -226,9 +226,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 +33 added lines, -33 removed lines

@@ -2,7 +2,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();
@@ -56,7 +56,7 @@ 
 
 
 		// filter by class or site tree
-		if ($ep->SiteTreeOnly) {
+		if($ep->SiteTreeOnly) {
 			T7; //FIXME test missing
 			$es->addFilter('IsInSiteTree', true);
 		} else {
@@ -72,23 +72,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);
 
@@ -102,10 +102,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);
@@ -132,14 +132,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;
@@ -179,23 +179,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);
@@ -204,7 +204,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 {
@@ -219,14 +219,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');
 	        }
 
@@ -235,11 +235,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);
 
@@ -247,7 +247,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;
@@ -264,7 +264,7 @@ 
 		$data['OriginalQuery'] = $queryText;
 		$data['IgnoreSuggestions'] = $ignoreSuggestions;
 
-		if ($this->has_extension('PageControllerTemplateOverrideExtension')) {
+		if($this->has_extension('PageControllerTemplateOverrideExtension')) {
 			return $this->useTemplateOverride($data);
 		} else {
 			return $data;
@@ -278,9 +278,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;
 			}
 		}
@@ -297,7 +297,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);
 	}
 
@@ -314,8 +314,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']);
 			}
 
@@ -324,7 +324,7 @@ 
 		if($this->action == 'similar') {
 			$queryField->setDisabled(true);
 			$actions = $form->Actions();
-			foreach ($actions as $field) {
+			foreach($actions as $field) {
 				$field->setDisabled(true);
 			}
 		}
@@ -332,12 +332,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);
 		}