gordonbanderson / silverstripe-elastica

tests/AutocompleteControllerTest.php

Spacing +4 added lines, -4 removed lines

@@ -18,13 +18,13 @@ 
 
 
 		// Delete and assert that it does not exist
-		$sql =  "SELECT ID,Name,ClazzName from SearchableField";
+		$sql = "SELECT ID,Name,ClazzName from SearchableField";
 		$records = DB::query($sql);
 
 		$filter = array('Name' => 'Title', 'ClazzName' => 'FlickrPhotoTO');
 		$sf = SearchableField::get()->filter($filter)->first();
-		$sql = "UPDATE ElasticSearchPage_ElasticaSearchableFields SET Searchable=1,".
-				"EnableAutocomplete=1 where SearchableFieldID=".$sf->ID;
+		$sql = "UPDATE ElasticSearchPage_ElasticaSearchableFields SET Searchable=1," .
+				"EnableAutocomplete=1 where SearchableFieldID=" . $sf->ID;
 
 		DB::query($sql);
 
@@ -43,7 +43,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);

src/SilverStripe/Elastica/ReindexTask.php

Spacing +7 added lines, -7 removed lines

@@ -31,7 +31,7 @@ 
 
 		$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 {
@@ -39,11 +39,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);
 			}
 
@@ -60,10 +60,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 +8 added lines, -8 removed lines

@@ -25,11 +25,11 @@ 
 
 		$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);
 				}
 			}
@@ -42,13 +42,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/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

Doc Comments +16 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
 	 * Note:   characters are stripped from the content; make sure that your assertions take this into account.
 	 *
 	 * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
-	 * @param array|string $expectedMatches The content of at least one of the matched tags
+	 * @param integer $index
 	 * @throws PHPUnit_Framework_AssertionFailedError
 	 * @return boolean
 	 */
@@ -155,7 +155,8 @@ 
 	 * Note:   characters are stripped from the content; make sure that your assertions take this into account.
 	 *
 	 * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
-	 * @param array|string $expectedMatches The content of at least one of the matched tags
+	 * @param integer $index
+	 * @param string $expectedClause
 	 * @throws PHPUnit_Framework_AssertionFailedError
 	 * @return boolean
 	 */
@@ -183,6 +184,12 @@ 
 	/*
 	Check all the nodes matching the selector for attribute name = expected value
 	 */
