gordonbanderson / silverstripe-elastica

tests/ElasticSearchPageControllerTest.php

Spacing +27 added lines, -27 removed lines

@@ -37,27 +37,27 @@ 
 		$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);
 			}
 		}
 		$esp->write();
-		$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;
 	}
 
 
@@ -72,7 +72,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());
@@ -124,7 +124,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);
@@ -171,7 +171,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);
@@ -205,7 +205,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);
@@ -249,9 +249,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);
@@ -278,7 +278,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);
@@ -299,7 +299,7 @@ 
 
 	public function testTemplateOverrideExtension() {
 
-		if (!class_exists('PageControllerTemplateOverrideExtension')) {
+		if(!class_exists('PageControllerTemplateOverrideExtension')) {
 			$this->markTestSkipped('PageControllerTemplateOverrideExtension not installed');
 		}
 
@@ -517,7 +517,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());
@@ -565,9 +565,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'));
 	}
 
 
@@ -587,7 +587,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());
@@ -632,13 +632,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());
@@ -673,7 +673,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());
@@ -698,7 +698,7 @@ 
 
 		$resultsP1 = $this->collateSearchResults();
 
-		$page2url = $url . '&start='.$pageLength;
+		$page2url = $url . '&start=' . $pageLength;
 
 		//Check pagination on page 2
 		$response2 = $this->get($page2url);
