gordonbanderson / silverstripe-elastica

code/ElasticaUtil.php

Indentation +38 added lines, -38 removed lines

@@ -92,26 +92,26 @@ 
 					//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;
+					if (mb_strtolower($chr, "UTF-8") != $chr) {
+						$upperLowercaseWord = $lowercaseWord;
+						$upperLowercaseWord[0] = $chr;
 
-    					//$possiblyUppercaseHighlighted = str_replace($lowercaseWord, $possiblyUppercase, $possiblyUppercaseHighlighted);
-    					$withHighlights = str_replace($lowercaseWord, $upperLowercaseWord, $possiblyUppercaseHighlighted);
+						//$possiblyUppercaseHighlighted = str_replace($lowercaseWord, $possiblyUppercase, $possiblyUppercaseHighlighted);
+						$withHighlights = str_replace($lowercaseWord, $upperLowercaseWord, $possiblyUppercaseHighlighted);
 
-    					$lowercaseWord[0] = $chr;
+						$lowercaseWord[0] = $chr;
 
-    					//str_replace(search, replace, subject)
+						//str_replace(search, replace, subject)
 
-    					array_push($plain, $lowercaseWord);
-    					array_push($highlighted, $withHighlights);
-    				} else {
-    					//No need to capitalise, so add suggested word
-    					array_push($plain, $lowercaseWord);
+						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);
-    				}
+						//No need to capitalise, so add suggested highlighted word
+						array_push($highlighted, $possiblyUppercaseHighlighted);
+					}
 				}
 			}
 
@@ -144,37 +144,37 @@ 
 
 		$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;
 	}
 }

Doc Comments +2 added lines, -1 removed lines

@@ -196,7 +196,7 @@ 
 	}
 
 	/**
-	 * @return function print content to either web browser or command line.  Can be optionally supressed
+	 * @return \Closure print content to either web browser or command line.  Can be optionally supressed
 	 */
 	public static function getPrinter() {
 		return function ($content) {
@@ -211,6 +211,7 @@ 
 	 * Set to true to show output on the command line or browser, false to not
 	 *
 	 * @param   $newcli_printer_output true to show output, false to hide it
+	 * @param boolean $new_cli_printer_output
 	 */
 	public static function setPrinterOutput($new_cli_printer_output) {
 		self::$cli_printer_output = $new_cli_printer_output;

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;
 
@@ -119,9 +119,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);
@@ -150,10 +150,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();
@@ -161,18 +161,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();
         	}
 
@@ -199,8 +199,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>");
 			}
 

tests/AutoCompleteOptionTest.php

Spacing +3 added lines, -3 removed lines

@@ -31,13 +31,13 @@
 	public function testRequireDefaultRecords() {
 		$this->AutoCompleteOption->requireDefaultRecords();
 
-		$similar = AutoCompleteOption::get()->filter('Name','Similar')->first();
+		$similar = AutoCompleteOption::get()->filter('Name', 'Similar')->first();
 		$this->assertEquals(1, $similar->ID);
 
-		$search = AutoCompleteOption::get()->filter('Name','Search')->first();
+		$search = AutoCompleteOption::get()->filter('Name', 'Search')->first();
 		$this->assertEquals(2, $search->ID);
 
-		$goto = AutoCompleteOption::get()->filter('Name','GoToRecord')->first();
+		$goto = AutoCompleteOption::get()->filter('Name', 'GoToRecord')->first();
 		$this->assertEquals(3, $goto->ID);
 
 	}

tests/SearchableClassTest.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 		$fields = $sc->getCMSFields();
 
-		$tab = $this->checkTabExists($fields,'Main');
+		$tab = $this->checkTabExists($fields, 'Main');
 
 		//Check fields
 		$nf = $this->checkFieldExists($tab, 'Name');

tests/IndexSettingsTest.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,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;
 

tests/models/FlickrModels.php

Indentation +26 added lines, -26 removed lines

@@ -139,37 +139,37 @@ 
 	 * Add a mapping for the location of the photograph
 	 */
 	public function updateElasticsearchMapping(\Elastica\Type\Mapping $mapping)
