gordonbanderson / silverstripe-elastica

code/SearchableClass.php

Spacing +3 added lines, -3 removed lines

@@ -15,10 +15,10 @@
 
 		$fields = new FieldList();
 
-		$fields->push( new TabSet( "Root", $mainTab = new Tab( "Main" ) ) );
-		$mainTab->setTitle( _t( 'SiteTree.TABMAIN', "Main" ) );
+		$fields->push(new TabSet("Root", $mainTab = new Tab("Main")));
+		$mainTab->setTitle(_t('SiteTree.TABMAIN', "Main"));
 
-		$fields->addFieldToTab( 'Root.Main',  $nf = new TextField( 'Name', 'Name') );
+		$fields->addFieldToTab('Root.Main', $nf = new TextField('Name', 'Name'));
 		$nf->setReadOnly(true);
 		$nf->setDisabled(true);
 

code/SearchableField.php

Spacing +4 added lines, -4 removed lines

@@ -24,10 +24,10 @@
 
 	function getCMSFields() {
 		$fields = new FieldList();
-		$fields->push( new TabSet( "Root", $mainTab = new Tab( "Main" ) ) );
-		$mainTab->setTitle( _t( 'SiteTree.TABMAIN', "Main" ) );
-		$fields->addFieldToTab( 'Root.Main',  $cf = new TextField( 'ClazzName', 'Class sourced from') );
-		$fields->addFieldToTab( 'Root.Main',  $nf = new TextField( 'Name', 'Name') );
+		$fields->push(new TabSet("Root", $mainTab = new Tab("Main")));
+		$mainTab->setTitle(_t('SiteTree.TABMAIN', "Main"));
+		$fields->addFieldToTab('Root.Main', $cf = new TextField('ClazzName', 'Class sourced from'));
+		$fields->addFieldToTab('Root.Main', $nf = new TextField('Name', 'Name'));
 		$cf->setDisabled(true);
 		$nf->setDisabled(true);
 		$cf->setReadOnly(true);

code/ElasticaAutoCompleteController.php

Spacing +2 added lines, -2 removed lines

@@ -20,7 +20,7 @@ 
 		// 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);
@@ -32,7 +32,7 @@ 
 			$es->addFilter('InSiteTree', true);
 		}
 
-		$resultList = $es->autocomplete_search($query,$field);
+		$resultList = $es->autocomplete_search($query, $field);
 		$result = array();
 		$result['Query'] = $query;
 		$suggestions = array();

code/ElasticaUtil.php

Spacing +11 added lines, -11 removed lines

@@ -58,10 +58,10 @@ 
 			$originalParts = explode(' ', $originalQuery);
 			$suggestedParts = explode(' ', $suggestedPhrase);
 
-			$markedHighlightedParts = ' '.$suggestedPhraseHighlighted.' ';
-			$markedHighlightedParts = str_replace(' '.$preTags, ' '.self::$pre_marker, $markedHighlightedParts);
+			$markedHighlightedParts = ' ' . $suggestedPhraseHighlighted . ' ';
+			$markedHighlightedParts = str_replace(' ' . $preTags, ' ' . self::$pre_marker, $markedHighlightedParts);
 
-			$markedHighlightedParts = str_replace($postTags.' ', self::$post_marker, $markedHighlightedParts);
+			$markedHighlightedParts = str_replace($postTags . ' ', self::$post_marker, $markedHighlightedParts);
 
 			$markedHighlightedParts = trim($markedHighlightedParts);
 			$markedHighlightedParts = trim($markedHighlightedParts);
@@ -91,7 +91,7 @@ 
 				} else {
 					//Need to check capitalisation of terms suggested that are different
 
-					$chr = mb_substr ($possiblyUppercase, 0, 1, "UTF-8");
+					$chr = mb_substr($possiblyUppercase, 0, 1, "UTF-8");
     				if (mb_strtolower($chr, "UTF-8") != $chr) {
     					$upperLowercaseWord = $lowercaseWord;
     					$upperLowercaseWord[0] = $chr;
@@ -115,9 +115,9 @@ 
 				}
 			}
 
-			$highlighted = ' '.implode(' ', $highlighted).' ';
-			$highlighted = str_replace(self::$pre_marker, ' '.$preTags, $highlighted);
-			$highlighted = str_replace(self::$post_marker, $postTags.' ', $highlighted);
+			$highlighted = ' ' . implode(' ', $highlighted) . ' ';
+			$highlighted = str_replace(self::$pre_marker, ' ' . $preTags, $highlighted);
+			$highlighted = str_replace(self::$post_marker, $postTags . ' ', $highlighted);
 
 			$resultArray['suggestedQuery'] = implode(' ', $plain);
 			$resultArray['suggestedQueryHighlighted'] = trim($highlighted);
