gordonbanderson / silverstripe-elastica

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 +10 added lines, -10 removed lines

@@ -202,16 +202,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;
 					}
 				}
@@ -231,17 +231,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;
 					}
 				}
@@ -258,7 +258,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);
 		}
 	}
@@ -268,7 +268,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/SearchableTest.php

Doc Comments +3 added lines

@@ -479,6 +479,9 @@
 	}
 
 
+	/**
+	 * @param string $query
+	 */
 	private function getResultsFor($query, $pageLength = 10, $fields = array('Title' => 1, 'Description' => 1)) {
 		$es = new ElasticSearcher();
 		$es->setStart(0);

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';

code/ElasticaAutoCompleteController.php

Spacing +5 added lines, -5 removed lines

@@ -20,24 +20,24 @@
 		// Makes most sense to only provide one field here, e.g. Title, Name
 		$field = $this->request->getVar('field');
 
-		error_log('QUERY:'.$query);
+		error_log('QUERY:' . $query);
 
 		// start, and page length, i.e. pagination
 		$es->setPageLength(10);
-		if ($classes) {
+		if($classes) {
 			$es->setClasses($classes);
 		}
 
-		if ($filter) {
+		if($filter) {
 			$es->addFilter('InSiteTree', true);
 		}
 
-		$resultList = $es->autocomplete_search($query,$field);
+		$resultList = $es->autocomplete_search($query, $field);
 		$result = array();
 		$result['Query'] = $query;
 		$suggestions = array();
 
-		foreach ($resultList->getResults() as $singleResult) {
+		foreach($resultList->getResults() as $singleResult) {
 			$suggestion = array('value' => $singleResult->Title);
 			$suggestion['data'] = array(
 				'ID' => $singleResult->getParam('_id'),

searchpage/ElasticSearchPage_Validator.php

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
 		//return false;
 		//
 
-		if ($data['ClassesToSearch'] == array()) {
+		if($data['ClassesToSearch'] == array()) {
 			$data['ClassesToSearch'] = '';
 		}
 
@@ -30,8 +30,8 @@ 
 		echo "STDATA:$debug\n";
 
 		// Check if any classes to search if site tree only is not ticked
-		if (!$data['SiteTreeOnly']) {
-			if (!$data['ClassesToSearch']) {
+		if(!$data['SiteTreeOnly']) {
+			if(!$data['ClassesToSearch']) {
 				$valid = false;
 				$this->validationError("ClassesToSearch",
 					"Please provide at least one class to search, or select 'Site Tree Only'",
@@ -39,15 +39,15 @@ 
 				);
 			} else {
 				$toSearch = $data['ClassesToSearch'];
-				foreach ($toSearch as $clazz) {
+				foreach($toSearch as $clazz) {
 					try {
 						$instance = Injector::inst()->create($clazz);
-						if (!$instance->hasExtension('SilverStripe\Elastica\Searchable')) {
-							$this->validationError('ClassesToSearch', 'The class '.$clazz.' must have the Searchable extension');
+						if(!$instance->hasExtension('SilverStripe\Elastica\Searchable')) {
+							$this->validationError('ClassesToSearch', 'The class ' . $clazz . ' must have the Searchable extension');
 						}
 					} catch (ReflectionException $e) {
 						$this->validationError("ClassesToSearch",
-							'The class '.$clazz.' does not exist',
+							'The class ' . $clazz . ' does not exist',
 							'error'
 						);
 					}
@@ -58,23 +58,23 @@ 
 
 		// Check the identifier is unique
 		$mode = Versioned::get_reading_mode();
-		$suffix =  '';
-		if ($mode == 'Stage.Live') {
+		$suffix = '';
+		if($mode == 'Stage.Live') {
 			$suffix = '_Live';
 		}
-		$where = 'ElasticSearchPage'.$suffix.'.ID != '.$data['ID']." AND `Identifier` = '".$data['Identifier']."'";
+		$where = 'ElasticSearchPage' . $suffix . '.ID != ' . $data['ID'] . " AND `Identifier` = '" . $data['Identifier'] . "'";
 		$existing = ElasticSearchPage::get()->where($where)->count();
-		if ($existing > 0) {
+		if($existing > 0) {
 			$valid = false;
 			$this->validationError('Identifier',
-					'The identifier '.$data['Identifier'].' already exists',
+					'The identifier ' . $data['Identifier'] . ' already exists',
 					'error'
 			);
 		}
 
 
 		// Check number of results per page >= 1
-		if ($data['ResultsPerPage'] <= 0) {
+		if($data['ResultsPerPage'] <= 0) {
 			$valid = false;
 			$this->validationError('ResultsPerPage',
 				'Results per page must be >=1'

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/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());
 		}