Completed
Push — dev2 ( 88484c...a481f8 )
by Gordon
17:23
created
src/SilverStripe/Elastica/ElasticaSearchHelperInterface.php 1 patch
Doc Comments   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 	/**
5 5
 	 * Alter the query or add to it, perhaps for example adding aggregation
6 6
 	 * @param  Elastic\Query &$query query object from Elastica
7
-	 * @return [type]         [description]
7
+	 * @return void         [description]
8 8
 	 */
9 9
 	public function augmentQuery(&$query);
10 10
 
@@ -12,6 +12,7 @@  discard block
 block discarded – undo
12 12
 	 * Update filters, perhaps remaps them, prior to performing a search.
13 13
 	 * This allows for aggregation values to be updated prior to rendering.
14 14
 	 * @param  array &$filters array of key/value pairs for query filtering
15
+	 * @return void
15 16
 	 */
16 17
 	public function updateFilters(&$filters);
17 18
 
@@ -19,7 +20,7 @@  discard block
 block discarded – undo
19 20
 	 * Manipulate the array of aggregations post search butprior to rendering
20 21
 	 * them in a template.
21 22
 	 * @param  [type] &$aggs [description]
22
-	 * @return [type]        [description]
23
+	 * @return void        [description]
23 24
 	 */
24 25
 	public function updateAggregation(&$aggs);
25 26
 
Please login to merge, or discard this patch.
src/SilverStripe/Elastica/ResultList.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -250,6 +250,9 @@
 block discarded – undo
250 250
 	}
251 251
 
252 252
 