@@ -146,10 +146,10 @@ 
 
         $bracketPos = strpos($explanation, ')~');
 
-        if (substr($explanation, 0,2) == '((') {
-        	$explanation = substr($explanation, 2, $bracketPos-2);
-        } elseif (substr($explanation, 0,1) == '(') {
-        	$explanation = substr($explanation, 1, $bracketPos-2);
+        if (substr($explanation, 0, 2) == '((') {
+        	$explanation = substr($explanation, 2, $bracketPos - 2);
+        } elseif (substr($explanation, 0, 1) == '(') {
+        	$explanation = substr($explanation, 1, $bracketPos - 2);
         }
 
        	$terms = array();

tests/TranslatableSearchableTest.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,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;
 		// load fixtures

tests/ElasticSearcherUnitTest.php

Spacing +11 added lines, -11 removed lines

@@ -21,7 +21,7 @@ 
 		$es->setLocale($locale);
 		$es->setClasses('FlickrPhotoTO');
 
-		$fields = array('Description' => 1,'Title' => 1);
+		$fields = array('Description' => 1, 'Title' => 1);
 		$results = $es->search('New Zealind', $fields, true);
 
 		$this->assertEquals('New Zealand', $es->getSuggestedQuery());
@@ -48,7 +48,7 @@ 
 		$es->setLocale($locale);
 		$es->setClasses('FlickrPhotoTO');
 
-		$fields = array('Description.standard' => 1,'Title.standard' => 1);
+		$fields = array('Description.standard' => 1, 'Title.standard' => 1);
 		$results = $es->moreLikeThis($fp, $fields, true);
 
 		echo "RESULTS:\n";
@@ -69,7 +69,7 @@ 
 		$expected = array('texas');
 		$this->assertEquals($expected, $terms['Title.standard']);
 
-		$expected = array('new', 'see','photographs', 'information','resolution', 'company', 'view',
+		$expected = array('new', 'see', 'photographs', 'information', 'resolution', 'company', 'view',
 			'high', 'collection', 'pacific', 'orleans', 'degolyer', 'southern', 'everett',
 			'railroad', 'texas');
 
@@ -137,7 +137,7 @@ 
 		$fields = array('Title.standard' => 1, 'Description.standard' => 1);
 		$paginated = $es->moreLikeThis($fp, $fields, true);
 		foreach ($paginated->getList() as $result) {
-			echo $result->ID. ' : '.$result->Title."\n";
+			echo $result->ID . ' : ' . $result->Title . "\n";
 		}
 		$this->assertEquals(32, $paginated->getTotalItems());
 		$results = $paginated->getList()->toArray();
@@ -163,7 +163,7 @@ 
 		$fields = array('Title.standard' => 1, 'Description.standard' => 1);
 		$paginated = $es->moreLikeThis($fp, $fields, true);
 		foreach ($paginated->getList() as $result) {
-			echo $result->ID. ' : '.$result->Title."\n";
+			echo $result->ID . ' : ' . $result->Title . "\n";
 		}
 		$this->assertEquals(14, $paginated->getTotalItems());
 		$results = $paginated->getList()->toArray();
@@ -226,12 +226,12 @@ 
 				$wordFound = false;
 				$lcquery = explode(' ', strtolower($query));
 				foreach ($lcquery as $part) {
-					$bracketed = '<strong class="hl">'.$part.'</strong>';
+					$bracketed = '<strong class="hl">' . $part . '</strong>';
 					if (strpos($snippet, $bracketed) > 0) {
 						$wordFound = true;
 					}
 				}
-				$this->assertTrue($wordFound,'Highlight should have been found');
+				$this->assertTrue($wordFound, 'Highlight should have been found');
 			}
 		}
 	}
@@ -256,12 +256,12 @@ 
 				$wordFound = false;
 				$lcquery = explode(' ', strtolower($query));
 				foreach ($lcquery as $part) {
-					$bracketed = '<strong class="hl">'.$part.'</strong>';
+					$bracketed = '<strong class="hl">' . $part . '</strong>';
 					if (strpos($snippet, $bracketed) > 0) {
 						$wordFound = true;
 					}
 				}
-				$this->assertTrue($wordFound,'Highlight should have been found');
+				$this->assertTrue($wordFound, 'Highlight should have been found');
 			}
 		}
 	}
@@ -283,9 +283,9 @@ 
 	private function makeCode($paginated) {
 		$results = $paginated->getList()->toArray();
 		$ctr = 0;
-		echo '$result = $paginated->getList()->toArray();'."\n";
+		echo '$result = $paginated->getList()->toArray();' . "\n";
 		foreach ($results as $result) {
-			echo '$this->assertEquals("'.$result->Title.'", $results['.$ctr.']->Title);'."\n";
+			echo '$this->assertEquals("' . $result->Title . '", $results[' . $ctr . ']->Title);' . "\n";
 			$ctr++;
 		}
 	}

