gordonbanderson / silverstripe-elastica

tests/SearchableTest.php

Indentation +3 added lines, -3 removed lines

@@ -553,10 +553,10 @@
 		print_r($sr);
 
 
-    	//$sr2 = array('Photographer', 'FlickrTagTOs', 'FlickrSetTOs');
+		//$sr2 = array('Photographer', 'FlickrTagTOs', 'FlickrSetTOs');
 
-    	// MUST REMOVE FIRST.  Otherwise append and the erroroneus value above still exists
-    	$config->remove('FlickrPhotoTO', 'searchable_relationships');
+		// MUST REMOVE FIRST.  Otherwise append and the erroroneus value above still exists
+		$config->remove('FlickrPhotoTO', 'searchable_relationships');
 		$config->update('FlickrPhotoTO' ,'searchable_relationships', $sr);
 	}
 

Spacing +27 added lines, -27 removed lines

@@ -13,7 +13,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;
 
@@ -188,15 +188,15 @@ 
 
 
 		// check strings
-		$shouldBeString = array('Title','Description');
-		$shouldBeInt = array('ISO','FlickrID','FocalLength35mm');
+		$shouldBeString = array('Title', 'Description');
+		$shouldBeInt = array('ISO', 'FlickrID', 'FocalLength35mm');
 		$shouldBeBoolean = array('IsInSiteTree');
 		$shouldBeDouble = array('Aperture');
 		$shouldBeDateTime = array('TakenAt');
 		$shouldBeDate = array('FirstViewed');
 
 		// tokens are strings that have analyzer 'not_analyzed', namely the string is indexed as is
-		$shouldBeTokens = array('ShutterSpeed','Link');
+		$shouldBeTokens = array('ShutterSpeed', 'Link');
 
 
 		// check strings
@@ -213,7 +213,7 @@ 
 
 			// check for unstemmed analaysis
 
-			$this->assertEquals($expectedStandardArray,$fieldProperties['fields']['standard']);
+			$this->assertEquals($expectedStandardArray, $fieldProperties['fields']['standard']);
 
 			// check for only 3 entries
 			$this->assertEquals(4, sizeof(array_keys($fieldProperties)));
@@ -224,7 +224,7 @@ 
 			$fieldProperties = $properties[$fieldName];
 			$type = $fieldProperties['type'];
 			$this->assertEquals(1, sizeof(array_keys($fieldProperties)));
-			$this->assertEquals('integer',$type);
+			$this->assertEquals('integer', $type);
 		}
 
 
@@ -233,7 +233,7 @@ 
 			$fieldProperties = $properties[$fieldName];
 			$type = $fieldProperties['type'];
 			$this->assertEquals(1, sizeof(array_keys($fieldProperties)));
-			$this->assertEquals('double',$type);
+			$this->assertEquals('double', $type);
 		}
 
 		// check boolean
@@ -241,7 +241,7 @@ 
 			$fieldProperties = $properties[$fieldName];
 			$type = $fieldProperties['type'];
 			$this->assertEquals(1, sizeof(array_keys($fieldProperties)));
-			$this->assertEquals('boolean',$type);
+			$this->assertEquals('boolean', $type);
 		}
 
 
@@ -249,7 +249,7 @@ 
 			$fieldProperties = $properties[$fieldName];
 			$type = $fieldProperties['type'];
 			$this->assertEquals(2, sizeof(array_keys($fieldProperties)));
-			$this->assertEquals('date',$type);
+			$this->assertEquals('date', $type);
 			$this->assertEquals('y-M-d', $fieldProperties['format']);
 		}
 
@@ -260,7 +260,7 @@ 
 			$fieldProperties = $properties[$fieldName];
 			$type = $fieldProperties['type'];
 			$this->assertEquals(2, sizeof(array_keys($fieldProperties)));
-			$this->assertEquals('date',$type);
+			$this->assertEquals('date', $type);
 			$this->assertEquals('y-M-d H:m:s', $fieldProperties['format']);
 		}
 
@@ -299,7 +299,7 @@ 
 		$doc = $flickrPhoto->getElasticaDocument()->getData();
 
 		$expected = array();
-		$expected['Title'] = 'Bangkok' ;
+		$expected['Title'] = 'Bangkok';
 		$expected['FlickrID'] = '1234567';
 		$expected['Description'] = 'Test photograph';
 		$expected['TakenAt'] = '2011-07-04 20:36:00';
@@ -388,7 +388,7 @@ 
 		$page = $this->objFromFixture('SiteTree', 'sitetree001');
 		$page->doUnpublish();
 
