gordonbanderson / silverstripe-elastica

tests/TranslatableUnitTest.php

Doc Comments +3 added lines

@@ -233,6 +233,9 @@
 
 
 
+	/**
+	 * @param PaginatedList $paginated
+	 */
 	private function makeCode($paginated) {
 		$results = $paginated->getList()->toArray();
 		$ctr = 0;

Spacing +18 added lines, -18 removed lines

@@ -42,21 +42,21 @@ 
 		$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');
 			}
 		}
 	}
@@ -69,7 +69,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);
 		}
 	}
@@ -89,11 +89,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";
 		}
 
@@ -110,7 +110,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');
 
@@ -143,8 +143,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();
@@ -179,7 +179,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);
@@ -194,8 +194,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();
@@ -236,9 +236,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++;
 		}
 	}

code/SearchableClass.php

Indentation +12 added lines, -12 removed lines

@@ -29,20 +29,20 @@ 
 		$config->removeComponent($config->getComponentByType('GridFieldDeleteAction'));
 
 		$config->getComponentByType('GridFieldDataColumns')->setDisplayFields(array(
-            'Name' => 'Name',
-            'Weight' => 'Weighting',
-            'Searchable' => 'Search this field?'
-        ));
+			'Name' => 'Name',
+			'Weight' => 'Weighting',
+			'Searchable' => 'Search this field?'
+		));
 
 
-        $gridField = new GridField(
-            'SearchableField', // Field name
-            'Field Name', // Field title
-            SearchableField::get()->filter('SearchableClassID', $this->ID)->sort('Name'),
-            $config
-        );
+		$gridField = new GridField(
+			'SearchableField', // Field name
+			'Field Name', // Field title
+			SearchableField::get()->filter('SearchableClassID', $this->ID)->sort('Name'),
+			$config
+		);
 
-        $fields->addFieldToTab('Root.Main', $gridField);
+		$fields->addFieldToTab('Root.Main', $gridField);
 
 		/*
 	    $fields = new FieldList();
@@ -50,7 +50,7 @@ 
 
 
         */
-	    return $fields;
+		return $fields;
 	}
 
 

Spacing +3 added lines, -3 removed lines

@@ -15,10 +15,10 @@
 
 		$fields = new FieldList();
 
-		$fields->push( new TabSet( "Root", $mainTab = new Tab( "Main" ) ) );
-		$mainTab->setTitle( _t( 'SiteTree.TABMAIN', "Main" ) );
+		$fields->push(new TabSet("Root", $mainTab = new Tab("Main")));
+		$mainTab->setTitle(_t('SiteTree.TABMAIN', "Main"));
 
-		$fields->addFieldToTab( 'Root.Main',  $nf = new TextField( 'Name', 'Name') );
+		$fields->addFieldToTab('Root.Main', $nf = new TextField('Name', 'Name'));
 		$nf->setReadOnly(true);
 		$nf->setDisabled(true);
 

code/SearchableField.php

Spacing +4 added lines, -4 removed lines

@@ -24,10 +24,10 @@
 
 	function getCMSFields() {
 		$fields = new FieldList();
-		$fields->push( new TabSet( "Root", $mainTab = new Tab( "Main" ) ) );
-		$mainTab->setTitle( _t( 'SiteTree.TABMAIN', "Main" ) );
-		$fields->addFieldToTab( 'Root.Main',  $cf = new TextField( 'ClazzName', 'Class sourced from') );
-		$fields->addFieldToTab( 'Root.Main',  $nf = new TextField( 'Name', 'Name') );
+		$fields->push(new TabSet("Root", $mainTab = new Tab("Main")));
+		$mainTab->setTitle(_t('SiteTree.TABMAIN', "Main"));
+		$fields->addFieldToTab('Root.Main', $cf = new TextField('ClazzName', 'Class sourced from'));
+		$fields->addFieldToTab('Root.Main', $nf = new TextField('Name', 'Name'));
 		$cf->setDisabled(true);
 		$nf->setDisabled(true);
 		$cf->setReadOnly(true);

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;
 	}
 }

Spacing +20 added lines, -20 removed lines