253
+	/**
254
+	 * @return integer
255
+	 */
253 256
 	public function getTotalItems() {
254 257
 		$this->getResults();
255 258
 		return $this->TotalItems;
Please login to merge, or discard this patch.
tests/AggregationUnitTest.php 2 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -1036,6 +1036,7 @@
 block discarded – undo
1036 1036
 	/**
1037 1037
 	 * Test searching
1038 1038
 	 * http://stackoverflow.com/questions/28305250/elasticsearch-customize-score-for-synonyms-stemming
1039
+	 * @param string $queryText
1039 1040
 	 */
1040 1041
 	private function search($queryText,$fields = array('Title' => 1, 'Description' => 1),
1041 1042
 		$filters = array()) {
Please login to merge, or discard this patch.
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -34,9 +34,9 @@  discard block
 block discarded – undo
34 34
 		$this->aggregationByName($aggregations);
35 35
 
36 36
 		error_log('AGGS');
37
-		foreach ($aggregations as $agg) {
37
+		foreach($aggregations as $agg) {
38 38
 			error_log($agg->Name);
39
-			foreach ($agg->Buckets as $bucket) {
39
+			foreach($agg->Buckets as $bucket) {
40 40
 				error_log("\t$bucket->Key -> $bucket->DocumentCount");
41 41
 			}
42 42
 		}
@@ -432,7 +432,7 @@  discard block
 block discarded – undo
432 432
 		$resultList = $this->search('');
433 433
 
434 434
 		//assert there are actually some results
435
-		$this->assertGreaterThan(0,$resultList->getTotalItems());
435
+		$this->assertGreaterThan(0, $resultList->getTotalItems());
436 436
 		$aggregations = $resultList->getAggregations()->toArray();
437 437
 		$this->aggregationByName($aggregations);
438 438
 
@@ -452,49 +452,49 @@  discard block
 block discarded – undo
452 452
 		//Asserting aggregate of ISO, 64 has count 5
453 453
 		$this->assertEquals("64", $buckets[0]->Key);
454 454
 		$this->assertEquals(5, $buckets[0]->DocumentCount);
455
-		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO',64)->count(),5);
455
+		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO', 64)->count(), 5);
456 456
 		$bucketSum += $buckets[0]->DocumentCount;
457 457
 
458 458
 		//Asserting aggregate of ISO, 100 has count 11
459 459
 		$this->assertEquals("100", $buckets[1]->Key);
460 460
 		$this->assertEquals(11, $buckets[1]->DocumentCount);
461
-		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO',100)->count(),11);
461
+		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO', 100)->count(), 11);
462 462
 		$bucketSum += $buckets[1]->DocumentCount;
463 463
 
464 464
 		//Asserting aggregate of ISO, 200 has count 12
465 465
 		$this->assertEquals("200", $buckets[2]->Key);
466 466
 		$this->assertEquals(12, $buckets[2]->DocumentCount);
467
-		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO',200)->count(),12);
467
+		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO', 200)->count(), 12);
468 468
 		$bucketSum += $buckets[2]->DocumentCount;
469 469
 
470 470
 		//Asserting aggregate of ISO, 400 has count 13
471 471
 		$this->assertEquals("400", $buckets[3]->Key);
472 472
 		$this->assertEquals(13, $buckets[3]->DocumentCount);
473
-		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO',400)->count(),13);
473
+		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO', 400)->count(), 13);
474 474
 		$bucketSum += $buckets[3]->DocumentCount;
475 475
 
476 476
 		//Asserting aggregate of ISO, 800 has count 16
477 477
 		$this->assertEquals("800", $buckets[4]->Key);
478 478
 		$this->assertEquals(16, $buckets[4]->DocumentCount);
479
-		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO',800)->count(),16);
479
+		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO', 800)->count(), 16);
480 480
 		$bucketSum += $buckets[4]->DocumentCount;
481 481
 
482 482
 		//Asserting aggregate of ISO, 1600 has count 13
483 483
 		$this->assertEquals("1600", $buckets[5]->Key);
484 484
 		$this->assertEquals(13, $buckets[5]->DocumentCount);
485
-		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO',1600)->count(),13);
485
+		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO', 1600)->count(), 13);
486 486
 		$bucketSum += $buckets[5]->DocumentCount;
487 487
 
488 488
 		//Asserting aggregate of ISO, 2000 has count 11
489 489
 		$this->assertEquals("2000", $buckets[6]->Key);
490 490
 		$this->assertEquals(11, $buckets[6]->DocumentCount);
491
-		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO',2000)->count(),11);
491
+		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO', 2000)->count(), 11);
492 492
 		$bucketSum += $buckets[6]->DocumentCount;
493 493
 
494 494
 		//Asserting aggregate of ISO, 3200 has count 19
495 495
 		$this->assertEquals("3200", $buckets[7]->Key);
496 496
 		$this->assertEquals(19, $buckets[7]->DocumentCount);
497
-		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO',3200)->count(),19);
497
+		$this->assertEquals(FlickrPhotoTO::get()->filter('ISO', 3200)->count(), 19);
498 498
 		$bucketSum += $buckets[7]->DocumentCount;
499 499
 		$this->assertEquals(100, $bucketSum);
500 500
 
@@ -507,43 +507,43 @@  discard block
 block discarded – undo
507 507
 		//Asserting aggregate of Focal Length, 24 has count 12
508 508
 		$this->assertEquals("24", $buckets[0]->Key);
509 509
 		$this->assertEquals(12, $buckets[0]->DocumentCount);
510
-		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm',24)->count(),12);
510
+		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm', 24)->count(), 12);
511 511
 		$bucketSum += $buckets[0]->DocumentCount;
512 512
 
513 513
 		//Asserting aggregate of Focal Length, 50 has count 11
514 514
 		$this->assertEquals("50", $buckets[1]->Key);
515 515
 		$this->assertEquals(11, $buckets[1]->DocumentCount);
516
-		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm',50)->count(),11);
516
+		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm', 50)->count(), 11);
517 517
 		$bucketSum += $buckets[1]->DocumentCount;
518 518
 
519 519
 		//Asserting aggregate of Focal Length, 80 has count 11
520 520
 		$this->assertEquals("80", $buckets[2]->Key);
521 521
 		$this->assertEquals(11, $buckets[2]->DocumentCount);
522
-		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm',80)->count(),11);
522
+		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm', 80)->count(), 11);
523 523
 		$bucketSum += $buckets[2]->DocumentCount;
524 524
 
525 525
 		//Asserting aggregate of Focal Length, 90 has count 20
526 526
 		$this->assertEquals("90", $buckets[3]->Key);
527 527
 		$this->assertEquals(20, $buckets[3]->DocumentCount);
528
-		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm',90)->count(),20);
528
+		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm', 90)->count(), 20);
529 529
 		$bucketSum += $buckets[3]->DocumentCount;
530 530
 
531 531
 		//Asserting aggregate of Focal Length, 120 has count 12
532 532
 		$this->assertEquals("120", $buckets[4]->Key);
533 533
 		$this->assertEquals(12, $buckets[4]->DocumentCount);
534
-		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm',120)->count(),12);
534
+		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm', 120)->count(), 12);
535 535
 		$bucketSum += $buckets[4]->DocumentCount;
536 536
 
537 537
 		//Asserting aggregate of Focal Length, 150 has count 17
538 538
 		$this->assertEquals("150", $buckets[5]->Key);
539 539
 		$this->assertEquals(17, $buckets[5]->DocumentCount);
540
-		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm',150)->count(),17);
540
+		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm', 150)->count(), 17);
541 541
 		$bucketSum += $buckets[5]->DocumentCount;
542 542
 
543 543
 		//Asserting aggregate of Focal Length, 200 has count 17
544 544
 		$this->assertEquals("200", $buckets[6]->Key);
545 545
 		$this->assertEquals(17, $buckets[6]->DocumentCount);
546
-		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm',200)->count(),17);
546
+		$this->assertEquals(FlickrPhotoTO::get()->filter('FocalLength35mm', 200)->count(), 17);
547 547
 		$bucketSum += $buckets[6]->DocumentCount;
548 548
 		$this->assertEquals(100, $bucketSum);
549 549
 
@@ -830,7 +830,7 @@  discard block
 block discarded – undo
830 830
 		$originalAggregations = $resultList->getAggregations()->toArray();
831 831
 
832 832
 		$filters = array('ISO' => 3200);
833
-		$resultListFiltered = $this->search('New Zealand', $fields,$filters);
833
+		$resultListFiltered = $this->search('New Zealand', $fields, $filters);
834 834
 		$filteredAggregations = $resultListFiltered->getAggregations()->toArray();
835 835
 
836 836
 		$this->checkDrillingDownHasHappened($filteredAggregations, $originalAggregations);
@@ -842,8 +842,8 @@  discard block
 block discarded – undo
842 842
 		$resultList = $this->search('New Zealand', $fields, array('ISO' => 400));
843 843
 		$originalAggregations = $resultList->getAggregations()->toArray();
844 844
 
845
-		$filters = array('ISO' => 400, 'Aspect' => 'Vertical' );
846
-		$resultListFiltered = $this->search('New Zealand', $fields,$filters);
845
+		$filters = array('ISO' => 400, 'Aspect' => 'Vertical');
846
+		$resultListFiltered = $this->search('New Zealand', $fields, $filters);
847 847
 		$filteredAggregations = $resultListFiltered->getAggregations()->toArray();
848 848
 
849 849
 		$this->checkDrillingDownHasHappened($filteredAggregations, $originalAggregations);
@@ -858,8 +858,8 @@  discard block
 block discarded – undo
858 858
 										'Aspect' => 'Vertical'));
859 859
 		$originalAggregations = $resultList->getAggregations()->toArray();
860 860
 
861
-		$filters = array('ISO' => 400, 'Aspect' => 'Vertical', 'Aperture' => 5 );
862
-		$resultListFiltered = $this->search('New Zealand', $fields,$filters);
861
+		$filters = array('ISO' => 400, 'Aspect' => 'Vertical', 'Aperture' => 5);
862
+		$resultListFiltered = $this->search('New Zealand', $fields, $filters);
863 863
 		$filteredAggregations = $resultListFiltered->getAggregations()->toArray();
864 864
 
865 865
 		$this->checkDrillingDownHasHappened($filteredAggregations, $originalAggregations);
@@ -899,7 +899,7 @@  discard block
 block discarded – undo
899 899
 	private function checkDrillingDownHasHappened($filteredAggregations, $originalAggregations) {
900 900
 		$aggCtr = 0;
901 901
 
902
-		foreach ($filteredAggregations as $filteredAgg) {
902
+		foreach($filteredAggregations as $filteredAgg) {
903 903
 			$origAgg = $originalAggregations[$aggCtr];
904 904
 			$bucketCtr = 0;
905 905
 			$origBuckets = $origAgg->Buckets->toArray();
@@ -908,17 +908,17 @@  discard block
 block discarded – undo
908 908
 			$origCounts = array();
909 909
 			$filteredCounts = array();
910 910
 
911
-			foreach ($origBuckets as $bucket) {
911
+			foreach($origBuckets as $bucket) {
912 912
 				$origCounts[$bucket->Key] = $bucket->DocumentCount;
913 913
 			}
914 914
 
915
-			foreach ($filteredBuckets as $bucket) {
915
+			foreach($filteredBuckets as $bucket) {
916 916
 				$filteredCounts[$bucket->Key] = $bucket->DocumentCount;
917 917
 			}
918 918
 
919 919
 			$akf = array_keys($filteredCounts);
920 920
 
921
-			foreach ($akf as $aggregateKey) {
921
+			foreach($akf as $aggregateKey) {
922 922
 				$this->assertGreaterThanOrEqual(
923 923
 					$filteredCounts[$aggregateKey], $origCounts[$aggregateKey]
924 924
 				);
@@ -954,8 +954,8 @@  discard block
 block discarded – undo
954 954
 		$es->setQueryResultManipulator('FlickrPhotoTOElasticaSearchHelper');
955 955
 
956 956
 		//Add filters
957
-		foreach ($filters as $key => $value) {
958
-			$es->addFilter($key,$value);
957
+		foreach($filters as $key => $value) {
958
+			$es->addFilter($key, $value);
959 959
 		}
960 960
 
961 961
 		$es->showResultsForEmptySearch();
@@ -974,7 +974,7 @@  discard block
 block discarded – undo
974 974
 	 * Test searching
975 975
 	 * http://stackoverflow.com/questions/28305250/elasticsearch-customize-score-for-synonyms-stemming
976 976
 	 */
977
-	private function search($queryText,$fields = array('Title' => 1, 'Description' => 1),
977
+	private function search($queryText, $fields = array('Title' => 1, 'Description' => 1),
978 978
 		$filters = array()) {
979 979
 		$es = new ElasticSearcher();
980 980
 		$es->setStart(0);
@@ -983,9 +983,9 @@  discard block
 block discarded – undo
983 983
 		$es->setQueryResultManipulator('FlickrPhotoTOElasticaSearchHelper');
984 984
 
985 985
 		//Add filters
986
-		foreach ($filters as $key => $value) {
986
+		foreach($filters as $key => $value) {
987 987
 			error_log("ADDING FILTER RESULT $key, $value");
988
-			$es->addFilter($key,$value);
988
+			$es->addFilter($key, $value);
989 989
 		}
990 990
 
991 991
 		$es->showResultsForEmptySearch();
@@ -1003,7 +1003,7 @@  discard block
 block discarded – undo
1003 1003
 	 */
1004 1004
 	private function aggregationByName(&$aggregations) {
1005 1005
 		$ctr = 0;
1006
-		foreach ($aggregations as $agg) {
1006
+		foreach($aggregations as $agg) {
1007 1007
 			$aggregations[$agg->Name] = $agg;
1008 1008
 			unset($aggregations[$ctr]);
1009 1009
 			$ctr++;
Please login to merge, or discard this patch.
tests/ElasticaUtilTest.php 1 patch
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -153,6 +153,9 @@
 block discarded – undo
153 153
 
154 154
 	/**
155 155
 	 * Simulate a call to Elastica to get suggestions for a given phrase
156
+	 * @param string $phrase
157
+	 * @param string $suggestion
158
+	 * @param string $highlightedSuggestion
156 159
 	 * @return [type] [description]
157 160
 	 */
158 161
 	private function getSuggestionArray($phrase, $suggestion, $highlightedSuggestion) {
Please login to merge, or discard this patch.
tests/ElasticsearchFunctionalTestBase.php 2 patches
Doc Comments   +14 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 	 * Note:   characters are stripped from the content; make sure that your assertions take this into account.
103 103
 	 *
104 104
 	 * @param string $selector A basic CSS selector, e.g. 'li.jobs h3'
105
-	 * @param array|string $expectedMatches The content of at least one of the matched tags
105
+	 * @param integer $index
106 106
 	 * @throws PHPUnit_Framework_AssertionFailedError
107 107
 	 * @return boolean
108 108
 	 */
@@ -133,6 +133,12 @@  discard block
 block discarded – undo
133 133
 	/*
134 134
 	Check all the nodes matching the selector for attribute name = expected value
135 135
 	 */
136
+
137
+	/**
138
+	 * @param string $selector
139
+	 * @param string $attributeName
140
+	 * @param string $expectedValue
141
+	 */
136 142
 	public function assertAttributeHasExactValue($selector, $attributeName, $expectedValue) {
137 143
 		$items = $this->cssParser()->getBySelector($selector);
138 144
 		foreach ($items as $item) {
@@ -141,6 +147,9 @@  discard block
 block discarded – undo
141 147
 	}
142 148
 
143 149
 
150
+	/**
151
+	 * @param string $selector
152
+	 */
144 153
 	public function assertAttributesHaveExactValues($selector, $expectedValues) {
145 154
 		$attributeNames = array_keys($expectedValues);
146 155
 		$items = $this->cssParser()->getBySelector($selector);
@@ -154,6 +163,10 @@  discard block
 block discarded – undo
154 163
 	}
155 164
 
156 165
 
166
+	/**
167
+	 * @param string $selector
168
+	 * @param integer $expectedAmount
169
+	 */
157 170
 	public function assertNumberOfNodes($selector, $expectedAmount) {
158 171
 		$items = $this->cssParser()->getBySelector($selector);
159 172
 		foreach ($items as $item) {
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -8,8 +8,8 @@  discard block
 block discarded – undo
8 8
 	public static $ignoreFixtureFileFor = array();
9 9
 
10 10
 	protected $extraDataObjects = array(
11
-		'SearchableTestPage','FlickrPhotoTO','FlickrAuthorTO','FlickrSetTO','FlickrTagTO',
12
-		'SearchableTestFatherPage','SearchableTestGrandFatherPage'
11
+		'SearchableTestPage', 'FlickrPhotoTO', 'FlickrAuthorTO', 'FlickrSetTO', 'FlickrTagTO',
12
+		'SearchableTestFatherPage', 'SearchableTestGrandFatherPage'
13 13
 	);
14 14
 
15 15
 
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 
25 25
 	public function setUp() {
26 26
 
27
-		echo "*************** TEST: ".$this->getName();
27
+		echo "*************** TEST: " . $this->getName();
28 28
 
29 29
 		$cache = SS_Cache::factory('elasticsearch');
30 30
 		$cache->clean(Zend_Cache::CLEANING_MODE_ALL);
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 
33 33
 		// this needs to be called in order to create the list of searchable
34 34
 		// classes and fields that are available.  Simulates part of a build
35
-		$classes = array('SearchableTestPage','SiteTree','Page','FlickrPhotoTO','FlickrSetTO',
35
+		$classes = array('SearchableTestPage', 'SiteTree', 'Page', 'FlickrPhotoTO', 'FlickrSetTO',
36 36
 			'FlickrTagTO', 'FlickrAuthorTO');
37 37
 		$this->requireDefaultRecordsFrom = $classes;
38 38
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 		$this->service->setTestMode(true);
49 49
 
50 50
 		// A previous test may have deleted the index and then failed, so check for this
51
-		if (!$this->service->getIndex()->exists()) {
51
+		if(!$this->service->getIndex()->exists()) {
52 52
 			$this->service->getIndex()->create();
53 53
 		}
54 54
 		$this->service->reset();
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
 
60 60
 		$orig_fixture_file = static::$fixture_file;
61 61
 
62
-		foreach (static::$ignoreFixtureFileFor as $testPattern) {
63
-			$pattern = '/'.$testPattern.'/';
64
-			if (preg_match($pattern, $this->getName())) {
62
+		foreach(static::$ignoreFixtureFileFor as $testPattern) {
63
+			$pattern = '/' . $testPattern . '/';
64
+			if(preg_match($pattern, $this->getName())) {
65 65
 				static::$fixture_file = null;
66 66
 			}
67 67
 		}
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
 
84 84
 
85 85
 	private function publishSiteTree() {
86
-		foreach (SiteTree::get()->getIterator() as $page) {
86
+		foreach(SiteTree::get()->getIterator() as $page) {
87 87
 			// temporarily disable Elasticsearch indexing, it will be done in a batch
88 88
 			$page->IndexingOff = true;
89 89
 
90
-			$page->publish('Stage','Live');
90
+			$page->publish('Stage', 'Live');
91 91
 		}
92 92
 	}
93 93
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 		$items = $this->cssParser()->getBySelector($selector);
109 109
 
110 110
 		$ctr = 0;
111
-		foreach ($items as $item) {
111
+		foreach($items as $item) {
112 112
 			$text = strip_tags($item);
113 113
 			$escaped = str_replace("'", "\'", $text);
114 114
 			$ctr++;
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 	 */
131 131
 	public function assertAttributeHasExactValue($selector, $attributeName, $expectedValue) {
132 132
 		$items = $this->cssParser()->getBySelector($selector);
133
-		foreach ($items as $item) {
133
+		foreach($items as $item) {
134 134
 			$this->assertEquals($expectedValue, $item['value']);
135 135
 		}
136 136
 	}
@@ -139,9 +139,9 @@  discard block
 block discarded – undo
139 139
 	public function assertAttributesHaveExactValues($selector, $expectedValues) {
140 140
 		$attributeNames = array_keys($expectedValues);
141 141
 		$items = $this->cssParser()->getBySelector($selector);
142
-		foreach ($items as $item) {
142
+		foreach($items as $item) {
143 143
 			$actualValues = array();
144
-			foreach ($attributeNames as $attributeName) {
144
+			foreach($attributeNames as $attributeName) {
145 145
 				$actualValues[$attributeName] = (string)$item[$attributeName];
146 146
 			}
147 147
 			$this->assertEquals($expectedValues, $actualValues);
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
 
152 152
 	public function assertNumberOfNodes($selector, $expectedAmount) {
153 153
 		$items = $this->cssParser()->getBySelector($selector);
154
-		foreach ($items as $item) {
154
+		foreach($items as $item) {
155 155
 			$text = strip_tags($item);
156 156
 		}
157 157
 
@@ -164,9 +164,9 @@  discard block
 block discarded – undo
164 164
 	public function collateSearchResults() {
165 165
 		$items = $this->cssParser()->getBySelector('div.searchResults .searchResult');
166 166
 		$result = array();
167
-		foreach ($items as $item) {
167
+		foreach($items as $item) {
168 168
 			$attr = $item->attributes()->id;
169
-			array_push($result, $attr."");
169
+			array_push($result, $attr . "");
170 170
 		}
171 171
 
172 172
 		return $result;
Please login to merge, or discard this patch.
tests/ElasticSearchPage_Validator_Test.php 2 patches
Doc Comments   +4 added lines patch added patch discarded remove patch
@@ -106,6 +106,10 @@
 block discarded – undo
106 106
 	}
107 107
 
108 108
 
109
+	/**
110
+	 * @param string $fieldName
111
+	 * @param string $message
112
+	 */
109 113
 	private function checkForError($fieldName, $badValue, $message) {
110 114
 		$this->ElasticSearchPage->$fieldName = $badValue;
111 115
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -131,8 +131,8 @@
 block discarded – undo
131 131
 		$errors = Session::get("FormInfo.{$form->FormName()}.errors");
132 132
 		$found = false;
133 133
 
134
-		foreach ($errors as $error) {
135
-			if ($error['message'] == $message && $error['fieldName'] == $fieldName) {
134
+		foreach($errors as $error) {
135
+			if($error['message'] == $message && $error['fieldName'] == $fieldName) {
136 136
 				$found = true;
137 137
 				break;
138 138
 			}
Please login to merge, or discard this patch.
tests/SearchAndIndexingTest.php 3 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -479,6 +479,9 @@
 block discarded – undo
479 479
 	}
480 480
 
481 481
 
482
+	/**
483
+	 * @param string $query
484
+	 */
482 485
 	private function getResultsFor($query, $pageLength = 10, $fields = array('Title' => 1, 'Description' => 1)) {
483 486
 		$es = new ElasticSearcher();
484 487
 		$es->setStart(0);
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@
 block discarded – undo
140 140
 
141 141
 	public function testEach() {
142 142
 		$callback = function($fp) {
143
-		    $this->assertTrue(true, 'Callback reached');
143
+			$this->assertTrue(true, 'Callback reached');
144 144
 		};
145 145
 		$resultList = $this->getResultsFor('New Zealand',10);
146 146
 		$resultList->each($callback);
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -319,10 +319,10 @@
 block discarded – undo
319 319
 
320 320
 		foreach($toarr as $item) {
321 321
 			$hl = $item->SearchHighlights;
322
-			foreach ($hl as $shl) {
322
+			foreach($hl as $shl) {
323 323
 				$html = $shl->Snippet;
324 324
 				$splits = explode('<strong class="hl">', $html);
325
-				if (sizeof($splits) > 1) {
325
+				if(sizeof($splits) > 1) {
326 326
 					$splits = explode('</strong>', $splits[1]);
327 327
 					$term = $splits[0];
328 328
 					$term = strtolower($term);
Please login to merge, or discard this patch.
tests/TranslatableUnitTest.php 2 patches
Doc Comments   +3 added lines patch added patch discarded remove patch
@@ -233,6 +233,9 @@
 block discarded – undo
233 233
 
234 234
 
235 235
 
236
+	/**
237
+	 * @param PaginatedList $paginated
238
+	 */
236 239
 	private function makeCode($paginated) {
237 240
 		$results = $paginated->getList()->toArray();
238 241
 		$ctr = 0;
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -102,7 +102,7 @@
 block discarded – undo
102 102
 		$es->setLocale($locale);
103 103
 		$es->setClasses('FlickrPhotoTO');
104 104
 
105
-		$fields = array('Description.standard' => 1,'Title.standard' => 1);
105
+		$fields = array('Description.standard' => 1, 'Title.standard' => 1);
106 106
 		$results = $es->moreLikeThis($fp, $fields, true);
107 107
 
108 108
 		$terms = $results->getList()->MoreLikeThisTerms;
Please login to merge, or discard this patch.
code/SearchableClass.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -29,20 +29,20 @@  discard block
 block discarded – undo
29 29
 		$config->removeComponent($config->getComponentByType('GridFieldDeleteAction'));
30 30
 
31 31
 		$config->getComponentByType('GridFieldDataColumns')->setDisplayFields(array(
32
-            'Name' => 'Name',
33
-            'Weight' => 'Weighting',
34
-            'Searchable' => 'Search this field?'
35
-        ));
32
+			'Name' => 'Name',
33
+			'Weight' => 'Weighting',
34
+			'Searchable' => 'Search this field?'
35
+		));
36 36
 
37 37
 
38
-        $gridField = new GridField(
39
-            'SearchableField', // Field name
40
-            'Field Name', // Field title
41
-            SearchableField::get()->filter('SearchableClassID', $this->ID)->sort('Name'),
42
-            $config
43
-        );
38
+		$gridField = new GridField(
39
+			'SearchableField', // Field name
40
+			'Field Name', // Field title
41
+			SearchableField::get()->filter('SearchableClassID', $this->ID)->sort('Name'),
42
+			$config
43
+		);
44 44
 
45
-        $fields->addFieldToTab('Root.Main', $gridField);
45
+		$fields->addFieldToTab('Root.Main', $gridField);
46 46
 
47 47
 		/*
48 48
 	    $fields = new FieldList();
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 
51 51
 
52 52
         */
53
-	    return $fields;
53
+		return $fields;
54 54
 	}
55 55
 
56 56
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,10 +15,10 @@
 block discarded – undo
15 15
 
16 16
 		$fields = new FieldList();
17 17
 
18
-		$fields->push( new TabSet( "Root", $mainTab = new Tab( "Main" ) ) );
19
-		$mainTab->setTitle( _t( 'SiteTree.TABMAIN', "Main" ) );
18
+		$fields->push(new TabSet("Root", $mainTab = new Tab("Main")));
19
+		$mainTab->setTitle(_t('SiteTree.TABMAIN', "Main"));
20 20
 
21
-		$fields->addFieldToTab( 'Root.Main',  $nf = new TextField( 'Name', 'Name') );
21
+		$fields->addFieldToTab('Root.Main', $nf = new TextField('Name', 'Name'));
22 22
 		$nf->setReadOnly(true);
23 23
 		$nf->setDisabled(true);
24 24
 
Please login to merge, or discard this patch.