-		$this->checkNumberOfIndexedDocuments($nDocsAtStart-1);
+		$this->checkNumberOfIndexedDocuments($nDocsAtStart - 1);
 
 		$page->doPublish();
 		$this->checkNumberOfIndexedDocuments($nDocsAtStart);
@@ -481,7 +481,7 @@ 
 		$flickrPhoto = $this->objFromFixture('FlickrPhotoTO', 'photo0001');
 		$fields = $flickrPhoto->getCMSFields();
 
-		$tab = $this->checkTabExists($fields,'ElasticaTermsset');
+		$tab = $this->checkTabExists($fields, 'ElasticaTermsset');
 	}
 
 
@@ -497,7 +497,7 @@ 
 			$this->assertEquals('The field $searchable_fields must be set for the class FlickrPhotoTO', $e->getMessage());
 		}
 
-		$config->update('FlickrPhotoTO' ,'searchable_fields', $sf);
+		$config->update('FlickrPhotoTO', 'searchable_fields', $sf);
 	}
 
 
@@ -513,7 +513,7 @@ 
 			$this->assertEquals('The field $searchable_fields must be set for the class FlickrTagTO', $e->getMessage());
 		}
 
-		$config->update('FlickrTagTO' ,'searchable_fields', $sf);
+		$config->update('FlickrTagTO', 'searchable_fields', $sf);
 
 	}
 
@@ -530,7 +530,7 @@ 
 			$this->assertEquals('The field $searchable_fields must be set for the class FlickrAuthorTO', $e->getMessage());
 		}
 
-		$config->update('FlickrAuthorTO' ,'searchable_fields', $sf);
+		$config->update('FlickrAuthorTO', 'searchable_fields', $sf);
 
 	}
 
@@ -539,7 +539,7 @@ 
 		$config = Config::inst();
 		$sr = $config->get('FlickrPhotoTO', 'searchable_relationships');
 		$config->remove('FlickrPhotoTO', 'searchable_relationships');
-		$config->update('FlickrPhotoTO', 'searchable_relationships',array('thisMethodDoesNotExist'));
+		$config->update('FlickrPhotoTO', 'searchable_relationships', array('thisMethodDoesNotExist'));
 		$fp = Injector::inst()->create('FlickrPhotoTO');
 		try {
 			$fields = $fp->getAllSearchableFields();
@@ -557,7 +557,7 @@ 
 
     	// MUST REMOVE FIRST.  Otherwise append and the erroroneus value above still exists
     	$config->remove('FlickrPhotoTO', 'searchable_relationships');
-		$config->update('FlickrPhotoTO' ,'searchable_relationships', $sr);
+		$config->update('FlickrPhotoTO', 'searchable_relationships', $sr);
 	}
 
 
@@ -669,9 +669,9 @@ 
 
 		$photographer->write();
 
-		$flickrPhoto->PhotographerID = $photographer->ID;;
+		$flickrPhoto->PhotographerID = $photographer->ID; ;
 		$flickrPhoto->write();
-		echo 'ID='.$flickrPhoto->PhotographerID;
+		echo 'ID=' . $flickrPhoto->PhotographerID;
 		$a = $flickrPhoto->getFieldValuesAsArray();
 
 		print_r($a);
@@ -718,7 +718,7 @@ 
 
 
 		$flickrPhoto->write();
-		echo 'ID='.$flickrPhoto->PhotographerID;
+		echo 'ID=' . $flickrPhoto->PhotographerID;
 		$a = $flickrPhoto->getFieldValuesAsArray();
 
 		print_r($a);
@@ -766,15 +766,15 @@ 
 			foreach ($tab->FieldList() as $field) {
 				array_push($tabFields, $field->getName());
 			}
-			$expectedName = 'TermsFor'.$tab->getName();;
+			$expectedName = 'TermsFor' . $tab->getName(); ;
 			$expected = array($expectedName);
 			$this->assertEquals($expected, $tabFields);
 			array_push($tabNames, $tab->getName());
 		}
-		$expected = array('Description','Description_shingles','Description_standard',
-			'ShutterSpeed',  'TestMethod', 'TestMethod_shingles', 'TestMethod_standard',
+		$expected = array('Description', 'Description_shingles', 'Description_standard',
+			'ShutterSpeed', 'TestMethod', 'TestMethod_shingles', 'TestMethod_standard',
 			'TestMethodHTML', 'TestMethodHTML_shingles', 'TestMethodHTML_standard',
-			'Title','Title_autocomplete','Title_shingles','Title_standard');
+			'Title', 'Title_autocomplete', 'Title_shingles', 'Title_standard');
 
 		$this->assertEquals($expected, $tabNames);
 	}