-    {
-    	// get the properties of the individual fields as an array
-    	$properties = $mapping->getProperties();
-
-    	// add a location with geo point
-    	$precision1cm = array('format' => 'compressed', 'precision' => '1cm');
-    	$properties['location'] =  array(
-    		'type' => 'geo_point',
-    		'fielddata' => $precision1cm,
-    	);
-
-    	$properties['ShutterSpeed'] = array(
-    		'type' => 'string',
-    		'index' => 'not_analyzed'
+	{
+		// get the properties of the individual fields as an array
+		$properties = $mapping->getProperties();
+
+		// add a location with geo point
+		$precision1cm = array('format' => 'compressed', 'precision' => '1cm');
+		$properties['location'] =  array(
+			'type' => 'geo_point',
+			'fielddata' => $precision1cm,
 		);
 
-    	$properties['Aperture'] = array(
-    		// do not use float as the rounding makes facets impossible
-    		'type' => 'double'
-    	);
+		$properties['ShutterSpeed'] = array(
+			'type' => 'string',
+			'index' => 'not_analyzed'
+		);
 
-    	$properties['FlickrID'] = array('type' => 'integer');
+		$properties['Aperture'] = array(
+			// do not use float as the rounding makes facets impossible
+			'type' => 'double'
+		);
 
-    	// by default casted as a string, we want a date 2015-07-25 18:15:33 y-M-d H:m:s
-     	//$properties['TakenAt'] = array('type' => 'date', 'format' => 'y-M-d H:m:s');
+		$properties['FlickrID'] = array('type' => 'integer');
 
-    	// set the new properties on the mapping
-    	$mapping->setProperties($properties);
+		// by default casted as a string, we want a date 2015-07-25 18:15:33 y-M-d H:m:s
+	 	//$properties['TakenAt'] = array('type' => 'date', 'format' => 'y-M-d H:m:s');
 
-        return $mapping;
-    }
+		// set the new properties on the mapping
+		$mapping->setProperties($properties);
+
+		return $mapping;
+	}
 
 
 	/**
@@ -205,7 +205,7 @@ 
 		}
 		$sortable = $sortable . '|' . $this->owner->ShutterSpeed;
 		$document->set('ShutterSpeed', $sortable);
-	    return $document;
+		return $document;
 	}
 
 

Spacing +13 added lines, -13 removed lines

@@ -6,8 +6,8 @@ 
  * @subpackage tests
  */
 class FlickrPhotoTO extends DataObject implements TestOnly {
-	private static $searchable_fields = array('Title','FlickrID','Description','TakenAt', 'TakenAtDT', 'FirstViewed',
-		'Aperture','ShutterSpeed','FocalLength35mm','ISO','AspectRatio', 'TestMethod', 'TestMethodHTML');
+	private static $searchable_fields = array('Title', 'FlickrID', 'Description', 'TakenAt', 'TakenAtDT', 'FirstViewed',
+		'Aperture', 'ShutterSpeed', 'FocalLength35mm', 'ISO', 'AspectRatio', 'TestMethod', 'TestMethodHTML');
 
 	private static $searchable_relationships = array('Photographer', 'FlickrTagTOs', 'FlickrSetTOs');
 
@@ -88,7 +88,7 @@ 
  * @subpackage tests
  */
 class FlickrSetTO extends DataObject implements TestOnly {
-	private static $searchable_fields = array('Title','FlickrID','Description');
+	private static $searchable_fields = array('Title', 'FlickrID', 'Description');
 
 	private static $db = array(
 		'Title' => 'Varchar(255)',
@@ -133,7 +133,7 @@ 
 
 
 
-class FlickrPhotoTOTestIndexingExtension extends Extension implements ElasticaIndexingHelperInterface,TestOnly {
+class FlickrPhotoTOTestIndexingExtension extends Extension implements ElasticaIndexingHelperInterface, TestOnly {
 
 	/**
 	 * Add a mapping for the location of the photograph
@@ -145,7 +145,7 @@ 
 
     	// add a location with geo point
     	$precision1cm = array('format' => 'compressed', 'precision' => '1cm');
-    	$properties['location'] =  array(
+    	$properties['location'] = array(
     		'type' => 'geo_point',
     		'fielddata' => $precision1cm,
     	);
@@ -181,27 +181,27 @@ 
 	{
 	//	self::$ctr++;
 
-		if ($this->owner->Lat != null && $this->owner->Lon != null) {
+		if($this->owner->Lat != null && $this->owner->Lon != null) {
 			$coors = array('lat' => $this->owner->Lat, 'lon' => $this->owner->Lon);
-			$document->set('location',$coors);
+			$document->set('location', $coors);
 		}
 
 		$sortable = $this->owner->ShutterSpeed;
 		$sortable = explode('/', $sortable);
-		if (sizeof($sortable) == 1) {
+		if(sizeof($sortable) == 1) {
 			$sortable = trim($sortable[0]);
 
-			if ($this->owner->ShutterSpeed == null) {
+			if($this->owner->ShutterSpeed == null) {
 				$sortable = null;
 			}
 
-			if ($sortable == 1) {
+			if($sortable == 1) {
 				$sortable = '1.000000';
 			}
 
-		} else if (sizeof($sortable) == 2) {
-			$sortable = floatval($sortable[0])/intval($sortable[1]);
-			$sortable = round($sortable,6);
+		} else if(sizeof($sortable) == 2) {
+			$sortable = floatval($sortable[0]) / intval($sortable[1]);
+			$sortable = round($sortable, 6);
 		}
 		$sortable = $sortable . '|' . $this->owner->ShutterSpeed;
 		$document->set('ShutterSpeed', $sortable);

tests/models/SearchableTestPage.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
  * @subpackage tests
  */
 class SearchableTestPage extends Page implements TestOnly {
-	private static $searchable_fields = array('Country','PageDate');
+	private static $searchable_fields = array('Country', 'PageDate');
 
 	private static $db = array(
 		'Country' => 'Varchar',

tests/models/FlickrPhotoElasticaSearchHelper.php

Indentation +6 added lines, -6 removed lines

@@ -10,11 +10,11 @@ 
 
 	public function __construct() {
 		$aspectAgg = new RangedAggregation('Aspect', 'AspectRatio');
-        $aspectAgg->addRange(0.0000001, 0.3, 'Panoramic');
-        $aspectAgg->addRange(0.3, 0.9, 'Horizontal');
-        $aspectAgg->addRange(0.9, 1.2, 'Square');
-        $aspectAgg->addRange(1.2, 1.79, 'Vertical');
-        $aspectAgg->addRange(1.79, 1e7, 'Tallest');
+		$aspectAgg->addRange(0.0000001, 0.3, 'Panoramic');
+		$aspectAgg->addRange(0.3, 0.9, 'Horizontal');
+		$aspectAgg->addRange(0.9, 1.2, 'Square');
+		$aspectAgg->addRange(1.2, 1.79, 'Vertical');
+		$aspectAgg->addRange(1.79, 1e7, 'Tallest');
 	}
 
 	private static $titleFieldMapping = array(
@@ -73,7 +73,7 @@ 
 
 
 		$aspectRangedAgg = RangedAggregation::getByTitle('Aspect');
-        $query->addAggregation($aspectRangedAgg->getRangeAgg());
+		$query->addAggregation($aspectRangedAgg->getRangeAgg());
 
 		// leave this out for the moment as way too many terms being returned slowing things down
 		/*

Spacing +10 added lines, -10 removed lines

@@ -6,7 +6,7 @@ 
 use SilverStripe\Elastica\RangedAggregation;
 
 
-class FlickrPhotoTOElasticaSearchHelper implements ElasticaSearchHelperInterface,TestOnly {
+class FlickrPhotoTOElasticaSearchHelper implements ElasticaSearchHelperInterface, TestOnly {
 
 	public function __construct() {
 		$aspectAgg = new RangedAggregation('Aspect', 'AspectRatio');
@@ -36,7 +36,7 @@ 
 			'query_string' => array('query' => '*')
 		);
 
-		if ($query->OriginalQueryText == '') {
+		if($query->OriginalQueryText == '') {
 			$query->setSort(array('TakenAt'=> 'desc'));
 		}
 
@@ -104,27 +104,27 @@ 
 		// shutter speed is stored as decimal to 6 decimal places, then a
 		// vertical bar followed by the displayed speed as a fraction or a
 		// whole number.  This puts the decimal back for matching purposes
-		if (isset($filters['ShutterSpeed'])) {
+		if(isset($filters['ShutterSpeed'])) {
 
 			$sortable = $filters['ShutterSpeed'];
 
 			echo "SORTABLE:$sortable\n";
 
 			$sortable = explode('/', $sortable);
-			if (sizeof($sortable) == 1) {
+			if(sizeof($sortable) == 1) {
 				$sortable = trim($sortable[0]);
 
-				if ($sortable === '1') {
+				if($sortable === '1') {
 					$sortable = '1.000000|1';
 				}
 
-			} else if (sizeof($sortable) == 2) {
-				if ($sortable[0] === '' || $sortable[1] === '') {
+			} else if(sizeof($sortable) == 2) {
+				if($sortable[0] === '' || $sortable[1] === '') {
 					$sortable = '';
 
 				} else {
-					$sortable = floatval($sortable[0])/intval($sortable[1]);
-					$sortable = round($sortable,6);
+					$sortable = floatval($sortable[0]) / intval($sortable[1]);
+					$sortable = round($sortable, 6);
 					$sortable = $sortable . '|' . $filters['ShutterSpeed'];
 				}
 
@@ -147,7 +147,7 @@ 
 		// the shutter speeds are of the form decimal number | fraction, keep the latter half
 		$shutterSpeeds = $aggs['ShutterSpeed']['buckets'];
 		$ctr = 0;
-		foreach ($shutterSpeeds as $bucket) {
+		foreach($shutterSpeeds as $bucket) {
 			$key = $bucket['key'];
 			$splits = explode('|', $key);
 			$shutterSpeeds[$ctr]['key'] = end($splits);

tests/TermVectorTest.php

Spacing +2 added lines, -2 removed lines

@@ -17,8 +17,8 @@
 		sort($terms);
 		$expected = array('Description', 'Description.shingles', 'Description.standard',
 			'ShutterSpeed',
-			'TestMethod','TestMethod.shingles','TestMethod.standard',
-			'TestMethodHTML','TestMethodHTML.shingles','TestMethodHTML.standard',
+			'TestMethod', 'TestMethod.shingles', 'TestMethod.standard',
+			'TestMethodHTML', 'TestMethodHTML.shingles', 'TestMethodHTML.standard',
 			'Title', 'Title.autocomplete', 'Title.shingles', 'Title.standard');
 		$this->assertEquals($expected, $terms);
 

tests/QueryGeneratorTest.php

Spacing +27 added lines, -27 removed lines

@@ -122,7 +122,7 @@ 
 
 		$qg->setShowResultsForEmptyQuery(false);
 		$qs = array('multi_match' => array(
-			'fields' => array('Title','Title.*','Description','Description.*'),
+			'fields' => array('Title', 'Title.*', 'Description', 'Description.*'),
 			'type' => 'most_fields',
 			'query' => 'New Zealand',
 			'lenient' => true
@@ -158,7 +158,7 @@ 
 		$qg->setShowResultsForEmptyQuery(false);
 		$qs = array(
 			'multi_match' => array(
-				'fields' => array('Title','Title.*','Description','Description.*'),
+				'fields' => array('Title', 'Title.*', 'Description', 'Description.*'),
 				'type' => 'most_fields',
 				'query' => '',
 				'lenient' => true
@@ -369,8 +369,8 @@ 
 				'filtered' => array(
 					'filter' =>
 					array('and' => array(
-						0 => array( 'term' =>  array('ISO' => 400)),
-						1 => array( 'range' => array(
+						0 => array('term' =>  array('ISO' => 400)),
+						1 => array('range' => array(
 							'AspectRatio' => array(
 								'gte' => '0.9',
 								'lt' => '1.2'
@@ -413,14 +413,14 @@ 
 			'query' => array(
 				'filtered' => array('filter' =>
 					array('and' => array(
-						0 => array( 'term' =>  array('ISO' => 400)),
-						1 => array( 'range' => array(
+						0 => array('term' =>  array('ISO' => 400)),
+						1 => array('range' => array(
 							'AspectRatio' => array(
 								'gte' => '0.9',
 								'lt' => '1.2'
 							)
 						)),
-						2 => array( 'term' =>  array('Aperture' => 5.6)),
+						2 => array('term' =>  array('Aperture' => 5.6)),
 					)
 				))
 			),
@@ -472,7 +472,7 @@ 
 		$expected['query']['filtered']['query']['multi_match'] = array(
 			'query' => 'New Zealand',
 			'lenient' => true,
-			'fields' => array('Title^2', 'Title.*^2','Content', 'Content.*'),
+			'fields' => array('Title^2', 'Title.*^2', 'Content', 'Content.*'),
 			'type' => 'most_fields'
 		);
 
@@ -503,8 +503,8 @@ 
 				'filtered' => array(
 					'filter' =>
 					array('and' => array(
-						0 => array( 'term' =>  array('ISO' => 400)),
-						1 => array( 'range' => array(
+						0 => array('term' =>  array('ISO' => 400)),
+						1 => array('range' => array(
 							'AspectRatio' => array(
 								'gte' => '0.9',
 								'lt' => '1.2'
@@ -525,7 +525,7 @@ 
 		$expected['query']['filtered']['query']['multi_match'] = array(
 			'query' => 'New Zealand',
 			'lenient' => true,
-			'fields' => array('Title^2', 'Title.*^2','Content', 'Content.*'),
+			'fields' => array('Title^2', 'Title.*^2', 'Content', 'Content.*'),
 			'type' => 'most_fields'
 		);
 		$expected['suggest'] = $this->getDefaultSuggest('New Zealand');
@@ -553,14 +553,14 @@ 
 			'query' => array(
 				'filtered' => array('filter' =>
 					array('and' => array(
-						0 => array( 'term' =>  array('ISO' => 400)),
-						1 => array( 'range' => array(
+						0 => array('term' =>  array('ISO' => 400)),
+						1 => array('range' => array(
 							'AspectRatio' => array(
 								'gte' => '0.9',
 								'lt' => '1.2'
 							)
 						)),
-						2 => array( 'term' =>  array('Aperture' => 5.6)),
+						2 => array('term' =>  array('Aperture' => 5.6)),
 					)
 				))
 			),
@@ -575,7 +575,7 @@ 
 		$expected['query']['filtered']['query']['multi_match'] = array(
 			'query' => 'New Zealand',
 			'lenient' => true,
-			'fields' => array('Title^2', 'Title.*^2','Content', 'Content.*'),
+			'fields' => array('Title^2', 'Title.*^2', 'Content', 'Content.*'),
 			'type' => 'most_fields'
 		);
 		$expected['suggest'] = $this->getDefaultSuggest('New Zealand');
@@ -590,7 +590,7 @@ 
 		$qg = new QueryGenerator();
 		$qg->setClasses('FlickrPhotoTO');
 		$fields = array('Title' => 1, 'Description' => 1);
-		$expected = array('Title', 'Title.*','Description', 'Description.*');
+		$expected = array('Title', 'Title.*', 'Description', 'Description.*');
 		$this->assertEquals($expected, $qg->convertWeightedFieldsForElastica($fields));
 	}
 
@@ -599,7 +599,7 @@ 
 		$qg = new QueryGenerator();
 		$qg->setClasses('FlickrPhotoTO');
 		$fields = array('Title' => 2, 'Description' => 1);
-		$expected = array('Title^2', 'Title.*^2','Description', 'Description.*');
+		$expected = array('Title^2', 'Title.*^2', 'Description', 'Description.*');
 		$this->assertEquals($expected, $qg->convertWeightedFieldsForElastica($fields));
 	}
 
@@ -631,10 +631,10 @@ 
 		$qg = new QueryGenerator();
 		$qg->setClasses('FlickrPhotoTO,Page');
 		$fields = array('Title' => 2, 'Description' => 1);
-		$expected = array('Title^2', 'Title.*^2','Description', 'Description.*');
+		$expected = array('Title^2', 'Title.*^2', 'Description', 'Description.*');
 		$this->assertEquals($expected, $qg->convertWeightedFieldsForElastica($fields));
 
-		$qg->setClasses(array('FlickrPhotoTO','Page'));
+		$qg->setClasses(array('FlickrPhotoTO', 'Page'));
 		$this->assertEquals($expected, $qg->convertWeightedFieldsForElastica($fields));
 
 	}
@@ -648,7 +648,7 @@ 
 		$qg = new QueryGenerator();
 		$qg->setClasses('FlickrPhotoTO,Page');
 		$fields = array('Title' => 2, 'Description' => 1);
-		$expected = array('Title^2', 'Title.*^2','Description', 'Description.*');
+		$expected = array('Title^2', 'Title.*^2', 'Description', 'Description.*');
 		$this->assertEquals($expected, $qg->convertWeightedFieldsForElastica($fields));
 
 		//Execute a 2nd time
@@ -667,11 +667,11 @@ 
 		$qg = new QueryGenerator();
 		$qg->setClasses(null); // select all of site tree classes
 		$fields = array('Title' => 2, 'Content' => 1);
-		$expected = array('Title^2', 'Title.*^2','Content', 'Content.*');
+		$expected = array('Title^2', 'Title.*^2', 'Content', 'Content.*');
 		$this->assertEquals($expected, $qg->convertWeightedFieldsForElastica($fields));
 
 		echo "--------------------\n";
-		$qg->setClasses(array('FlickrPhotoTO','Page'));
+		$qg->setClasses(array('FlickrPhotoTO', 'Page'));
 		$this->assertEquals($expected, $qg->convertWeightedFieldsForElastica($fields));
 
 	}
@@ -720,21 +720,21 @@ 
 				'order' => array('_term' => 'asc')
 			)
 		);
-		$result['ShutterSpeed'] =  array(
+		$result['ShutterSpeed'] = array(
 			'terms' => array(
 				'field' => 'ShutterSpeed',
 				'size' => 0,
 				'order' => array('_term' => 'asc')
 			)
 		);
-		$result['FocalLength35mm'] =  array(
+		$result['FocalLength35mm'] = array(
 			'terms' => array(
 				'field' => 'FocalLength35mm',
 				'size' => 0,
 				'order' => array('_term' => 'asc')
 			)
 		);
-		$result['ISO'] =  array(
+		$result['ISO'] = array(
 			'terms' => array(
 				'field' => 'ISO',
 				'size' => 0,
@@ -749,7 +749,7 @@ 
 		$ranges[3] = array('from' => '1.2', 'to' => '1.79', 'key' => 'Vertical');
 		$ranges[4] = array('from' => '1.79', 'to' => '10000000', 'key' => 'Tallest');
 
-		$result['Aspect'] =  array(
+		$result['Aspect'] = array(
 			'range' => array(
 				'field' => 'AspectRatio',
 				'ranges' => $ranges
@@ -769,7 +769,7 @@ 
 
 	public function testToQuotedCSVFromArray() {
 		$expected = "'Bangkok','Nonthaburi','Saraburi','Chiang Mai'";
-		$items = array('Bangkok','Nonthaburi','Saraburi','Chiang Mai');
+		$items = array('Bangkok', 'Nonthaburi', 'Saraburi', 'Chiang Mai');
 		$quoted = QueryGenerator::convertToQuotedCSV($items);
 		$this->assertEquals($expected, $quoted);
 	}