gordonbanderson / silverstripe-elastica

tests/AutocompleteFilteredControllerTest.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,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/ElasticsearchFunctionalTestBase.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'
+		'SearchableTestPage', 'FlickrPhotoTO', 'FlickrAuthorTO', 'FlickrSetTO', 'FlickrTagTO',
+		'SearchableTestFatherPage', 'SearchableTestGrandFatherPage'
 	);
 
 
@@ -27,7 +27,7 @@ 
 
 	public function setUp() {
 
-		error_log("*************** TEST: ".$this->getName());
+		error_log("*************** TEST: " . $this->getName());
 
 		$cache = SS_Cache::factory('elasticsearch');
 		$cache->clean(Zend_Cache::CLEANING_MODE_ALL);
@@ -35,7 +35,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;
 
@@ -54,7 +54,7 @@ 
 			$this->service->setTestMode(true);
 
 			// A previous test may have deleted the index and then failed, so check for this
-			if (!$this->service->getIndex()->exists()) {
+			if(!$this->service->getIndex()->exists()) {
 				$this->service->getIndex()->create();
 			}
 			$this->service->reset();
@@ -65,9 +65,9 @@ 
 			// load fixtures
 			$orig_fixture_file = static::$fixture_file;
 
-			foreach (static::$ignoreFixtureFileFor as $testPattern) {
-				$pattern = '/'.$testPattern.'/';
-				if (preg_match($pattern, $this->getName())) {
+			foreach(static::$ignoreFixtureFileFor as $testPattern) {
+				$pattern = '/' . $testPattern . '/';
+				if(preg_match($pattern, $this->getName())) {
 					static::$fixture_file = null;
 				}
 			}
@@ -79,7 +79,7 @@ 
 		// this has to be executed otherwise nesting exceptions occur
 		parent::setUp();
 
-		if ($elasticaException) {
+		if($elasticaException) {
 			$this->fail('T1 Exception with Elasticsearch');
 		}
 
@@ -101,18 +101,18 @@ 
 			$elasticaException = true;
 		}
 
-		if ($elasticaException) {
+		if($elasticaException) {
 			$this->fail('T2 Exception with Elasticsearch');
 		}
 	}
 
 
 	private function publishSiteTree() {
-		foreach (SiteTree::get()->getIterator() as $page) {
+		foreach(SiteTree::get()->getIterator() as $page) {
 			// temporarily disable Elasticsearch indexing, it will be done in a batch
 			$page->IndexingOff = true;
 
-			$page->publish('Stage','Live');
+			$page->publish('Stage', 'Live');
 		}
 	}
 
@@ -133,7 +133,7 @@ 
 		$items = $this->cssParser()->getBySelector($selector);
 
 		$ctr = 0;
-		foreach ($items as $item) {
+		foreach($items as $item) {
 			$text = strip_tags($item);
 			$escaped = str_replace("'", "\'", $text);
 			$ctr++;
@@ -155,7 +155,7 @@ 
 	 */
 	public function assertAttributeHasExactValue($selector, $attributeName, $expectedValue) {
 		$items = $this->cssParser()->getBySelector($selector);
-		foreach ($items as $item) {
+		foreach($items as $item) {
 			$this->assertEquals($expectedValue, $item['value']);
 		}
 	}
@@ -164,9 +164,9 @@ 
 	public function assertAttributesHaveExactValues($selector, $expectedValues) {
 		$attributeNames = array_keys($expectedValues);
 		$items = $this->cssParser()->getBySelector($selector);
-		foreach ($items as $item) {
+		foreach($items as $item) {
 			$actualValues = array();
-			foreach ($attributeNames as $attributeName) {
+			foreach($attributeNames as $attributeName) {
 				$actualValues[$attributeName] = (string)$item[$attributeName];
 			}
 			$this->assertEquals($expectedValues, $actualValues);
@@ -176,7 +176,7 @@ 
 
 	public function assertNumberOfNodes($selector, $expectedAmount) {
 		$items = $this->cssParser()->getBySelector($selector);
-		foreach ($items as $item) {
+		foreach($items as $item) {
 			$text = strip_tags($item);
 		}
 
@@ -189,9 +189,9 @@ 
 	public function collateSearchResults() {
 		$items = $this->cssParser()->getBySelector('div.searchResults .searchResult');
 		$result = array();
-		foreach ($items as $item) {
+		foreach($items as $item) {
 			$attr = $item->attributes()->id;
-			array_push($result, $attr."");
+			array_push($result, $attr . "");
 		}
 
 		return $result;

tests/ElasticsearchTestBase.php

Spacing +33 added lines, -33 removed lines

@@ -8,8 +8,8 @@ 
 	public static $ignoreFixtureFileFor = array();
 
 	protected $extraDataObjects = array(
-		'SearchableTestPage','FlickrPhotoTO','FlickrAuthorTO','FlickrSetTO','FlickrTagTO',
-		'SearchableTestFatherPage','SearchableTestGrandFatherPage','AutoCompleteOption'
+		'SearchableTestPage', 'FlickrPhotoTO', 'FlickrAuthorTO', 'FlickrSetTO', 'FlickrTagTO',
+		'SearchableTestFatherPage', 'SearchableTestGrandFatherPage', 'AutoCompleteOption'
 	);
 
 
@@ -42,7 +42,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;
 
@@ -58,7 +58,7 @@ 
 
 		try {
 			// A previous test may have deleted the index and then failed, so check for this
-			if (!$this->service->getIndex()->exists()) {
+			if(!$this->service->getIndex()->exists()) {
 				error_log('++++ EL BASE SET UP T4a');
 
 				$this->service->getIndex()->create();
@@ -73,16 +73,16 @@ 
 			$orig_fixture_file = static::$fixture_file;
 			error_log('++++ EL BASE SET UP T5');
 
-			foreach (static::$ignoreFixtureFileFor as $testPattern) {
-				$pattern = '/'.$testPattern.'/';
-				if (preg_match($pattern, $this->getName())) {
+			foreach(static::$ignoreFixtureFileFor as $testPattern) {
+				$pattern = '/' . $testPattern . '/';
+				if(preg_match($pattern, $this->getName())) {
 					static::$fixture_file = null;
 				}
 			}
 
 			error_log('++++ EL BASE SET UP T6');
 		} catch (Exception $e) {
-			error_log("**** EXCEPTION T1 ".$e->getMessage());
+			error_log("**** EXCEPTION T1 " . $e->getMessage());
 			$elasticException = true;
 		}
 			error_log('++++ EL BASE SET UP T7');
@@ -91,7 +91,7 @@ 
 		// this needs to run otherwise nested injector errors show up
 		parent::setUp();
 
-		if ($elasticException) {
+		if($elasticException) {
 			$this->fail('T1 An error has occurred trying to contact Elasticsearch server');
 		}
 
@@ -107,11 +107,11 @@ 
 
 			$task->run(null);
 		} catch (Exception $e) {
-			error_log("**** EXCEPTION T2 ".$e->getMessage());
+			error_log("**** EXCEPTION T2 " . $e->getMessage());
 			$elasticException = true;
 		}
 
-		if ($elasticException) {
+		if($elasticException) {
 			$this->fail('T2 An error has occurred trying to contact Elasticsearch server');
 		}
 
@@ -126,55 +126,55 @@ 
 
 
 	private function publishSiteTree() {
-		foreach (SiteTree::get()->getIterator() as $page) {
+		foreach(SiteTree::get()->getIterator() as $page) {
 			// temporarily disable Elasticsearch indexing, it will be done in a batch
 			$page->IndexingOff = true;
-			$page->publish('Stage','Live');
+			$page->publish('Stage', 'Live');
 		}
 	}
 
 
 	public function generateAssertionsFromArray($toAssert) {
-		echo '$expected = array('."\n";
-		foreach ($toAssert as $key => $value) {
+		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";
-		foreach ($toAssert as $key => $value) {
+		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);
+		foreach($toAssert as $key => $value) {
+			if(is_array($value)) {
+				$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";
@@ -198,7 +198,7 @@ 
 		$size = sizeof($splits);
 		$nameToCheck = end($splits);
 		$this->assertEquals($actualTabName, $nameToCheck);
-		if ($size == 1) {
+		if($size == 1) {
 			$this->assertEquals("Root_${tabName}", $tab->id());
 		} else {
 			$expected = "Root_{$splits[0]}_set_{$splits[1]}";
@@ -209,7 +209,7 @@ 
 	}
 
 
-	public function checkFieldExists($tab,$fieldName) {
+	public function checkFieldExists($tab, $fieldName) {
 		$fields = $tab->Fields();
 		$field = $tab->fieldByName($fieldName);
 		$this->assertTrue($field != null);
@@ -243,16 +243,16 @@ 
 
 		$numberDocsInIndex = -1; // flag value for not yet indexed
 		error_log('CHECKING NUMBER OF INDEXED DOCUMENTS, SHOULD BE ' . $expectedAmount);
-		error_log(print_r($status,1));
+		error_log(print_r($status, 1));
 
-		if (isset($status['indices']['elastica_ss_module_test_en_us']['docs'])) {
+		if(isset($status['indices']['elastica_ss_module_test_en_us']['docs'])) {
 			$numberDocsInIndex = $status['indices']['elastica_ss_module_test_en_us']['docs']['num_docs'];
-			error_log('DOCUMENTS FOUND:'.$numberDocsInIndex);
+			error_log('DOCUMENTS FOUND:' . $numberDocsInIndex);
 		} else {
 			$numberDocsInIndex = 0;
 		}
 
-		$this->assertEquals($expectedAmount,$numberDocsInIndex);
+		$this->assertEquals($expectedAmount, $numberDocsInIndex);
 	}
 
 	/*
@@ -263,7 +263,7 @@ 
 		$status = $index->getStatus()->getData();
 
 		$numberDocsInIndex = -1; // flag value for not yet indexed
-		if (isset($status['indices']['elastica_ss_module_test_en_us']['docs'])) {
+		if(isset($status['indices']['elastica_ss_module_test_en_us']['docs'])) {
 			$numberDocsInIndex = $status['indices']['elastica_ss_module_test_en_us']['docs']['num_docs'];
 		}