@@ -798,13 +798,13 @@ 
 			foreach ($tab->FieldList() as $field) {
 				array_push($tabFields, $field->getName());
 			}
-			$expectedName = 'TermsFor'.$tab->getName();;
+			$expectedName = 'TermsFor' . $tab->getName(); ;
 			$expected = array($expectedName);
 			$this->assertEquals($expected, $tabFields);
 			array_push($tabNames, $tab->getName());
 		}
 		$expected = array(
-			'Content','Content_standard','Link','Title','Title_autocomplete','Title_shingles',
+			'Content', 'Content_standard', 'Link', 'Title', 'Title_autocomplete', 'Title_shingles',
 			'Title_standard');
 		$this->generateAssertionsFromArray1D($tabNames);
 		$this->assertEquals($expected, $tabNames);

Doc Comments +3 added lines

@@ -479,6 +479,9 @@
 	}
 
 
+	/**
+	 * @param string $query
+	 */
 	private function getResultsFor($query, $pageLength = 10, $fields = array('Title' => 1, 'Description' => 1)) {
 		$es = new ElasticSearcher();
 		$es->setStart(0);

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/SearchableFieldTest.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 
 		$fields = $sf->getCMSFields();
 
-		$tab = $this->checkTabExists($fields,'Main');
+		$tab = $this->checkTabExists($fields, 'Main');
 
 		//Check fields
 		$nf = $this->checkFieldExists($tab, 'Name');
@@ -45,7 +45,7 @@ 
 			$this->fail('Searchable fail should have failed to write');
 		} catch (ValidationException $e) {
 			$this->assertInstanceOf('ValidationException', $e);
-			$expected = 'The field SearchableTestPage.Title has a zero weight. ; The field '.
+			$expected = 'The field SearchableTestPage.Title has a zero weight. ; The field ' .
 			'SiteTree.Title has a zero weight. ; The field Page.Title has a zero weight. ';
 			$this->assertEquals($expected, $e->getMessage());
 		}
@@ -76,7 +76,7 @@ 
 			$this->fail('Searchable fail should have failed to write');
 		} catch (ValidationException $e) {
 			$this->assertInstanceOf('ValidationException', $e);
-			$expected = 'The field SearchableTestPage.Title has a negative weight. ; The field '.
+			$expected = 'The field SearchableTestPage.Title has a negative weight. ; The field ' .
 			'SiteTree.Title has a negative weight. ; The field Page.Title has a negative weight. ';
 			$this->assertEquals($expected, $e->getMessage());
 		}

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 +8 added lines, -8 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,
     	);
@@ -183,7 +183,7 @@ 
 
 		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;
@@ -200,8 +200,8 @@ 
 			}
 
 		} else if (sizeof($sortable) == 2) {
-			$sortable = floatval($sortable[0])/intval($sortable[1]);
-			$sortable = round($sortable,6);
+			$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 +3 added lines, -3 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');
@@ -123,8 +123,8 @@ 
 					$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'];
 				}
 

tests/ElasticSearchPageTest.php

Spacing +23 added lines, -23 removed lines

@@ -13,15 +13,15 @@ 
 
 		$fields = $searchPage->getCMSFields();
 
-		$mainTab = $this->checkTabExists($fields,'Main');
+		$mainTab = $this->checkTabExists($fields, 'Main');
 		$this->checkFieldExists($mainTab, 'Identifier');
 		$this->checkFieldExists($mainTab, 'ContentForEmptySearch');
 
-		$searchTab = $this->checkTabExists($fields,'Search.SearchFor');
-		$fieldsTab = $this->checkTabExists($fields,'Search.Fields');
-		$autoCompleteTab = $this->checkTabExists($fields,'Search.AutoComplete');
-		$aggTab = $this->checkTabExists($fields,'Search.Aggregations');
-		$simTab = $this->checkTabExists($fields,'Search.Similarity');
+		$searchTab = $this->checkTabExists($fields, 'Search.SearchFor');
+		$fieldsTab = $this->checkTabExists($fields, 'Search.Fields');
+		$autoCompleteTab = $this->checkTabExists($fields, 'Search.AutoComplete');
+		$aggTab = $this->checkTabExists($fields, 'Search.Aggregations');
+		$simTab = $this->checkTabExists($fields, 'Search.Similarity');
 
 		$this->checkFieldExists($searchTab, 'InfoField');
 		$this->checkFieldExists($searchTab, 'SiteTreeOnly');
@@ -185,7 +185,7 @@ 
 		$pageLength = 10; // the default
 		$searchPageObj->ResultsPerPage = $pageLength;
 		$searchPageObj->write();
-		$searchPageObj->publish('Stage','Live');
+		$searchPageObj->publish('Stage', 'Live');
 
 		$form = $searchPageObj->SearchForm();
 		$fields = $form->Fields();