+
+	/**
+	 * @param string $selector
+	 * @param string $attributeName
+	 * @param string $expectedValue
+	 */
 	public function assertAttributeHasExactValue($selector, $attributeName, $expectedValue) {
 		$items = $this->cssParser()->getBySelector($selector);
 		foreach ($items as $item) {
@@ -191,6 +198,9 @@ 
 	}
 
 
+	/**
+	 * @param string $selector
+	 */
 	public function assertAttributesHaveExactValues($selector, $expectedValues) {
 		$attributeNames = array_keys($expectedValues);
 		$items = $this->cssParser()->getBySelector($selector);
@@ -204,6 +214,10 @@ 
 	}
 
 
+	/**
+	 * @param string $selector
+	 * @param integer $expectedAmount
+	 */
 	public function assertNumberOfNodes($selector, $expectedAmount) {
 		$items = $this->cssParser()->getBySelector($selector);
 		foreach ($items as $item) {

Indentation +9 added lines, -9 removed lines

@@ -150,15 +150,15 @@
 
 
 		/**
-	 *Assert that the indexth matching css node has a prefix as expected
-	 *
-	 * Note:   characters are stripped from the content; make sure that your assertions take this into account.
-	 *
-	 * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
-	 * @param array|string $expectedMatches The content of at least one of the matched tags
-	 * @throws PHPUnit_Framework_AssertionFailedError
-	 * @return boolean
-	 */
+		 *Assert that the indexth matching css node has a prefix as expected
+		 *
+		 * Note:   characters are stripped from the content; make sure that your assertions take this into account.
+		 *
+		 * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
+		 * @param array|string $expectedMatches The content of at least one of the matched tags
+		 * @throws PHPUnit_Framework_AssertionFailedError
+		 * @return boolean
+		 */
 	public function assertSelectorContains($selector, $index, $expectedClause) {
 		$items = $this->cssParser()->getBySelector($selector);
 

Spacing +1 added lines, -1 removed lines

@@ -171,7 +171,7 @@
 
 		$ctr = 0;
 		$item = strip_tags($items[$index]);
-		if ($downcase) {
+		if($downcase) {
 			$item = strtolower($item);
 			$expectedClause = strtolower($expectedClause);
 		}

tests/ElasticSearchPageControllerTest.php

Indentation +19 added lines, -19 removed lines

@@ -74,11 +74,11 @@ 
 		$this->assertEquals(200, $searchPage->getStatusCode());
 		$url = rtrim($url, '/');
 
-        $response = $this->get($url);
+		$response = $this->get($url);
 
-        $this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(200, $response->getStatusCode());
 
-        $this->assertSelectorStartsWithOrEquals('ul.iso span.count', 0, '(5)');
+		$this->assertSelectorStartsWithOrEquals('ul.iso span.count', 0, '(5)');
 		$this->assertSelectorStartsWithOrEquals('ul.iso span.count', 1, '(11)');
 		$this->assertSelectorStartsWithOrEquals('ul.iso span.count', 2, '(12)');
 		$this->assertSelectorStartsWithOrEquals('ul.iso span.count', 3, '(13)');
@@ -128,11 +128,11 @@ 
 		$url = rtrim($url, '/');
 		$url .= '?ISO=400';
 
-        $response = $this->get($url);
+		$response = $this->get($url);
 
-        $this->assertEquals(200, $response->getStatusCode());
+		$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('ul.focal_length span.count', 0, '(2)');
 		$this->assertSelectorStartsWithOrEquals('ul.focal_length span.count', 1, '(1)');
 		$this->assertSelectorStartsWithOrEquals('ul.focal_length span.count', 2, '(2)');
@@ -176,11 +176,11 @@ 
 		$url = rtrim($url, '/');
 		$url .= '?ISO=400&ShutterSpeed=2%2F250';
 
-        $response = $this->get($url);
-        $this->assertEquals(200, $response->getStatusCode());
+		$response = $this->get($url);
+		$this->assertEquals(200, $response->getStatusCode());
 
-        // These are less than in the one facet selected case, as expected
-        $this->assertSelectorStartsWithOrEquals('ul.focal_length span.count', 0, '(1)');
+		// These are less than in the one facet selected case, as expected
+		$this->assertSelectorStartsWithOrEquals('ul.focal_length span.count', 0, '(1)');
 		$this->assertSelectorStartsWithOrEquals('ul.focal_length span.count', 1, '(2)');
 		$this->assertSelectorStartsWithOrEquals('ul.aperture span.count', 0, '(1)');
 		$this->assertSelectorStartsWithOrEquals('ul.aperture span.count', 1, '(1)');
@@ -207,11 +207,11 @@ 
 		$url = rtrim($url, '/');
 		$url .= '?ISO=400&ShutterSpeed=2%2F250&Aspect=Vertical';
 
-        $response = $this->get($url);
-        $this->assertEquals(200, $response->getStatusCode());
+		$response = $this->get($url);
+		$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)');
 	}
@@ -542,13 +542,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 +1 added lines, -1 removed lines

@@ -413,7 +413,7 @@
 		$this->assertEquals(200, $response->getStatusCode());
 
 				// results vary slightly due to sharding, hence check for a string instead of absolute results
-		while ($ctr < 18) {
+		while($ctr < 18) {
 			$this->assertSelectorContains('div.searchResult a', $ctr, 'New', true);
 			$ctr++;
 			$this->assertSelectorStartsWithOrEquals('div.searchResult a', $ctr, 'Similar');

code/ElasticaUtil.php

Indentation +37 added lines, -37 removed lines

@@ -96,20 +96,20 @@ 
 					//Need to check capitalisation of terms suggested that are different
 
 					$chr = mb_substr ($possiblyUppercase, 0, 1, "UTF-8");
-    				if (mb_strtolower($chr, "UTF-8") != $chr) {
-    					$upperLowercaseWord = $lowercaseWord;
-    					$upperLowercaseWord[0] = $chr;
-    					$withHighlights = str_replace($lowercaseWord, $upperLowercaseWord, $possiblyUppercaseHighlighted);
-    					$lowercaseWord[0] = $chr;
-    					array_push($plain, $lowercaseWord);
-    					array_push($highlighted, $withHighlights);
-    				} else {
-    					//No need to capitalise, so add suggested word
-    					array_push($plain, $lowercaseWord);
-
-    					//No need to capitalise, so add suggested highlighted word
-    					array_push($highlighted, $possiblyUppercaseHighlighted);
-    				}
+					if (mb_strtolower($chr, "UTF-8") != $chr) {
+						$upperLowercaseWord = $lowercaseWord;
+						$upperLowercaseWord[0] = $chr;
+						$withHighlights = str_replace($lowercaseWord, $upperLowercaseWord, $possiblyUppercaseHighlighted);
+						$lowercaseWord[0] = $chr;
+						array_push($plain, $lowercaseWord);
+						array_push($highlighted, $withHighlights);
+					} else {
+						//No need to capitalise, so add suggested word
+						array_push($plain, $lowercaseWord);
+
+						//No need to capitalise, so add suggested highlighted word
+						array_push($highlighted, $possiblyUppercaseHighlighted);
+					}
 				}
 			}
 
@@ -140,38 +140,38 @@ 
 	 */
 	public static function parseSuggestionExplanation($explanation) {
 		$explanation = explode('-ConstantScore', $explanation)[0];
-        $bracketPos = strpos($explanation, ')~');
+		$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();
+	   	$terms = array();
 
-        //Field name(s) => terms
-        $splits = explode(' ', $explanation);
+		//Field name(s) => terms
+		$splits = explode(' ', $explanation);
 
-        foreach ($splits as $fieldAndTerm) {
-        	$splits = explode(':', $fieldAndTerm);
+		foreach ($splits as $fieldAndTerm) {
+			$splits = explode(':', $fieldAndTerm);
 
-        	// This is the no terms case
-        	if (sizeof($splits) < 2) {
-        		break;
-        	}
+			// This is the no terms case
+			if (sizeof($splits) < 2) {
+				break;
+			}
 
-        	$fieldname = $splits[0];
-        	$term = $splits[1];
+			$fieldname = $splits[0];
+			$term = $splits[1];
 
-        	if (!isset($terms[$fieldname])) {
-        		$terms[$fieldname] = array();
-        	}
+			if (!isset($terms[$fieldname])) {
+				$terms[$fieldname] = array();
+			}
 
-        	array_push($terms[$fieldname], $term);
-        }
+			array_push($terms[$fieldname], $term);
+		}
 
-        return $terms;
+		return $terms;
 	}
 
 	/**

Spacing +22 added lines, -22 removed lines

@@ -28,7 +28,7 @@ 
 	 * @var string $content Text to display when in command line mode
 	 */
 	public static function message($content) {
-		if (\Director::is_cli() && self::$cli_printer_output === true) {
+		if(\Director::is_cli() && self::$cli_printer_output === true) {
 			echo "$content\n";
 		}
 	}
@@ -53,7 +53,7 @@ 
 		$options = $alternativeQuerySuggestions[0]['options'];
 
 		$resultArray = null;
-		if (sizeof($options) > 0) {
+		if(sizeof($options) > 0) {
 			//take the first suggestion
 			$suggestedPhrase = $options[0]['text'];
 			$suggestedPhraseHighlighted = $options[0]['highlighted'];
@@ -62,10 +62,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);
@@ -76,7 +76,7 @@ 
 			$lowerToUpper = array();
 			$lowerToHighlighted = array();
 			$ctr = 0;
-			foreach ($suggestedParts as $lowercaseWord) {
+			foreach($suggestedParts as $lowercaseWord) {
 				$lowerToUpper[$lowercaseWord] = $originalParts[$ctr];
 				$lowerToHighlighted[$lowercaseWord] = $highlightedParts[$ctr];
 				$ctr++;
@@ -84,19 +84,19 @@ 
 
 			$plain = array();
 			$highlighted = array();
-			foreach ($suggestedParts as $lowercaseWord) {
+			foreach($suggestedParts as $lowercaseWord) {
 				$possiblyUppercase = $lowerToUpper[$lowercaseWord];
 				$possiblyUppercaseHighlighted = $lowerToHighlighted[$lowercaseWord];
 
 				//If the terms are identical other than case, e.g. new => New, then simply swap
-				if (strtolower($possiblyUppercase) == $lowercaseWord) {
+				if(strtolower($possiblyUppercase) == $lowercaseWord) {
 					array_push($plain, $possiblyUppercase);
 					array_push($highlighted, $possiblyUppercase);
 				} else {
 					//Need to check capitalisation of terms suggested that are different
 
-					$chr = mb_substr ($possiblyUppercase, 0, 1, "UTF-8");
-    				if (mb_strtolower($chr, "UTF-8") != $chr) {
+					$chr = mb_substr($possiblyUppercase, 0, 1, "UTF-8");
+    				if(mb_strtolower($chr, "UTF-8") != $chr) {
     					$upperLowercaseWord = $lowercaseWord;
     					$upperLowercaseWord[0] = $chr;
     					$withHighlights = str_replace($lowercaseWord, $upperLowercaseWord, $possiblyUppercaseHighlighted);
@@ -113,9 +113,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);
@@ -142,10 +142,10 @@ 
 		$explanation = explode('-ConstantScore', $explanation)[0];
         $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();
@@ -153,18 +153,18 @@ 
         //Field name(s) => terms
         $splits = explode(' ', $explanation);
 
-        foreach ($splits as $fieldAndTerm) {
+        foreach($splits as $fieldAndTerm) {
         	$splits = explode(':', $fieldAndTerm);
 
         	// This is the no terms case
-        	if (sizeof($splits) < 2) {
+        	if(sizeof($splits) < 2) {
         		break;
         	}
 
         	$fieldname = $splits[0];
         	$term = $splits[1];
 
-        	if (!isset($terms[$fieldname])) {
+        	if(!isset($terms[$fieldname])) {
         		$terms[$fieldname] = array();
         	}
 
@@ -191,8 +191,8 @@ 
 	 * @return function print content to either web browser or command line.  Can be optionally supressed
 	 */
 	public static function getPrinter() {
-		return function ($content) {
-			if (self::$cli_printer_output === true) {
+		return function($content) {
+			if(self::$cli_printer_output === true) {
 				print(\Director::is_cli() ? "T1 $content\n" : "T2 <p>$content</p>");
 			}