tests/ElasticsearchTestBase.php

Spacing +19 added lines, -19 removed lines

@@ -9,8 +9,8 @@ 
 	public static $ignoreFixtureFileFor = array();
 
 	protected $extraDataObjects = array(
-		'SearchableTestPage','FlickrPhotoTO','FlickrAuthorTO','FlickrSetTO','FlickrTagTO',
-		'SearchableTestFatherPage','SearchableTestGrandFatherPage','AutoCompleteOption'
+		'SearchableTestPage', 'FlickrPhotoTO', 'FlickrAuthorTO', 'FlickrSetTO', 'FlickrTagTO',
+		'SearchableTestFatherPage', 'SearchableTestGrandFatherPage', 'AutoCompleteOption'
 	);
 
 
@@ -39,7 +39,7 @@ 
 
 		// 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');
 		$this->requireDefaultRecordsFrom = $classes;
 
@@ -61,13 +61,13 @@ 
 		$orig_fixture_file = static::$fixture_file;
 
 		foreach (static::$ignoreFixtureFileFor as $testPattern) {
-			$pattern = '/'.$testPattern.'/';
+			$pattern = '/' . $testPattern . '/';
 			if (preg_match($pattern, $this->getName())) {
 				static::$fixture_file = null;
 			}
 		}
 
-		echo "\n\n\n\nEXECUTING TEST {$this->getName()}, FIXTURES=".static::$fixture_file."\n";
+		echo "\n\n\n\nEXECUTING TEST {$this->getName()}, FIXTURES=" . static::$fixture_file . "\n";
 
 		parent::setUp();
 		static::$fixture_file = $orig_fixture_file;
@@ -97,53 +97,53 @@ 
 			// temporarily disable Elasticsearch indexing, it will be done in a batch
 			$page->IndexingOff = true;
 