@@ -317,11 +317,11 @@ 
 		$filter = array('ClazzName' => 'FlickrPhotoTO', 'Name' => 'Title');
 
 		//Check fieldnames as expected
-		$searchableFields = $searchPage->ElasticaSearchableFields()->filter('Active',1);
+		$searchableFields = $searchPage->ElasticaSearchableFields()->filter('Active', 1);
 		$sfs = $searchableFields->map('Name')->toArray();
 		sort($sfs);
-		$expected = array('Aperture','AspectRatio','Description','FirstViewed','FlickrID',
-			'FlickrSetTOs','FlickrTagTOs','FocalLength35mm','ISO','Photographer','ShutterSpeed',
+		$expected = array('Aperture', 'AspectRatio', 'Description', 'FirstViewed', 'FlickrID',
+			'FlickrSetTOs', 'FlickrTagTOs', 'FocalLength35mm', 'ISO', 'Photographer', 'ShutterSpeed',
 			'TakenAt', 'TakenAtDT', 'TestMethod', 'TestMethodHTML', 'Title');
 		$this->assertEquals($expected, $sfs);
 
@@ -331,7 +331,7 @@ 
 		$searchPage->Title = '**** SiteTree Search ****';
 		$searchPage->write();
 
-		$searchableFields = $searchPage->ElasticaSearchableFields()->filter('Active',1);
+		$searchableFields = $searchPage->ElasticaSearchableFields()->filter('Active', 1);
 		$sfs = $searchableFields->map('Name')->toArray();
 		sort($sfs);
 		$expected = array('Content', 'Country', 'PageDate', 'Title');
@@ -351,15 +351,15 @@ 
 		// expected mapping of searchable classes to searchable fields that will be
 		// stored in the database as SearchableClass and SearchableField
 		$expected = array(
-			'Page' => array('Title','Content'),
-			'SiteTree' => array('Title','Content'),
-			'SearchableTestPage' => array('Title','Content','Country','PageDate'),
+			'Page' => array('Title', 'Content'),
+			'SiteTree' => array('Title', 'Content'),
+			'SearchableTestPage' => array('Title', 'Content', 'Country', 'PageDate'),
 			'FlickrTagTO' => array('RawValue'),
-			'FlickrAuthorTO' => array('PathAlias','DisplayName','FlickrPhotoTOs'),
-			'FlickrPhotoTO' => array('Title','FlickrID','Description','TakenAt', 'TakenAtDT', 'Aperture',
-				'ShutterSpeed','FocalLength35mm','ISO','Photographer','FlickrTagTOs','FlickrSetTOs',
-				'FirstViewed','AspectRatio', 'TestMethod', 'TestMethodHTML'),
-			'FlickrSetTO' => array('Title','FlickrID','Description')
+			'FlickrAuthorTO' => array('PathAlias', 'DisplayName', 'FlickrPhotoTOs'),
+			'FlickrPhotoTO' => array('Title', 'FlickrID', 'Description', 'TakenAt', 'TakenAtDT', 'Aperture',
+				'ShutterSpeed', 'FocalLength35mm', 'ISO', 'Photographer', 'FlickrTagTOs', 'FlickrSetTOs',
+				'FirstViewed', 'AspectRatio', 'TestMethod', 'TestMethodHTML'),
+			'FlickrSetTO' => array('Title', 'FlickrID', 'Description')
 		);
 
 		// check the expected classes
@@ -383,18 +383,18 @@ 
 		foreach ($expectedClasses as $expectedClass) {
 			$expectedFields = array();
 			$sc = SearchableClass::get()->filter('Name', $expectedClass)->first();
-			$this->assertEquals($expectedClass,$sc->Name);
+			$this->assertEquals($expectedClass, $sc->Name);
 
 			$inSiteTree = 1;
-			$start = substr($expectedClass, 0,6);
+			$start = substr($expectedClass, 0, 6);
 			if ($start == 'Flickr') {
 				$inSiteTree = 0;
 			};
-			$this->assertEquals($inSiteTree,$sc->InSiteTree);
+			$this->assertEquals($inSiteTree, $sc->InSiteTree);
 
 			$expectedNames = $expected[$expectedClass];
 			foreach ($expectedNames as $expectedName) {
-				$filter = array('Name' => $expectedName, 'SearchableClassID' => $sc->ID );
+				$filter = array('Name' => $expectedName, 'SearchableClassID' => $sc->ID);
 				$sf = SearchableField::get()->filter($filter)->first();
 				$this->assertEquals($expectedName, $sf->Name);
 				$fieldCtr++;