gordonbanderson / silverstripe-elastica

tests/models/SearchableTestPage.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * @subpackage tests
  */
 class SearchableTestPage extends Page implements TestOnly {
-	private static $searchable_fields = array('Country','PageDate');
+	private static $searchable_fields = array('Country', 'PageDate');
 
 	private static $db = array(
 		'Country' => 'Varchar',

tests/models/FlickrPhotoElasticaSearchHelper.php

Indentation +6 added lines, -6 removed lines

@@ -10,11 +10,11 @@ 
 
 	public function __construct() {
 		$aspectAgg = new RangedAggregation('Aspect', 'AspectRatio');
-        $aspectAgg->addRange(0.0000001, 0.3, 'Panoramic');
-        $aspectAgg->addRange(0.3, 0.9, 'Horizontal');
-        $aspectAgg->addRange(0.9, 1.2, 'Square');
-        $aspectAgg->addRange(1.2, 1.79, 'Vertical');
-        $aspectAgg->addRange(1.79, 1e7, 'Tallest');
+		$aspectAgg->addRange(0.0000001, 0.3, 'Panoramic');
+		$aspectAgg->addRange(0.3, 0.9, 'Horizontal');
+		$aspectAgg->addRange(0.9, 1.2, 'Square');
+		$aspectAgg->addRange(1.2, 1.79, 'Vertical');
+		$aspectAgg->addRange(1.79, 1e7, 'Tallest');
 	}
 
 	private static $titleFieldMapping = array(
@@ -73,7 +73,7 @@ 
 
 
 		$aspectRangedAgg = RangedAggregation::getByTitle('Aspect');
-        $query->addAggregation($aspectRangedAgg->getRangeAgg());
+		$query->addAggregation($aspectRangedAgg->getRangeAgg());
 
 		// leave this out for the moment as way too many terms being returned slowing things down
 		/*

Spacing +10 added lines, -10 removed lines

@@ -6,7 +6,7 @@ 
 use SilverStripe\Elastica\RangedAggregation;
 
 
-class FlickrPhotoTOElasticaSearchHelper implements ElasticaSearchHelperInterface,TestOnly {
+class FlickrPhotoTOElasticaSearchHelper implements ElasticaSearchHelperInterface, TestOnly {
 
 	public function __construct() {
 		$aspectAgg = new RangedAggregation('Aspect', 'AspectRatio');
@@ -36,7 +36,7 @@ 
 			'query_string' => array('query' => '*')
 		);
 
-		if ($query->OriginalQueryText == '') {
+		if($query->OriginalQueryText == '') {
 			$query->setSort(array('TakenAt'=> 'desc'));
 		}
 
@@ -104,27 +104,27 @@ 
 		// shutter speed is stored as decimal to 6 decimal places, then a
 		// vertical bar followed by the displayed speed as a fraction or a
 		// whole number.  This puts the decimal back for matching purposes
-		if (isset($filters['ShutterSpeed'])) {
+		if(isset($filters['ShutterSpeed'])) {
 
 			$sortable = $filters['ShutterSpeed'];
 
 			echo "SORTABLE:$sortable\n";
 
 			$sortable = explode('/', $sortable);
-			if (sizeof($sortable) == 1) {
+			if(sizeof($sortable) == 1) {
 				$sortable = trim($sortable[0]);
 
-				if ($sortable === '1') {
+				if($sortable === '1') {
 					$sortable = '1.000000|1';
 				}
 
-			} else if (sizeof($sortable) == 2) {
-				if ($sortable[0] === '' || $sortable[1] === '') {
+			} else if(sizeof($sortable) == 2) {
+				if($sortable[0] === '' || $sortable[1] === '') {
 					$sortable = '';
 
 				} else {
-					$sortable = floatval($sortable[0])/intval($sortable[1]);
-					$sortable = round($sortable,6);
+					$sortable = floatval($sortable[0]) / intval($sortable[1]);
+					$sortable = round($sortable, 6);
 					$sortable = $sortable . '|' . $filters['ShutterSpeed'];
 				}
 
@@ -147,7 +147,7 @@ 
 		// the shutter speeds are of the form decimal number | fraction, keep the latter half
 		$shutterSpeeds = $aggs['ShutterSpeed']['buckets'];
 		$ctr = 0;
-		foreach ($shutterSpeeds as $bucket) {
+		foreach($shutterSpeeds as $bucket) {
 			$key = $bucket['key'];
 			$splits = explode('|', $key);
 			$shutterSpeeds[$ctr]['key'] = end($splits);

tests/ElasticSearchPageControllerTest.php

Indentation +19 added lines, -19 removed lines

@@ -115,10 +115,10 @@ 
 		$this->assertEquals(200, $searchPage->getStatusCode());
 		$url = rtrim($url,'/');
 
-        $response = $this->get($url);
-        $this->assertEquals(200, $response->getStatusCode());
+		$response = $this->get($url);
+		$this->assertEquals(200, $response->getStatusCode());
 
-        $this->assertSelectorStartsWithOrEquals('span.count', 0, '(5)');
+		$this->assertSelectorStartsWithOrEquals('span.count', 0, '(5)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 1, '(11)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 2, '(12)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 3, '(13)');
@@ -168,10 +168,10 @@ 
 		$url = rtrim($url,'/');
 		$url .= '?ISO=400';
 
-        $response = $this->get($url);
-        $this->assertEquals(200, $response->getStatusCode());
+		$response = $this->get($url);
+		$this->assertEquals(200, $response->getStatusCode());
 
-        // These are less than in the no facets selected case, as expected
+		// These are less than in the no facets selected case, as expected
 		$this->assertSelectorStartsWithOrEquals('span.count', 0, '(2)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 1, '(1)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 2, '(2)');
@@ -215,12 +215,12 @@ 
 		$url = rtrim($url,'/');
 		$url .= '?ISO=400&ShutterSpeed=2%2F250';
 
-        $response = $this->get($url);
+		$response = $this->get($url);
 		print_r($response);
-        $this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(200, $response->getStatusCode());
 
-        // These are less than in the one facet selected case, as expected
-        $this->assertSelectorStartsWithOrEquals('span.count', 0, '(1)');
+		// These are less than in the one facet selected case, as expected
+		$this->assertSelectorStartsWithOrEquals('span.count', 0, '(1)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 1, '(2)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 2, '(1)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 3, '(1)');
@@ -249,12 +249,12 @@ 
 		$url = rtrim($url,'/');
 		$url .= '?ISO=400&ShutterSpeed=2%2F250&Aspect=Vertical';
 
-        $response = $this->get($url);
+		$response = $this->get($url);
 		print_r($response);
-        $this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(200, $response->getStatusCode());
 
-        // These are less than in the one facet selected case, as expected
-        $this->assertSelectorStartsWithOrEquals('span.count', 0, '(2)');
+		// These are less than in the one facet selected case, as expected
+		$this->assertSelectorStartsWithOrEquals('span.count', 0, '(2)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 1, '(1)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 2, '(1)');
 	}
@@ -602,13 +602,13 @@ 
 		$searchPage = $this->get($searchPageObj->URLSegment);
 		$this->assertEquals(200, $searchPage->getStatusCode());
 
-        $response = $this->submitForm("ElasticSearchForm_SearchForm", null, array(
-            'q' => 'New Zealand'
-        ));
+		$response = $this->submitForm("ElasticSearchForm_SearchForm", null, array(
+			'q' => 'New Zealand'
+		));
 
 		$url = rtrim($url,'/');
-        $this->assertEquals(302, $response->getStatusCode());
-        $this->assertEquals($url.'?q=New Zealand&sfid=testwithagg', $response->getHeader('Location'));
+		$this->assertEquals(302, $response->getStatusCode());
+		$this->assertEquals($url.'?q=New Zealand&sfid=testwithagg', $response->getHeader('Location'));
 	}
 
 

Spacing +26 added lines, -26 removed lines

@@ -40,18 +40,18 @@ 
 		$extraFields = array('Searchable' => 1, 'SimilarSearchable' => 1, 'Active' => 1,
 			'Weight' => 1);
 		$esfs2 = $esp2->ElasticaSearchableFields();
-		foreach ($esfs2 as $sf) {
-			if ($sf->Name == 'Title' || $sf->Name == 'Description') {
+		foreach($esfs2 as $sf) {
+			if($sf->Name == 'Title' || $sf->Name == 'Description') {
 				$esfs2->remove($sf);
 				$esfs2->add($sf, $extraFields);
 			}
 		}
 		$esp2->write();
 
-		$esfs= $esp->ElasticaSearchableFields();
+		$esfs = $esp->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);
 			}
@@ -80,10 +80,10 @@ 
 		$esp->ElasticaSearchableFields()->add($espf2);
 		$esp2->ElasticaSearchableFields()->add($espf2);
 */
-		$esp->publish('Stage','Live');
-		$esp2->publish('Stage','Live');
+		$esp->publish('Stage', 'Live');
+		$esp2->publish('Stage', 'Live');
 		$this->ElasticSearchPage = $esp;
-		$this->ElasticSearchPage2= $esp2;
+		$this->ElasticSearchPage2 = $esp2;
 
 
 		echo "CHECK MYSQL";
@@ -113,7 +113,7 @@ 
 		$url = $searchPageObj->Link();
 		$searchPage = $this->get($searchPageObj->URLSegment);
 		$this->assertEquals(200, $searchPage->getStatusCode());
-		$url = rtrim($url,'/');
+		$url = rtrim($url, '/');
 
         $response = $this->get($url);
         $this->assertEquals(200, $response->getStatusCode());
@@ -165,7 +165,7 @@ 
 		$url = $searchPageObj->Link();
 		$searchPage = $this->get($searchPageObj->URLSegment);
 		$this->assertEquals(200, $searchPage->getStatusCode());
-		$url = rtrim($url,'/');
+		$url = rtrim($url, '/');
 		$url .= '?ISO=400';
 
         $response = $this->get($url);
@@ -212,7 +212,7 @@ 
 		$url = $searchPageObj->Link();
 		$searchPage = $this->get($searchPageObj->URLSegment);
 		$this->assertEquals(200, $searchPage->getStatusCode());
-		$url = rtrim($url,'/');
+		$url = rtrim($url, '/');
 		$url .= '?ISO=400&ShutterSpeed=2%2F250';
 
         $response = $this->get($url);
@@ -246,7 +246,7 @@ 
 		$url = $searchPageObj->Link();
 		$searchPage = $this->get($searchPageObj->URLSegment);
 		$this->assertEquals(200, $searchPage->getStatusCode());
-		$url = rtrim($url,'/');
+		$url = rtrim($url, '/');
 		$url .= '?ISO=400&ShutterSpeed=2%2F250&Aspect=Vertical';
 
         $response = $this->get($url);
@@ -290,9 +290,9 @@ 
 	public function testQueryInSearchBoxForOneFormOnly() {
 		$searchPageObj = $this->ElasticSearchPage2;
 		$url = rtrim($searchPageObj->Link(), '/');
-		$url .= "?q=Auckland&sfid=".$searchPageObj->Identifier;
+		$url .= "?q=Auckland&sfid=" . $searchPageObj->Identifier;
 
-		echo "URL:".$url;
+		echo "URL:" . $url;
 		$response = $this->get($url);
 
 		print_r($response);
@@ -319,7 +319,7 @@ 
 		$pageLength = 10; // the default
 		$searchPageObj->ResultsPerPage = $pageLength;
 		$searchPageObj->write();
-		$searchPageObj->publish('Stage','Live');
+		$searchPageObj->publish('Stage', 'Live');
 
 		$url = rtrim($searchPageObj->Link(), '/');
 		$response = $this->get($url);
@@ -558,7 +558,7 @@ 
 		//Note pages need to be published, by default fixtures only reside in Stage
 		$searchPageObj = $this->ElasticSearchPage2;
 		$url = rtrim($searchPageObj->Link(), '/');
-		$url = $url.'?q='.$searchTerm;
+		$url = $url . '?q=' . $searchTerm;
 		echo "URL:$url\n";
 		$response = $this->get($url);
 		$this->assertEquals(200, $response->getStatusCode());
@@ -606,9 +606,9 @@ 
             'q' => 'New Zealand'
         ));
 
-		$url = rtrim($url,'/');
+		$url = rtrim($url, '/');
         $this->assertEquals(302, $response->getStatusCode());
-        $this->assertEquals($url.'?q=New Zealand&sfid=testwithagg', $response->getHeader('Location'));
+        $this->assertEquals($url . '?q=New Zealand&sfid=testwithagg', $response->getHeader('Location'));
 	}
 
 
@@ -628,7 +628,7 @@ 
 		//Note pages need to be published, by default fixtures only reside in Stage
 		$searchPageObj = $this->ElasticSearchPage;
 		$url = rtrim($searchPageObj->Link(), '/');
-		$url = $url.'?q='.$searchTerm;
+		$url = $url . '?q=' . $searchTerm;
 		echo "URL:$url\n";
 		$response = $this->get($url);
 		$this->assertEquals(200, $response->getStatusCode());
@@ -673,13 +673,13 @@ 
 		$searchPageObj = $this->ElasticSearchPage;
 		$searchPageObj->SiteTreeOnly = true;
 		$searchPageObj->write();
-		$searchPageObj->publish('Stage','Live');
+		$searchPageObj->publish('Stage', 'Live');
 
 
 		$pageLength = 10; // the default
 		$searchPageObj->ResultsPerPage = $pageLength;
 		$url = rtrim($searchPageObj->Link(), '/');
-		$url = $url.'?q='.$searchTerm;
+		$url = $url . '?q=' . $searchTerm;
 		$firstPageURL = $url;
 		$response = $this->get($url);
 		$this->assertEquals(200, $response->getStatusCode());
@@ -714,7 +714,7 @@ 
 		$pageLength = 10; // the default
 		$searchPageObj->ResultsPerPage = $pageLength;
 		$url = rtrim($searchPageObj->Link(), '/');
-		$url = $url.'?q='.$searchTerm;
+		$url = $url . '?q=' . $searchTerm;
 		$firstPageURL = $url;
 		$response = $this->get($url);
 		$this->assertEquals(200, $response->getStatusCode());
@@ -739,7 +739,7 @@ 
 
 		$resultsP1 = $this->collateSearchResults();
 
-		$page2url = $url . '&start='.$pageLength;
+		$page2url = $url . '&start=' . $pageLength;
 
 		//Check pagination on page 2
 		$response2 = $this->get($page2url);
@@ -766,19 +766,19 @@ 
 		//increase the number of results and assert that they are the same as per pages 1,2 joined
 		$searchPageObj->ResultsPerPage = 20;
 		$searchPageObj->write();
-		$searchPageObj->publish('Stage','Live');
+		$searchPageObj->publish('Stage', 'Live');
 		$response3 = $this->get($firstPageURL);
 	}
 
 
 	private function enableHighlights() {
-		foreach (SearchableField::get()->filter('Name', 'Title') as $sf) {
+		foreach(SearchableField::get()->filter('Name', 'Title') as $sf) {
 			echo "Highlighting {$sf->ClazzName} {$sf->Name}\n";
 			$sf->ShowHighlights = true;
 			$sf->write();
 		}
 
-		foreach (SearchableField::get()->filter('Name', 'Content') as $sf) {
+		foreach(SearchableField::get()->filter('Name', 'Content') as $sf) {
 			echo "Highlighting {$sf->ClazzName} {$sf->Name}\n";
 
 			$sf->ShowHighlights = true;

tests/TermVectorTest.php

Spacing +2 added lines, -2 removed lines

@@ -17,8 +17,8 @@
 		sort($terms);
 		$expected = array('Description', 'Description.shingles', 'Description.standard',
 			'ShutterSpeed',
-			'TestMethod','TestMethod.shingles','TestMethod.standard',
-			'TestMethodHTML','TestMethodHTML.shingles','TestMethodHTML.standard',
+			'TestMethod', 'TestMethod.shingles', 'TestMethod.standard',
+			'TestMethodHTML', 'TestMethodHTML.shingles', 'TestMethodHTML.standard',
 			'Title', 'Title.autocomplete', 'Title.shingles', 'Title.standard');
 		$this->assertEquals($expected, $terms);
 

tests/ElasticaServiceTest.php

Spacing +11 added lines, -11 removed lines

@@ -27,7 +27,7 @@ 
 			$this->invokeMethod($this->service, 'createIndex', array());
 			$this->assertFalse(true, "Creation of index with unknown locale should have failed");
 		} catch (Exception $e) {
-			$this->assertTrue(true,"Creation of index with unknown locale failed as expected");
+			$this->assertTrue(true, "Creation of index with unknown locale failed as expected");
 		}
 
 
@@ -116,7 +116,7 @@ 
 		$fp->write();
 		$this->service->getIndex()->refresh();
 
-		$this->checkNumberOfIndexedDocuments($nDocsAtStart-1);
+		$this->checkNumberOfIndexedDocuments($nDocsAtStart - 1);
 
 		$fp->ShowInSearch = true;
 		$fp->write();
@@ -134,7 +134,7 @@ 
 		$fp->doUnpublish();
 
 		$this->service->getIndex()->refresh();
-		$this->checkNumberOfIndexedDocuments($nDocsAtStart-1);
+		$this->checkNumberOfIndexedDocuments($nDocsAtStart - 1);
 	}
 
 
@@ -146,7 +146,7 @@ 
 		$fp->delete();
 
 		$this->service->getIndex()->refresh();
-		$this->checkNumberOfIndexedDocuments($nDocsAtStart-1);
+		$this->checkNumberOfIndexedDocuments($nDocsAtStart - 1);
 	}
 
 
@@ -158,7 +158,7 @@ 
 		$fp->delete();
 
 		$this->service->getIndex()->refresh();
-		$this->checkNumberOfIndexedDocuments($nDocsAtStart-1);
+		$this->checkNumberOfIndexedDocuments($nDocsAtStart - 1);
 	}
 
 