@@ -725,19 +725,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/TranslatableSearchableTest.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 
 	public function setUpOnce() {
 		//Add translatable if it exists
-		if (class_exists('Translatable')) {
+		if(class_exists('Translatable')) {
 			error_log("TRANSLATABLE EXISTS!");
 			SiteTree::add_extension('Translatable');
 		}
@@ -25,7 +25,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
@@ -35,7 +35,7 @@ 
 
 
 	public function testgetFieldValuesAsArrayWithLocale() {
-		if (!class_exists('Translatable')) {
+		if(!class_exists('Translatable')) {
 			$this->markTestSkipped('Translatable not installed');
 		}
 
@@ -68,7 +68,7 @@ 
 	 * Test a valid identifier
 	 */
 	public function testMappingWithLocale() {
-		if (!class_exists('Translatable')) {
+		if(!class_exists('Translatable')) {
 			$this->markTestSkipped('Translatable not installed');
 		}
 
@@ -87,7 +87,7 @@ 
 	Get a record as an Elastic document and check values
 	 */
 	public function testGetElasticaDocumentWithLocale() {
-		if (!class_exists('Translatable')) {
+		if(!class_exists('Translatable')) {
 			$this->markTestSkipped('Translatable not installed');
 		}
 

tests/TranslatableUnitTest.php

Spacing +28 added lines, -28 removed lines

@@ -10,14 +10,14 @@ 
 
 	public function setUpOnce() {
 		//Add translatable if it exists
-		if (class_exists('Translatable')) {
+		if(class_exists('Translatable')) {
 			SiteTree::add_extension('Translatable');
 		}
 		parent::setUpOnce();
 	}
 
 	public function testElasticSearchForm() {
-		if (!class_exists('Translatable')) {
+		if(!class_exists('Translatable')) {
 			$this->markTestSkipped('Translatable not installed');
 		}
 
@@ -36,7 +36,7 @@ 
 
 
 	public function testHighlightPassingFields() {
-		if (!class_exists('Translatable')) {
+		if(!class_exists('Translatable')) {
 			$this->markTestSkipped('Translatable not installed');
 		}
 
@@ -50,28 +50,28 @@ 
 		$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) {
-					$bracketed = '<strong class="hl">'.$part.'</strong>';
-					if (strpos($snippet, $bracketed) > 0) {
+				foreach($lcquery as $part) {
+					$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');
 			}
 		}
 	}
 
 
 	public function testAutoCompleteGood() {
-		if (!class_exists('Translatable')) {
+		if(!class_exists('Translatable')) {
 			$this->markTestSkipped('Translatable not installed');
 		}
 
@@ -81,7 +81,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);
 		}
 	}
@@ -93,7 +93,7 @@ 
 
 	// FIXME - this test is shardy unfortunately
 	public function testMoreLikeThisSinglePhoto() {
-		if (!class_exists('Translatable')) {
+		if(!class_exists('Translatable')) {
 			$this->markTestSkipped('Translatable not installed');
 		}
 
@@ -105,11 +105,11 @@ 
 		$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";
-		foreach ($results as $result) {
+		foreach($results as $result) {
 			echo "-\t{$result->Title}\n";
 		}
 
@@ -126,7 +126,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');
 
@@ -154,7 +154,7 @@ 
 	 */
 
 	public function testSimilarGood() {
-		if (!class_exists('Translatable')) {
+		if(!class_exists('Translatable')) {
 			$this->markTestSkipped('Translatable not installed');
 		}
 
@@ -163,8 +163,8 @@ 
 		$es->setClasses('FlickrPhotoTO');
 		$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";
+		foreach($paginated->getList() as $result) {
+			echo $result->ID . ' : ' . $result->Title . "\n";
 		}
 		$this->assertEquals(32, $paginated->getTotalItems());
 		$results = $paginated->getList()->toArray();
@@ -185,7 +185,7 @@ 
 	FIXME - this is not working, not sure why.  Trying to complete coverage of ReindexTask
 	 */
 	public function testBulkIndexing() {
-		if (!class_exists('Translatable')) {
+		if(!class_exists('Translatable')) {
 			$this->markTestSkipped('Translatable not installed');
 		}
 
@@ -203,7 +203,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);
@@ -212,7 +212,7 @@ 
 
 	// if this is not set to unbounded, zero, a conditional is triggered to add max doc freq to the request
 	public function testSimilarChangeMaxDocFreq() {
-		if (!class_exists('Translatable')) {
+		if(!class_exists('Translatable')) {
 			$this->markTestSkipped('Translatable not installed');
 		}
 
@@ -222,8 +222,8 @@ 
 		$es->setClasses('FlickrPhotoTO');
 		$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";
+		foreach($paginated->getList() as $result) {
+			echo $result->ID . ' : ' . $result->Title . "\n";
 		}
 		$this->assertEquals(14, $paginated->getTotalItems());
 		$results = $paginated->getList()->toArray();
@@ -232,7 +232,7 @@ 
 
 
 	public function testSimilarNullFields() {
-		if (!class_exists('Translatable')) {
+		if(!class_exists('Translatable')) {
 			$this->markTestSkipped('Translatable not installed');
 		}
 
@@ -248,7 +248,7 @@ 
 
 
 	public function testSimilarNullItem() {
-		if (!class_exists('Translatable')) {
+		if(!class_exists('Translatable')) {
 			$this->markTestSkipped('Translatable not installed');
 		}
 
@@ -266,9 +266,9 @@ 
 	private function makeCode($paginated) {
 		$results = $paginated->getList()->toArray();
 		$ctr = 0;
-		echo '$result = $paginated->getList()->toArray();'."\n";
-		foreach ($results as $result) {
-			echo '$this->assertEquals("'.$result->Title.'", $results['.$ctr.']->Title);'."\n";
+		echo '$result = $paginated->getList()->toArray();' . "\n";
+		foreach($results as $result) {
+			echo '$this->assertEquals("' . $result->Title . '", $results[' . $ctr . ']->Title);' . "\n";
 			$ctr++;
 		}
 	}

tests/ElasticSearchPage_Validator_Test.php

Spacing +10 added lines, -10 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,
@@ -69,7 +69,7 @@ 
 		$origMode = Versioned::get_reading_mode();
 		echo "CURRENT MODE:$origMode\n";
 		Versioned::set_reading_mode('Stage');
-		echo "CURRENT MODE:".Versioned::get_reading_mode()."\n";
+		echo "CURRENT MODE:" . Versioned::get_reading_mode() . "\n";
 		Versioned::set_reading_mode($origMode); // reset current mode
 	}
 
@@ -119,7 +119,7 @@ 
 		$esp->Identifier = 'THISWILLBECOPIED';
 		$esp->write();
 		$this->checkForError('Identifier', 'THISWILLBECOPIED',
-			'The identifier THISWILLBECOPIED already exists' );
+			'The identifier THISWILLBECOPIED already exists');
 	}
 
 
@@ -131,7 +131,7 @@ 
 		$form = new Form($this, 'Form', $fields, new FieldList());
 		$form->loadDataFrom($this->ElasticSearchPage);
 
-		foreach ($form->Fields() as $field) {
+		foreach($form->Fields() as $field) {
 			echo "************** {$field->getName()} -> {$field->Value()}\n";
 		}
 		$form->setValidator($this->ElasticSearchPage->getCMSValidator());
@@ -141,13 +141,13 @@ 
 		$found = false;
 		print_r($errors);
 
-		foreach ($errors as $error) {
+		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) {
+			if($error['message'] == $message && $error['fieldName'] == $fieldName) {
 				$found = true;
 				break;
 			}