-			echo "Publishing ".$page->Title."\n";
-			$page->publish('Stage','Live');
+			echo "Publishing " . $page->Title . "\n";
+			$page->publish('Stage', 'Live');
 		}
 	}
 
 
 	public function generateAssertionsFromArray($toAssert) {
-		echo '$expected = array('."\n";
+		echo '$expected = array(' . "\n";
 		foreach ($toAssert as $key => $value) {
 			$escValue = str_replace("'", '\\\'', $value);
 			echo "'$key' => '$escValue',\n";
 		}
 		echo ");\n";
-		echo '$this->assertEquals($expected, $somevar);'."\n";
+		echo '$this->assertEquals($expected, $somevar);' . "\n";
 	}
 
 
 	public function generateAssertionsFromArray1D($toAssert) {
-		echo '$expected = array('."\n";
+		echo '$expected = array(' . "\n";
 		foreach ($toAssert as $key => $value) {
 			$escValue = str_replace("'", '\\\'', $value);
 			echo "'$escValue',";
 		}
 		echo ");\n";
-		echo '$this->assertEquals($expected, $somevar);'."\n";
+		echo '$this->assertEquals($expected, $somevar);' . "\n";
 	}
 
 
 	public function generateAssertionsFromArrayRecurse($toAssert) {
 		echo '$expected = ';
-			$this->recurseArrayAssertion($toAssert,1, 'FIXME');
-		echo '$this->assertEquals($expected, $somevar);'."\n";
+			$this->recurseArrayAssertion($toAssert, 1, 'FIXME');
+		echo '$this->assertEquals($expected, $somevar);' . "\n";
 	}
 
 
 	private function recurseArrayAssertion($toAssert, $depth, $parentKey) {
-		$prefix = str_repeat("\t",$depth);
+		$prefix = str_repeat("\t", $depth);
 		echo "\t{$prefix}'$parentKey' => array(\n";
 		$ctr = 0;
 		$len = sizeof(array_keys($toAssert));
 		foreach ($toAssert as $key => $value) {
 			if (is_array($value)) {
-				$this->recurseArrayAssertion($value, $depth+1, $key);
+				$this->recurseArrayAssertion($value, $depth + 1, $key);
 			} else {
 				$escValue = str_replace("'", '\\\'', $value);
 				$comma = ',';
-				if ($ctr == $len-1) {
+				if ($ctr == $len - 1) {
 					$comma = '';
 				}
 				echo "\t\t$prefix'$key' => '$escValue'$comma\n";
@@ -184,11 +184,11 @@ 
 	}
 
 
-	public function checkFieldExists($tab,$fieldName) {
+	public function checkFieldExists($tab, $fieldName) {
 		$fields = $tab->Fields();
 		echo "TAB:{$tab->Name}\n";
 		foreach ($fields as $fi) {
-			echo "NAME:".$fi->Name."\n";
+			echo "NAME:" . $fi->Name . "\n";
 		}
 		$field = $tab->fieldByName($fieldName);
 		$this->assertTrue($field != null);
@@ -225,7 +225,7 @@ 
 			$numberDocsInIndex = $status['indices']['elastica_ss_module_test_en_us']['docs']['num_docs'];
 		}
 
-		$this->assertEquals($expectedAmount,$numberDocsInIndex);
+		$this->assertEquals($expectedAmount, $numberDocsInIndex);
 	}
 
 	/*

tests/ElasticSearchPage_Validator_Test.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 		parent::setup();
 		$this->ElasticSearchPage = $this->objFromFixture('ElasticSearchPage', 'search');
 
-		$this->ElasticSearchPage->SimilarityStopWords =  'a,the,which';
+		$this->ElasticSearchPage->SimilarityStopWords = 'a,the,which';
 		$this->ElasticSearchPage->write();
 
 		$this->Validator = $this->ElasticSearchPage->getCMSValidator();
@@ -34,7 +34,7 @@ 
 			'AutoCompleteFieldID' => null,
 			'AutoCompleteFunctionID' => null,
 			'SearchHelper' => null,
-			'SimilarityStopWords' => array('a', 'an', 'the', ),
+			'SimilarityStopWords' => array('a', 'an', 'the',),
 			'MinTermFreq' => 2,
 			'MaxTermFreq' => 25,
 			'MinDocFreq' => 2,
@@ -102,7 +102,7 @@ 
 		$esp->Identifier = 'THISWILLBECOPIED';
 		$esp->write();
 		$this->checkForError('Identifier', 'THISWILLBECOPIED',
-			'The identifier THISWILLBECOPIED already exists' );
+			'The identifier THISWILLBECOPIED already exists');
 	}
 
 
@@ -126,9 +126,9 @@ 
 
 		foreach ($errors as $error) {
 			echo "Checking error\n";
-			echo " - " . $error['fieldName'].' => '.$error['message']."\n";
-			echo "\tT1:".($error['message'] == $message);
-			echo "\n\tT2:".($error['fieldName'] == $fieldName);
+			echo " - " . $error['fieldName'] . ' => ' . $error['message'] . "\n";
+			echo "\tT1:" . ($error['message'] == $message);
+			echo "\n\tT2:" . ($error['fieldName'] == $fieldName);
 
 			if ($error['message'] == $message && $error['fieldName'] == $fieldName) {
 				$found = true;

tests/ElasticsearchFunctionalTestBase.php

Spacing +9 added lines, -9 removed lines

@@ -8,8 +8,8 @@ 
 	public static $ignoreFixtureFileFor = array();
 
 	protected $extraDataObjects = array(
-		'SearchableTestPage','FlickrPhotoTO','FlickrAuthorTO','FlickrSetTO','FlickrTagTO',
-		'SearchableTestFatherPage','SearchableTestGrandFatherPage'
+		'SearchableTestPage', 'FlickrPhotoTO', 'FlickrAuthorTO', 'FlickrSetTO', 'FlickrTagTO',
+		'SearchableTestFatherPage', 'SearchableTestGrandFatherPage'
 	);
 
 
@@ -29,7 +29,7 @@ 
 
 		// 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');
 		$this->requireDefaultRecordsFrom = $classes;
 
@@ -60,8 +60,8 @@ 
 		print_r(static::$ignoreFixtureFileFor);
 
 		foreach (static::$ignoreFixtureFileFor as $testPattern) {
-			$pattern = '/'.$testPattern.'/';
-			echo "GREP: $pattern against ".$this->getName()."\n";
+			$pattern = '/' . $testPattern . '/';
+			echo "GREP: $pattern against " . $this->getName() . "\n";
 			if (preg_match($pattern, $this->getName())) {
 				static::$fixture_file = null;
 			}
@@ -88,8 +88,8 @@ 
 			// temporarily disable Elasticsearch indexing, it will be done in a batch
 			$page->IndexingOff = true;
 
-			echo "Publishing ".$page->Title."\n";
-			$page->publish('Stage','Live');
+			echo "Publishing " . $page->Title . "\n";
+			$page->publish('Stage', 'Live');
 		}
 	}
 
@@ -115,7 +115,7 @@ 
 			$text = strip_tags($item);
 			$escaped = str_replace("'", "\'", $text);
 			echo "SELECTED:\$this->assertSelectorStartsWithOrEquals('{$selector}', $ctr, '$escaped');\n";
-			echo "ITEM:".$item."\n";
+			echo "ITEM:" . $item . "\n";
 			$ctr++;
 		}
 
@@ -171,7 +171,7 @@ 
 		$result = array();
 		foreach ($items as $item) {
 			$attr = $item->attributes()->id;
-			array_push($result, $attr."");
+			array_push($result, $attr . "");
 		}
 
 		return $result;