@@ -177,7 +177,7 @@ 
 		//Check that the number of indexing requests has increased by 2
 		$deltaReqs = $this->service->getIndexingRequestCtr() - $reqs;
 		//One call is made for each of Page and FlickrPhotoTO
-		$this->assertEquals(2,$deltaReqs);
+		$this->assertEquals(2, $deltaReqs);
 
 		// default installed pages plus 100 FlickrPhotoTOs
 		$this->checkNumberOfIndexedDocuments(103);
@@ -195,21 +195,21 @@ 
 		$fp = new FlickrPhotoTO();
 		$fp->Title = 'The cat sits on the mat';
 		$fp->write();
-		$this->checkNumberOfIndexedDocuments($nDocsAtStart+1);
+		$this->checkNumberOfIndexedDocuments($nDocsAtStart + 1);
 
 		$fp2 = new FlickrPhotoTO();
 		$fp2->Title = 'The cat sat on the hat';
 		$fp2->write();
-		$this->checkNumberOfIndexedDocuments($nDocsAtStart+2);
+		$this->checkNumberOfIndexedDocuments($nDocsAtStart + 2);
 
 		$fp3 = new FlickrPhotoTO();
 		$fp3->Title = 'The bat flew around the cat';
 		$fp3->write();
-		$this->checkNumberOfIndexedDocuments($nDocsAtStart+3);
+		$this->checkNumberOfIndexedDocuments($nDocsAtStart + 3);
 
 		//Check that the number of indexing requests has increased by 3
 		$deltaReqs = $this->service->getIndexingRequestCtr() - $reqs;
