gordonbanderson / silverstripe-elastica

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

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

tests/ElasticsearchTestBase.php

Indentation +4 added lines, -4 removed lines

@@ -208,11 +208,11 @@
 	 */
 	public function invokeMethod(&$object, $methodName, array $parameters = array())
 	{
-	    $reflection = new \ReflectionClass(get_class($object));
-	    $method = $reflection->getMethod($methodName);
-	    $method->setAccessible(true);
+		$reflection = new \ReflectionClass(get_class($object));
+		$method = $reflection->getMethod($methodName);
+		$method->setAccessible(true);
 
-	    return $method->invokeArgs($object, $parameters);
+		return $method->invokeArgs($object, $parameters);
 	}
 
 

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

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

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
 		/*

tests/ElasticSearchPageControllerTest.php

Indentation +19 added lines, -19 removed lines

@@ -115,10 +115,10 @@ 
 		$this->assertEquals(200, $searchPage->getStatusCode());
 		$url = rtrim($url,'/');
 
-        $response = $this->get($url);
-        $this->assertEquals(200, $response->getStatusCode());
+		$response = $this->get($url);
+		$this->assertEquals(200, $response->getStatusCode());
 
-        $this->assertSelectorStartsWithOrEquals('span.count', 0, '(5)');
+		$this->assertSelectorStartsWithOrEquals('span.count', 0, '(5)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 1, '(11)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 2, '(12)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 3, '(13)');
@@ -168,10 +168,10 @@ 
 		$url = rtrim($url,'/');
 		$url .= '?ISO=400';
 
-        $response = $this->get($url);
-        $this->assertEquals(200, $response->getStatusCode());
+		$response = $this->get($url);
+		$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('span.count', 0, '(2)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 1, '(1)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 2, '(2)');
@@ -215,12 +215,12 @@ 
 		$url = rtrim($url,'/');
 		$url .= '?ISO=400&ShutterSpeed=2%2F250';
 
-        $response = $this->get($url);
+		$response = $this->get($url);
 		print_r($response);
-        $this->assertEquals(200, $response->getStatusCode());
+		$this->assertEquals(200, $response->getStatusCode());
 
-        // These are less than in the one facet selected case, as expected
-        $this->assertSelectorStartsWithOrEquals('span.count', 0, '(1)');
+		// These are less than in the one facet selected case, as expected
+		$this->assertSelectorStartsWithOrEquals('span.count', 0, '(1)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 1, '(2)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 2, '(1)');
 		$this->assertSelectorStartsWithOrEquals('span.count', 3, '(1)');
@@ -249,12 +249,12 @@ 
 		$url = rtrim($url,'/');
 		$url .= '?ISO=400&ShutterSpeed=2%2F250&Aspect=Vertical';
 
-        $response = $this->get($url);
+		$response = $this->get($url);
 		print_r($response);
-        $this->assertEquals(200, $response->getStatusCode());
+		$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)');
 	}
@@ -602,13 +602,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'));
 	}
 
 

tests/SearchAndIndexingTest.php

Indentation +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
 
 	public function testEach() {
 		$callback = function($fp) {
-		    $this->assertTrue(true, 'Callback reached');
+			$this->assertTrue(true, 'Callback reached');
 		};
 		$resultList = $this->getResultsFor('New Zealand',10);
 		$resultList->each($callback);

src/SilverStripe/Elastica/ElasticaSearcher.php

Indentation +4 added lines, -4 removed lines

@@ -434,11 +434,11 @@ 
 
 
 
-        $query = new Query();
-        $query->setParams(array('query' => array('more_like_this' => $mlt)));
+		$query = new Query();
+		$query->setParams(array('query' => array('more_like_this' => $mlt)));
 
 
-        $elasticService = \Injector::inst()->create('SilverStripe\Elastica\ElasticaService');
+		$elasticService = \Injector::inst()->create('SilverStripe\Elastica\ElasticaService');
 		$elasticService->setLocale($this->locale);
 		if ($testMode) {
 			$elasticService->setTestMode(true);
@@ -450,7 +450,7 @@ 
 		$query->setFrom($this->start);
 
 		$resultList = new ResultList($elasticService, $query, null);
-        // at this point ResultList object, not yet executed search query
+		// at this point ResultList object, not yet executed search query
 		$paginated = new \PaginatedList(
 			$resultList
 		);