@@ -23,7 +23,7 @@ 
 	 * @var string $content Text to display when in command line mode
 	 */
 	public static function message($content) {
-		if (\Director::is_cli()) {
+		if(\Director::is_cli()) {
 			echo "$content\n";
 		}
 	}
@@ -49,7 +49,7 @@ 
 
 		$resultArray = null;
 
-		if (sizeof($options) > 0) {
+		if(sizeof($options) > 0) {
 			//take the first suggestion
 			$suggestedPhrase = $options[0]['text'];
 			$suggestedPhraseHighlighted = $options[0]['highlighted'];
@@ -58,10 +58,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);
@@ -72,7 +72,7 @@ 
 			$lowerToUpper = array();
 			$lowerToHighlighted = array();
 			$ctr = 0;
-			foreach ($suggestedParts as $lowercaseWord) {
+			foreach($suggestedParts as $lowercaseWord) {
 				$lowerToUpper[$lowercaseWord] = $originalParts[$ctr];
 				$lowerToHighlighted[$lowercaseWord] = $highlightedParts[$ctr];
 				$ctr++;
@@ -80,19 +80,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;
 
@@ -115,9 +115,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);
@@ -146,10 +146,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();
@@ -157,18 +157,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();
         	}
 

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);
 	}
 

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);

Spacing +39 added lines, -39 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,20 +188,20 @@ 
 
 
 		// 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
 		$expectedStandardArray = array('type' => 'string', 'analyzer' => 'unstemmed', 'term_vector' => 'yes');
-		foreach ($shouldBeString as $fieldName) {
+		foreach($shouldBeString as $fieldName) {
 			$fieldProperties = $properties[$fieldName];
 
 			$type = $fieldProperties['type'];
@@ -213,60 +213,60 @@ 
 
 			// 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)));
 		}
 
 		// check ints
-		foreach ($shouldBeInt as $fieldName) {
+		foreach($shouldBeInt as $fieldName) {
 			$fieldProperties = $properties[$fieldName];
 			$type = $fieldProperties['type'];
 			$this->assertEquals(1, sizeof(array_keys($fieldProperties)));
-			$this->assertEquals('integer',$type);
+			$this->assertEquals('integer', $type);
 		}
 
 
 		// check doubles
-		foreach ($shouldBeDouble as $fieldName) {
+		foreach($shouldBeDouble as $fieldName) {
 			$fieldProperties = $properties[$fieldName];
 			$type = $fieldProperties['type'];
 			$this->assertEquals(1, sizeof(array_keys($fieldProperties)));
-			$this->assertEquals('double',$type);
+			$this->assertEquals('double', $type);
 		}
 
 		// check boolean
-		foreach ($shouldBeBoolean as $fieldName) {
+		foreach($shouldBeBoolean as $fieldName) {
 			$fieldProperties = $properties[$fieldName];
 			$type = $fieldProperties['type'];
 			$this->assertEquals(1, sizeof(array_keys($fieldProperties)));
-			$this->assertEquals('boolean',$type);
+			$this->assertEquals('boolean', $type);
 		}
 
 
-		foreach ($shouldBeDate as $fieldName) {
+		foreach($shouldBeDate as $fieldName) {
 			$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']);
 		}
 
 
 
 		// check date time, stored in Elasticsearch as a date with a different format than above
-		foreach ($shouldBeDateTime as $fieldName) {
+		foreach($shouldBeDateTime as $fieldName) {
 			$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']);
 		}
 
 		//check shutter speed is tokenized, ie not analyzed - for aggregation purposes
 		//
-		foreach ($shouldBeTokens as $fieldName) {
+		foreach($shouldBeTokens as $fieldName) {
 			$fieldProperties = $properties[$fieldName];
 			$type = $fieldProperties['type'];
 			$this->assertEquals('string', $type);
@@ -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';
@@ -333,7 +333,7 @@ 
 		$resultList = $this->getResultsFor('Bangkok');
 
 		// there is only one result.  Note lack of a 'first' method
-		foreach ($resultList->getIterator() as $fp) {
+		foreach($resultList->getIterator() as $fp) {
 			//This is an Elastica\Result object
 			$elasticaResult = $fp->getElasticaResult();
 
@@ -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);
@@ -761,20 +761,20 @@ 
 
 		$tabset = $fields->findOrMakeTab('Root.ElasticaTerms');
 		$tabNames = array();
-		foreach ($tabset->Tabs() as $tab) {
+		foreach($tabset->Tabs() as $tab) {
 			$tabFields = array();
-			foreach ($tab->FieldList() as $field) {
+			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);
 	}
@@ -793,18 +793,18 @@ 
 
 		$tabset = $fields->findOrMakeTab('Root.ElasticaTerms');
 		$tabNames = array();
-		foreach ($tabset->Tabs() as $tab) {
+		foreach($tabset->Tabs() as $tab) {
 			$tabFields = array();
-			foreach ($tab->FieldList() as $field) {
+			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);

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);