-		$this->assertEquals(3,$deltaReqs);
+		$this->assertEquals(3, $deltaReqs);
 	}
 
 
@@ -283,6 +283,6 @@ 
 	public function testListIndexes() {
 		$message = 'This is a test trace';
 		$trace = $this->service->listIndexes($message);
-		$this->assertContains('elastica_ss_module_test_en_us', print_r($trace,1));
+		$this->assertContains('elastica_ss_module_test_en_us', print_r($trace, 1));
 	}
 }

tests/FindElasticaSearchPageExtensionTest.php

Spacing +5 added lines, -5 removed lines

@@ -25,11 +25,11 @@ 
 		// don't check the server name as this will differ, just check the path is /search/
 		$uri = $searchPage->SearchPageURI('testsearchpage');
 		$splits = explode('/', $uri);
-		$this->assertEquals($splits[3],'search');
+		$this->assertEquals($splits[3], 'search');
 
 		// check the form
 		$form = $searchPage->SearchPageForm('testsearchpage');
-		$this->assertInstanceOf('ElasticSearchForm',$form);
+		$this->assertInstanceOf('ElasticSearchForm', $form);
 
 		$fields = $form->Fields();
 		$actions = $form->Actions();
@@ -45,7 +45,7 @@ 
 	public function testButtonOverride() {
 		$searchPage = $this->objFromFixture('ElasticSearchPage', 'search');
 		$buttonText = 'Search Me!';
-		$form = $searchPage->SearchPageForm('testsearchpage',$buttonText);
+		$form = $searchPage->SearchPageForm('testsearchpage', $buttonText);
 		$actions = $form->Actions();
 		$this->assertEquals($buttonText, $actions->FieldByName('action_submit')->Title());
 	}
@@ -86,12 +86,12 @@ 
 		$esp = new ElasticSearchPage();
 		// ensure default identifier
 		$esp->Identifier = $searchPage->Identifier;
-		$esp->Title='This should not be saved';
+		$esp->Title = 'This should not be saved';
 		try {
 			$esp->write();
 			$this->assertFalse(true, 'Duplicate identifier was incorrectly saved');
 		} catch (Exception $e) {
-			$this->assertTrue(true,'The page could not be saved as expected, due to duplicate '.
+			$this->assertTrue(true, 'The page could not be saved as expected, due to duplicate ' .
 								'identifier');
 		}
 	}

src/SilverStripe/Elastica/ElasticaSearcher.php

Indentation +4 added lines, -4 removed lines

@@ -434,11 +434,11 @@ 
 
 
 
-        $query = new Query();
-        $query->setParams(array('query' => array('more_like_this' => $mlt)));
+		$query = new Query();
+		$query->setParams(array('query' => array('more_like_this' => $mlt)));
 
 
-        $elasticService = \Injector::inst()->create('SilverStripe\Elastica\ElasticaService');
+		$elasticService = \Injector::inst()->create('SilverStripe\Elastica\ElasticaService');
 		$elasticService->setLocale($this->locale);
 		if ($testMode) {
 			$elasticService->setTestMode(true);
@@ -450,7 +450,7 @@ 
 		$query->setFrom($this->start);
 
 		$resultList = new ResultList($elasticService, $query, null);
-        // at this point ResultList object, not yet executed search query
+		// at this point ResultList object, not yet executed search query
 		$paginated = new \PaginatedList(
 			$resultList
 		);

Doc Comments +14 added lines, -3 removed lines

@@ -230,6 +230,10 @@ 
 	/*
 	Set the highlight fields for subsequent searches
 	 */
+
+	/**
+	 * @param string[] $newHighlightedFields
+	 */
 	public function setHighlightedFields($newHighlightedFields) {
 		$this->highlightedFields = $newHighlightedFields;
 	}
@@ -242,7 +246,7 @@ 
 	 * @param  string $queryText query string, e.g. 'New Zealand'
 	 * @param array $fieldsToSearch Mapping of name to an array of mapping Weight and Elastic mapping,
 	 *                              e.g. array('Title' => array('Weight' => 2, 'Type' => 'string'))
-	 * @return ArrayList    SilverStripe DataObjects returned from the search against ElasticSearch
+	 * @return \PaginatedList    SilverStripe DataObjects returned from the search against ElasticSearch
 	 */
 	public function search($queryText, $fieldsToSearch = null,  $testMode = false) {
 		if ($this->locale == null) {
@@ -307,6 +311,10 @@ 
 
 
 	/* Perform an autocomplete search */
+
+	/**
+	 * @param string $queryText
+	 */
 	public function autocomplete_search($queryText, $field) {
 		if ($this->locale == null) {
 			if (class_exists('Translatable') && \SiteTree::has_extension('Translatable')) {
@@ -358,11 +366,11 @@ 
 
 	/**
 	 * Perform a 'More Like This' search, aka relevance feedback, using the provided indexed DataObject
-	 * @param  DataObject $indexedItem A DataObject that has been indexed in Elasticsearch
+	 * @param  \DataObject|null $indexedItem A DataObject that has been indexed in Elasticsearch
 	 * @param  array $fieldsToSearch  array of fieldnames to search, mapped to weighting
 	 * @param  $$testMode Use all shards, not just one, for consistent results during unit testing. See
 	 *         https://www.elastic.co/guide/en/elasticsearch/guide/current/relevance-is-broken.html#relevance-is-broken
-	 * @return resultList  List of results
+	 * @return \PaginatedList  List of results
 	 */
 	public function moreLikeThis($indexedItem, $fieldsToSearch, $testMode = false) {
 		echo "INDEXED ITEM:".$indexedItem;
@@ -469,6 +477,9 @@ 
 		return $result;
 	}
 
+	/**
+	 * @return string
+	 */
 	public function getSuggestedQuery() {
 		return $this->SuggestedQuery;
 	}

Spacing +22 added lines, -22 removed lines

@@ -244,9 +244,9 @@ 
 	 *                              e.g. array('Title' => array('Weight' => 2, 'Type' => 'string'))
 	 * @return ArrayList    SilverStripe DataObjects returned from the search against ElasticSearch
 	 */
-	public function search($queryText, $fieldsToSearch = null,  $testMode = false) {
-		if ($this->locale == null) {
-			if (class_exists('Translatable') && \SiteTree::has_extension('Translatable')) {
+	public function search($queryText, $fieldsToSearch = null, $testMode = false) {
+		if($this->locale == null) {
+			if(class_exists('Translatable') && \SiteTree::has_extension('Translatable')) {
 				$this->locale = \Translatable::get_current_locale();
 			} else {
 				// if no translatable we only have the default locale
@@ -273,7 +273,7 @@ 
 		$elasticService = \Injector::inst()->create('SilverStripe\Elastica\ElasticaService');
 		$elasticService->setLocale($this->locale);
 		$elasticService->setHighlightedFields($this->highlightedFields);
-		if ($testMode) {
+		if($testMode) {
 			$elasticService->setTestMode(true);
 		}
 		$resultList = new ResultList($elasticService, $query, $queryText, $this->filters);
@@ -298,7 +298,7 @@ 
 
 		$this->aggregations = $resultList->getAggregations();
 
-		if ($resultList->SuggestedQuery) {
+		if($resultList->SuggestedQuery) {
 			$this->SuggestedQuery = $resultList->SuggestedQuery;
 			$this->SuggestedQueryHighlighted = $resultList->SuggestedQueryHighlighted;
 		}
@@ -308,8 +308,8 @@ 
 
 	/* Perform an autocomplete search */
 	public function autocomplete_search($queryText, $field) {
-		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 {
 				// if no translatable we only have the default locale
@@ -324,11 +324,11 @@ 
 		echo "FIELD\n";
 		print_r($field);
 		$qg->setFields(array($field => 1));
-		if ($this->classes) {
+		if($this->classes) {
 			$qg->setClasses($this->classes);
 		}
 
-		if (!empty($this->filters)) {
+		if(!empty($this->filters)) {
 			$qg->setSelectedFilters($this->filters);
 		}
 
@@ -365,22 +365,22 @@ 
 	 * @return resultList  List of results
 	 */
 	public function moreLikeThis($indexedItem, $fieldsToSearch, $testMode = false) {
-		echo "INDEXED ITEM:".$indexedItem;
+		echo "INDEXED ITEM:" . $indexedItem;
 
-		if ($indexedItem == null) {
+		if($indexedItem == null) {
 			throw new \InvalidArgumentException('A searchable item cannot be null');
 		}
 
-		if (!$indexedItem->hasExtension('SilverStripe\Elastica\Searchable')) {
-			throw new \InvalidArgumentException('Objects of class '.$indexedItem->ClassName.' are not searchable');
+		if(!$indexedItem->hasExtension('SilverStripe\Elastica\Searchable')) {
+			throw new \InvalidArgumentException('Objects of class ' . $indexedItem->ClassName . ' are not searchable');
 		}
 
-		if ($fieldsToSearch == null) {
+		if($fieldsToSearch == null) {
 			throw new \InvalidArgumentException('Fields cannot be null');
 		}
 
-		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 {
 				// if no translatable we only have the default locale
@@ -389,14 +389,14 @@ 
 		}
 
 		$weightedFieldsArray = array();
-		foreach ($fieldsToSearch as $field => $weighting) {
-			if (!is_string($field)) {
+		foreach($fieldsToSearch as $field => $weighting) {
+			if(!is_string($field)) {
 				throw new \InvalidArgumentException('Fields must be of the form fieldname => weight');
 			}
-			if (!is_numeric($weighting)) {
+			if(!is_numeric($weighting)) {
 				throw new \InvalidArgumentException('Fields must be of the form fieldname => weight');
 			}
-			$weightedField = $field.'^'.$weighting;
+			$weightedField = $field . '^' . $weighting;
 			$weightedField = str_replace('^1', '', $weightedField);
 			array_push($weightedFieldsArray, $weightedField);
 		}
@@ -428,7 +428,7 @@ 
 			'stop_words' => explode(',', $this->similarityStopWords)
 		);
 
-		if ($this->maxDocFreq > 0) {
+		if($this->maxDocFreq > 0) {
 			$mlt['max_doc_freq'] = $this->maxDocFreq;
 		}
 
@@ -440,7 +440,7 @@ 
 
         $elasticService = \Injector::inst()->create('SilverStripe\Elastica\ElasticaService');
 		$elasticService->setLocale($this->locale);
-		if ($testMode) {
+		if($testMode) {
 			$elasticService->setTestMode(true);
 		}
 

src/SilverStripe/Elastica/RangedAggregation.php

Indentation +2 added lines, -2 removed lines

@@ -38,8 +38,8 @@
 					$to = $range['to'];
 				}
 				$rangeFilter = array('gte' => (string)$from, 'lt' => (string)$to);
-		        $filter = new \Elastica\Filter\Range('AspectRatio', $rangeFilter);
-		        $result = $filter;
+				$filter = new \Elastica\Filter\Range('AspectRatio', $rangeFilter);
+				$result = $filter;
 			}
 		}
 

Spacing +6 added lines, -6 removed lines

@@ -14,7 +14,7 @@ 
 		$this->Title = $title;
 		$this->Range = new \Elastica\Aggregation\Range($title);
 		$this->Range->setField($field);
-		self::$ranged_aggregations[$title] = $this;;
+		self::$ranged_aggregations[$title] = $this; ;
 	}
 
 
@@ -24,7 +24,7 @@ 
 	 * @param string $name
 	 */
 	public function addRange($from, $to, $name) {
-		$this->Range->addRange($from,$to,$name);
+		$this->Range->addRange($from, $to, $name);
 	}
 
 
@@ -36,14 +36,14 @@ 
 	public function getFilter($chosenName) {
 		$rangeArray = $this->Range->toArray()['range']['ranges'];
 		$result = null;
-		foreach ($rangeArray as $range) {
-			if ($range['key'] === $chosenName) {
+		foreach($rangeArray as $range) {
+			if($range['key'] === $chosenName) {
 				$from = null;
 				$to = null;
-				if (isset($range['from'])) {
+				if(isset($range['from'])) {
 					$from = $range['from'];
 				}
-				if (isset($range['to'])) {
+				if(isset($range['to'])) {
 					$to = $range['to'];
 				}
 				$rangeFilter = array('gte' => (string)$from, 'lt' => (string)$to);

src/SilverStripe/Elastica/indexing/GermanIndexSettings.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 		$germanWithURLs = array(
 			'tokenizer' => 'uax_url_email',
 			//'filter' => array('english_possessive_stemmer', 'lowercase', 'english_stop', /*'english_keywords',*/ 'english_stemmer' ),
-			'filter' => array('no_single_chars', 'german_snowball', 'lowercase', 'german_stop' ),
+			'filter' => array('no_single_chars', 'german_snowball', 'lowercase', 'german_stop'),
 			'type' => 'custom'
 		);