markguinn / silverstripe-shop-search

code/adapters/ShopSearchSolr.php

Indentation +4 added lines, -4 removed lines

@@ -191,9 +191,9 @@ 
 
 
 		/**
-	 * Overrides the parent to add a field for autocomplete
-	 * @return HTMLText
-	 */
+		 * Overrides the parent to add a field for autocomplete
+		 * @return HTMLText
+		 */
 	function getTypes() {
 		$val = parent::getTypes();
 		if (!$val || !is_object($val)) return $val;
@@ -466,7 +466,7 @@ 
 
 			foreach ($facets as $name => $spec) {
 				// With our current implementation, "range" facets aren't true facets in solr terms.
-	            // They're just a type of filter which can be handled elsewhere.
+				// They're just a type of filter which can be handled elsewhere.
 				// For the other types we just ignore the rest of the spec and let Solr do its thing
 				if ($spec['Type'] != ShopSearch::FACET_TYPE_RANGE && isset($this->fieldMap[$name])) {
 					$params['facet.field'] = $this->fieldMap[$name];

Spacing +26 added lines, -26 removed lines

@@ -234,7 +234,7 @@ 
 	 * @param string $sort [optional]
 	 * @return ArrayData
 	 */
-	public function searchFromVars($keywords, array $filters=array(), array $facetSpec=array(), $start=-1, $limit=-1, $sort='score desc') {
+	public function searchFromVars($keywords, array $filters = array(), array $facetSpec = array(), $start = -1, $limit = -1, $sort = 'score desc') {
 		$query = new SearchQuery();
 		$params = array(
 			'sort'  => $sort,
@@ -349,11 +349,11 @@ 
 		$classq = array();
 
 		foreach ($query->classes as $class) {
-			if (!empty($class['includeSubclasses'])) $classq[] = 'ClassHierarchy:'.$class['class'];
-			else $classq[] = 'ClassName:'.$class['class'];
+			if (!empty($class['includeSubclasses'])) $classq[] = 'ClassHierarchy:' . $class['class'];
+			else $classq[] = 'ClassName:' . $class['class'];
 		}
 
-		if ($classq) $fq[] = '+('.implode(' ', $classq).')';
+		if ($classq) $fq[] = '+(' . implode(' ', $classq) . ')';
 
 		// Filter by filters
 		foreach ($query->require as $field => $values) {
@@ -372,11 +372,11 @@ 
 					$requireq[] = "$field:[$start TO $end]";
 				}
 				else {
-					$requireq[] = $field.':"'.$value.'"';
+					$requireq[] = $field . ':"' . $value . '"';
 				}
 			}
 
-			$fq[] = '+('.implode(' ', $requireq).')';
+			$fq[] = '+(' . implode(' ', $requireq) . ')';
 		}
 
 		foreach ($query->exclude as $field => $values) {
@@ -396,11 +396,11 @@ 
 					$excludeq[] = "$field:[$start TO $end]";
 				}
 				else {
-					$excludeq[] = $field.':"'.$value.'"';
+					$excludeq[] = $field . ':"' . $value . '"';
 				}
 			}
 
-			$fq[] = ($missing ? "+{$field}:[* TO *] " : '') . '-('.implode(' ', $excludeq).')';
+			$fq[] = ($missing ? "+{$field}:[* TO *] " : '') . '-(' . implode(' ', $excludeq) . ')';
 		}
 
 //		if(!headers_sent()) {
@@ -419,10 +419,10 @@ 
 		);
 
 		$results = new ArrayList();
-		if($res->getHttpStatus() >= 200 && $res->getHttpStatus() < 300) {
+		if ($res->getHttpStatus() >= 200 && $res->getHttpStatus() < 300) {
 			foreach ($res->response->docs as $doc) {
 				$result = DataObject::get_by_id($doc->ClassName, $doc->ID);
-				if($result) {
+				if ($result) {
 					$results->push($result);
 				}
 			}
@@ -509,17 +509,17 @@ 
 
 			foreach ($parts[0] as $part) {
 				$fields = (isset($search['fields'])) ? $search['fields'] : array();
-				if(isset($search['boost'])) $fields = array_merge($fields, array_keys($search['boost']));
+				if (isset($search['boost'])) $fields = array_merge($fields, array_keys($search['boost']));
 				if ($fields) {
 					$searchq = array();
 					foreach ($fields as $field) {
 						$boost = (isset($search['boost'][$field])) ? '^' . $search['boost'][$field] : '';
-						$searchq[] = "{$field}:".$part.$fuzzy.$boost;
+						$searchq[] = "{$field}:" . $part . $fuzzy . $boost;
 					}
-					$q[] = '+('.implode(' OR ', $searchq).')';
+					$q[] = '+(' . implode(' OR ', $searchq) . ')';
 				}
 				else {
-					$q[] = '+'.$part.$fuzzy;
+					$q[] = '+' . $part . $fuzzy;
 				}
 			}
 		}
@@ -529,11 +529,11 @@ 
 		$classq = array();
 
 		foreach ($query->classes as $class) {
-			if (!empty($class['includeSubclasses'])) $classq[] = 'ClassHierarchy:'.$class['class'];
-			else $classq[] = 'ClassName:'.$class['class'];
+			if (!empty($class['includeSubclasses'])) $classq[] = 'ClassHierarchy:' . $class['class'];
+			else $classq[] = 'ClassName:' . $class['class'];
 		}
 
-		if ($classq) $fq[] = '+('.implode(' ', $classq).')';
+		if ($classq) $fq[] = '+(' . implode(' ', $classq) . ')';
 
 		// Filter by filters
 
@@ -553,11 +553,11 @@ 
 					$requireq[] = "$field:[$start TO $end]";
 				}
 				else {
-					$requireq[] = $field.':"'.$value.'"';
+					$requireq[] = $field . ':"' . $value . '"';
 				}
 			}
 
-			$fq[] = '+('.implode(' ', $requireq).')';
+			$fq[] = '+(' . implode(' ', $requireq) . ')';
 		}
 
 		foreach ($query->exclude as $field => $values) {
@@ -577,11 +577,11 @@ 
 					$excludeq[] = "$field:[$start TO $end]";
 				}
 				else {
-					$excludeq[] = $field.':"'.$value.'"';
+					$excludeq[] = $field . ':"' . $value . '"';
 				}
 			}
 
-			$fq[] = ($missing ? "+{$field}:[* TO *] " : '') . '-('.implode(' ', $excludeq).')';
+			$fq[] = ($missing ? "+{$field}:[* TO *] " : '') . '-(' . implode(' ', $excludeq) . ')';
 		}
 
 //		if(!headers_sent()) {
@@ -605,20 +605,20 @@ 
 		//Debug::dump($res);
 
 		$results = new ArrayList();
-		if($res->getHttpStatus() >= 200 && $res->getHttpStatus() < 300) {
+		if ($res->getHttpStatus() >= 200 && $res->getHttpStatus() < 300) {
 			foreach ($res->response->docs as $doc) {
 				$result = DataObject::get_by_id($doc->ClassName, $doc->ID);
-				if($result) {
+				if ($result) {
 					$results->push($result);
 
 					// Add highlighting (optional)
 					$docId = $doc->_documentid;
-					if($res->highlighting && $res->highlighting->$docId) {
+					if ($res->highlighting && $res->highlighting->$docId) {
 						// TODO Create decorator class for search results rather than adding arbitrary object properties
 						// TODO Allow specifying highlighted field, and lazy loading
 						// in case the search API needs another query (similar to SphinxSearchable->buildExcerpt()).
 						$combinedHighlights = array();
-						foreach($res->highlighting->$docId as $field => $highlights) {
+						foreach ($res->highlighting->$docId as $field => $highlights) {
 							$combinedHighlights = array_merge($combinedHighlights, $highlights);
 						}
 
@@ -657,7 +657,7 @@ 
 		}
 
 		// Suggestions (requires custom setup, assumes spellcheck.collate=true)
-		if(isset($res->spellcheck->suggestions->collation)) {
+		if (isset($res->spellcheck->suggestions->collation)) {
 			$ret['Suggestion'] = $res->spellcheck->suggestions->collation;
 		}
 

Braces +89 added lines, -52 removed lines

@@ -102,7 +102,9 @@ 
 	 */
 	protected function scrubFieldList($in) {
 		$out = array();
-		if (empty($in) || !is_array($in)) return $out;
+		if (empty($in) || !is_array($in)) {
+			return $out;
+		}
 
 		foreach ($in as $name => $val) {
 			// supports an indexed array format of simple field names
@@ -121,8 +123,12 @@ 
 				'params'    => $params,
 			);
 
-			if (isset($def['params']['field'])) unset($def['params']['field']);
-			if (isset($def['params']['type']))  unset($def['params']['type']);
+			if (isset($def['params']['field'])) {
+				unset($def['params']['field']);
+			}
+			if (isset($def['params']['type'])) {
+				unset($def['params']['type']);
+			}
 
 			$out[$name] = $def;
 		}
@@ -136,7 +142,9 @@ 
 	 */
 	protected function getFulltextSpec() {
 		$fields = Config::inst()->get('ShopSearch', 'solr_fulltext_fields');
-		if (empty($fields)) $fields = array('Title', 'Content');
+		if (empty($fields)) {
+			$fields = array('Title', 'Content');
+		}
 		return $this->scrubFieldList($fields);
 	}
 
@@ -196,7 +204,9 @@ 
 	 */
 	function getTypes() {
 		$val = parent::getTypes();
-		if (!$val || !is_object($val)) return $val;
+		if (!$val || !is_object($val)) {
+			return $val;
+		}
 		$xml = $val->getValue();
 		$xml .= <<<XML
 
@@ -241,7 +251,9 @@ 
 		);
 
 		// swap out title search
-		if ($params['sort'] == 'SiteTree_Title') $params['sort'] = '_titleSort';
+		if ($params['sort'] == 'SiteTree_Title') {
+			$params['sort'] = '_titleSort';
+		}
 
 		// search by keywords
 		$query->search(empty($keywords) ? '*:*' : $keywords);
@@ -349,11 +361,16 @@ 
 		$classq = array();
 
 		foreach ($query->classes as $class) {
-			if (!empty($class['includeSubclasses'])) $classq[] = 'ClassHierarchy:'.$class['class'];
-			else $classq[] = 'ClassName:'.$class['class'];
+			if (!empty($class['includeSubclasses'])) {
+				$classq[] = 'ClassHierarchy:'.$class['class'];
+			} else {
+				$classq[] = 'ClassName:'.$class['class'];
+			}
 		}
 
-		if ($classq) $fq[] = '+('.implode(' ', $classq).')';
+		if ($classq) {
+			$fq[] = '+('.implode(' ', $classq).')';
+		}
 
 		// Filter by filters
 		foreach ($query->require as $field => $values) {
@@ -362,16 +379,17 @@ 
 			foreach ($values as $value) {
 				if ($value === SearchQuery::$missing) {
 					$requireq[] = "(*:* -{$field}:[* TO *])";
-				}
-				else if ($value === SearchQuery::$present) {
+				} else if ($value === SearchQuery::$present) {
 					$requireq[] = "{$field}:[* TO *]";
-				}
-				else if ($value instanceof SearchQuery_Range) {
-					$start = $value->start; if ($start === null) $start = '*';
-					$end = $value->end; if ($end === null) $end = '*';
+				} else if ($value instanceof SearchQuery_Range) {
+					$start = $value->start; if ($start === null) {
+						$start = '*';
+					}
+					$end = $value->end; if ($end === null) {
+						$end = '*';
+					}
 					$requireq[] = "$field:[$start TO $end]";
-				}
-				else {
+				} else {
 					$requireq[] = $field.':"'.$value.'"';
 				}
 			}
@@ -386,16 +404,17 @@ 
 			foreach ($values as $value) {
 				if ($value === SearchQuery::$missing) {
 					$missing = true;
-				}
-				else if ($value === SearchQuery::$present) {
+				} else if ($value === SearchQuery::$present) {
 					$excludeq[] = "{$field}:[* TO *]";
-				}
-				else if ($value instanceof SearchQuery_Range) {
-					$start = $value->start; if ($start === null) $start = '*';
-					$end = $value->end; if ($end === null) $end = '*';
+				} else if ($value instanceof SearchQuery_Range) {
+					$start = $value->start; if ($start === null) {
+						$start = '*';
+					}
+					$end = $value->end; if ($end === null) {
+						$end = '*';
+					}
 					$excludeq[] = "$field:[$start TO $end]";
-				}
-				else {
+				} else {
 					$excludeq[] = $field.':"'.$value.'"';
 				}
 			}
@@ -509,7 +528,9 @@ 
 
 			foreach ($parts[0] as $part) {
 				$fields = (isset($search['fields'])) ? $search['fields'] : array();
-				if(isset($search['boost'])) $fields = array_merge($fields, array_keys($search['boost']));
+				if(isset($search['boost'])) {
+					$fields = array_merge($fields, array_keys($search['boost']));
+				}
 				if ($fields) {
 					$searchq = array();
 					foreach ($fields as $field) {
@@ -517,8 +538,7 @@ 
 						$searchq[] = "{$field}:".$part.$fuzzy.$boost;
 					}
 					$q[] = '+('.implode(' OR ', $searchq).')';
-				}
-				else {
+				} else {
 					$q[] = '+'.$part.$fuzzy;
 				}
 			}
@@ -529,11 +549,16 @@ 
 		$classq = array();
 
 		foreach ($query->classes as $class) {
-			if (!empty($class['includeSubclasses'])) $classq[] = 'ClassHierarchy:'.$class['class'];
-			else $classq[] = 'ClassName:'.$class['class'];
+			if (!empty($class['includeSubclasses'])) {
+				$classq[] = 'ClassHierarchy:'.$class['class'];
+			} else {
+				$classq[] = 'ClassName:'.$class['class'];
+			}
 		}
 
-		if ($classq) $fq[] = '+('.implode(' ', $classq).')';
+		if ($classq) {
+			$fq[] = '+('.implode(' ', $classq).')';
+		}
 
 		// Filter by filters
 
@@ -543,16 +568,17 @@ 
 			foreach ($values as $value) {
 				if ($value === SearchQuery::$missing) {
 					$requireq[] = "(*:* -{$field}:[* TO *])";
-				}
-				else if ($value === SearchQuery::$present) {
+				} else if ($value === SearchQuery::$present) {
 					$requireq[] = "{$field}:[* TO *]";
-				}
-				else if ($value instanceof SearchQuery_Range) {
-					$start = $value->start; if ($start === null) $start = '*';
-					$end = $value->end; if ($end === null) $end = '*';
+				} else if ($value instanceof SearchQuery_Range) {
+					$start = $value->start; if ($start === null) {
+						$start = '*';
+					}
+					$end = $value->end; if ($end === null) {
+						$end = '*';
+					}
 					$requireq[] = "$field:[$start TO $end]";
-				}
-				else {
+				} else {
 					$requireq[] = $field.':"'.$value.'"';
 				}
 			}
@@ -567,16 +593,17 @@ 
 			foreach ($values as $value) {
 				if ($value === SearchQuery::$missing) {
 					$missing = true;
-				}
-				else if ($value === SearchQuery::$present) {
+				} else if ($value === SearchQuery::$present) {
 					$excludeq[] = "{$field}:[* TO *]";
-				}
-				else if ($value instanceof SearchQuery_Range) {
-					$start = $value->start; if ($start === null) $start = '*';
-					$end = $value->end; if ($end === null) $end = '*';
+				} else if ($value instanceof SearchQuery_Range) {
+					$start = $value->start; if ($start === null) {
+						$start = '*';
+					}
+					$end = $value->end; if ($end === null) {
+						$end = '*';
+					}
 					$excludeq[] = "$field:[$start TO $end]";
-				}
-				else {
+				} else {
 					$excludeq[] = $field.':"'.$value.'"';
 				}
 			}
@@ -589,9 +616,15 @@ 
 //			if ($fq) header('X-Filters: "'.implode('", "', $fq).'"');
 //		}
 
-		if ($offset == -1) $offset = $query->start;
-		if ($limit == -1) $limit = $query->limit;
-		if ($limit == -1) $limit = SearchQuery::$default_page_size;
+		if ($offset == -1) {
+			$offset = $query->start;
+		}
+		if ($limit == -1) {
+			$limit = $query->limit;
+		}
+		if ($limit == -1) {
+			$limit = SearchQuery::$default_page_size;
+		}
 
 		$params = array_merge($params, array('fq' => implode(' ', $fq)));
 
@@ -677,8 +710,12 @@ 
 			if ($facet['Type'] == ShopSearch::FACET_TYPE_RANGE) {
 				// If it's a range facet, set up the min/max
 				// TODO: we could probably get the real min and max with solr's range faceting if we tried
-				if (isset($facet['RangeMin'])) $facet['MinValue'] = $facet['RangeMin'];
-				if (isset($facet['RangeMax'])) $facet['MaxValue'] = $facet['RangeMax'];
+				if (isset($facet['RangeMin'])) {
+					$facet['MinValue'] = $facet['RangeMin'];
+				}
+				if (isset($facet['RangeMax'])) {
+					$facet['MaxValue'] = $facet['RangeMax'];
+				}
 				$out->push(new ArrayData($facet));
 			} elseif (isset($this->fieldMap[$field])) {
 				// Otherwise, look through Solr's results

code/helpers/BetweenFilter.php

Spacing +8 added lines, -8 removed lines

@@ -18,7 +18,7 @@ 
 		$this->model = $query->applyRelation($this->relation);
 		$value = $this->getDbFormattedValue();
 
-		if(is_numeric($value)) $filter = sprintf("%s > %s", $this->getDbName(), Convert::raw2sql($value));
+		if (is_numeric($value)) $filter = sprintf("%s > %s", $this->getDbName(), Convert::raw2sql($value));
 		else $filter = sprintf("%s > '%s'", $this->getDbName(), Convert::raw2sql($value));
 
 		return $query->where($filter);
@@ -32,7 +32,7 @@ 
 		$this->model = $query->applyRelation($this->relation);
 		$value = $this->getDbFormattedValue();
 
-		if(is_numeric($value)) $filter = sprintf("%s <= %s", $this->getDbName(), Convert::raw2sql($value));
+		if (is_numeric($value)) $filter = sprintf("%s <= %s", $this->getDbName(), Convert::raw2sql($value));
 		else $filter = sprintf("%s <= '%s'", $this->getDbName(), Convert::raw2sql($value));
 
 		return $query->where($filter);
@@ -47,15 +47,15 @@ 
 
 		$filters = array();
 		$ops = array('>=', '<=');
-		foreach($this->getValue() as $i => $value) {
-			if(is_numeric($value)) {
+		foreach ($this->getValue() as $i => $value) {
+			if (is_numeric($value)) {
 				$filters[] = sprintf("%s %s %s", $this->getDbName(), $ops[$i], Convert::raw2sql($value));
 			} else {
 				$filters[] = sprintf("%s %s '%s'", $this->getDbName(), $ops[$i], Convert::raw2sql($value));
 			}
 		}
 
-		return $query->where( implode(' AND ', $filters) );
+		return $query->where(implode(' AND ', $filters));
 	}
 
 	/**
@@ -67,15 +67,15 @@ 
 
 		$filters = array();
 		$ops = array('<', '>');
-		foreach($this->getValue() as $i => $value) {
-			if(is_numeric($value)) {
+		foreach ($this->getValue() as $i => $value) {
+			if (is_numeric($value)) {
 				$filters[] = sprintf("%s %s %s", $this->getDbName(), $ops[$i], Convert::raw2sql($value));
 			} else {
 				$filters[] = sprintf("%s %s '%s'", $this->getDbName(), $ops[$i], Convert::raw2sql($value));
 			}
 		}
 
-		return $query->where( implode(' OR ', $filters) );
+		return $query->where(implode(' OR ', $filters));
 	}
 
 	/**

Braces +10 added lines, -4 removed lines

@@ -18,8 +18,11 @@ 
 		$this->model = $query->applyRelation($this->relation);
 		$value = $this->getDbFormattedValue();
 
-		if(is_numeric($value)) $filter = sprintf("%s > %s", $this->getDbName(), Convert::raw2sql($value));
-		else $filter = sprintf("%s > '%s'", $this->getDbName(), Convert::raw2sql($value));
+		if(is_numeric($value)) {
+			$filter = sprintf("%s > %s", $this->getDbName(), Convert::raw2sql($value));
+		} else {
+			$filter = sprintf("%s > '%s'", $this->getDbName(), Convert::raw2sql($value));
+		}
 
 		return $query->where($filter);
 	}
@@ -32,8 +35,11 @@ 
 		$this->model = $query->applyRelation($this->relation);
 		$value = $this->getDbFormattedValue();
 
-		if(is_numeric($value)) $filter = sprintf("%s <= %s", $this->getDbName(), Convert::raw2sql($value));
-		else $filter = sprintf("%s <= '%s'", $this->getDbName(), Convert::raw2sql($value));
+		if(is_numeric($value)) {
+			$filter = sprintf("%s <= %s", $this->getDbName(), Convert::raw2sql($value));
+		} else {
+			$filter = sprintf("%s <= '%s'", $this->getDbName(), Convert::raw2sql($value));
+		}
 
 		return $query->where($filter);
 	}

code/helpers/FacetedCategory.php

Spacing +3 added lines, -3 removed lines

@@ -38,7 +38,7 @@ 
 	 */
 	public function updateCMSFields(FieldList $fields) {
 		if (Config::inst()->get('FacetedCategory', 'show_disabled_facets_tab')) {
-			$spec = FacetHelper::inst()->expandFacetSpec( $this->getFacetSpec() );
+			$spec = FacetHelper::inst()->expandFacetSpec($this->getFacetSpec());
 			$facets = array();
 			foreach ($spec as $f => $v) $facets[$f] = $v['Label'];
 			$fields->addFieldToTab('Root.Facets', CheckboxSetField::create('DisabledFacets', "Don't show the following facets for this category:", $facets));
@@ -80,7 +80,7 @@ 
 	 * @param bool $recursive
 	 * @return mixed
 	 */
-	public function FilteredProducts($recursive=true) {
+	public function FilteredProducts($recursive = true) {
 		if (!isset($this->_filteredProducts)) {
 			$fn = Config::inst()->get('FacetedCategory', 'products_method');
 			if (empty($fn)) $fn = 'ProductsShowable';
@@ -107,7 +107,7 @@ 
 	 * @return ArrayList
 	 */
 	public function Facets() {
-		$spec       = $this->getFacetSpec();
+		$spec = $this->getFacetSpec();
 		if (empty($spec)) return new ArrayList;
 
 		// remove any disabled facets

Braces +21 added lines, -7 removed lines

@@ -40,7 +40,9 @@ 
 		if (Config::inst()->get('FacetedCategory', 'show_disabled_facets_tab')) {
 			$spec = FacetHelper::inst()->expandFacetSpec( $this->getFacetSpec() );
 			$facets = array();
-			foreach ($spec as $f => $v) $facets[$f] = $v['Label'];
+			foreach ($spec as $f => $v) {
+				$facets[$f] = $v['Label'];
+			}
 			$fields->addFieldToTab('Root.Facets', CheckboxSetField::create('DisabledFacets', "Don't show the following facets for this category:", $facets));
 		}
 	}
@@ -68,10 +70,14 @@ 
 	 */
 	protected function getFilters() {
 		$qs_f       = Config::inst()->get('ShopSearch', 'qs_filters');
-		if (!$qs_f) return array();
+		if (!$qs_f) {
+			return array();
+		}
 		$request    = $this->getController()->getRequest();
 		$filters    = $request->requestVar($qs_f);
-		if (empty($filters) || !is_array($filters)) return array();
+		if (empty($filters) || !is_array($filters)) {
+			return array();
+		}
 		return FacetHelper::inst()->scrubFilters($filters);
 	}
 
@@ -83,7 +89,9 @@ 
 	public function FilteredProducts($recursive=true) {
 		if (!isset($this->_filteredProducts)) {
 			$fn = Config::inst()->get('FacetedCategory', 'products_method');
-			if (empty($fn)) $fn = 'ProductsShowable';
+			if (empty($fn)) {
+				$fn = 'ProductsShowable';
+			}
 			$this->_filteredProducts = $this->owner->$fn($recursive);
 			$this->_filteredProducts = FacetHelper::inst()->addFiltersToDataList($this->_filteredProducts, $this->getFilters());
 		}
@@ -98,7 +106,9 @@ 
 	 * @return array
 	 */
 	public function getDisabledFacetsArray() {
-		if (empty($this->owner->DisabledFacets)) return array();
+		if (empty($this->owner->DisabledFacets)) {
+			return array();
+		}
 		return explode(',', $this->owner->DisabledFacets);
 	}
 
@@ -108,11 +118,15 @@ 
 	 */
 	public function Facets() {
 		$spec       = $this->getFacetSpec();
-		if (empty($spec)) return new ArrayList;
+		if (empty($spec)) {
+			return new ArrayList;
+		}
 
 		// remove any disabled facets
 		foreach ($this->getDisabledFacetsArray() as $disabled) {
-			if (isset($spec[$disabled])) unset($spec[$disabled]);
+			if (isset($spec[$disabled])) {
+				unset($spec[$disabled]);
+			}
 		}
 
 		$request    = $this->getController()->getRequest();

Indentation +14 added lines, -14 removed lines

@@ -1,19 +1,19 @@
 <?php
 /**
- * This extension can be applied to ProductCategory
- * to allow categories to have facets as well.
- *
- * NOTE: You could apply this to either ProductCategory
- * or ProductCategory_Controller. I tend to use the model b/c
- * that will also cover some other cases like where you
- * might list subcategory products on the parent category page.
- * In such a case those products would be filtered as well.
- *
- * @author Mark Guinn <mark@adaircreative.com>
- * @date 10.22.2013
- * @package shop_search
- * @subpackage helpers
- */
+	 * This extension can be applied to ProductCategory
+	 * to allow categories to have facets as well.
+	 *
+	 * NOTE: You could apply this to either ProductCategory
+	 * or ProductCategory_Controller. I tend to use the model b/c
+	 * that will also cover some other cases like where you
+	 * might list subcategory products on the parent category page.
+	 * In such a case those products would be filtered as well.
+	 *
+	 * @author Mark Guinn <mark@adaircreative.com>
+	 * @date 10.22.2013
+	 * @package shop_search
+	 * @subpackage helpers
+	 */
 class FacetedCategory extends SiteTreeExtension
 {
 	private static $db = array(

code/helpers/ProductCategoryHelperMethods.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
 	 * @param bool $recursive [optional] - include the parents of the categories as well? - default: true
 	 * @return array - array of productCategory records
 	 */
-	protected function buildParentCategoriesArray($recursive=true) {
+	protected function buildParentCategoriesArray($recursive = true) {
 		$out = array();
 
 		// add the main parent
@@ -49,7 +49,7 @@ 
 	 * @return ArrayList - array of productCategory records
 	 */
 	public function getAllCategories() {
-		return new ArrayList( $this->buildParentCategoriesArray(false) );
+		return new ArrayList($this->buildParentCategoriesArray(false));
 	}
 
 
@@ -58,7 +58,7 @@ 
 	 * @return ArrayList - array of productCategory records
 	 */
 	public function getAllCategoriesRecursive() {
-		return new ArrayList( $this->buildParentCategoriesArray(true) );
+		return new ArrayList($this->buildParentCategoriesArray(true));
 	}
 
 
@@ -67,7 +67,7 @@ 
 	 * @return array - array of ID's
 	 */
 	public function getAllCategoryIDs() {
-		return array_keys( $this->buildParentCategoriesArray(false) );
+		return array_keys($this->buildParentCategoriesArray(false));
 	}
 
 
@@ -76,7 +76,7 @@ 
 	 * @return array - array of ID's
 	 */
 	public function getAllCategoryIDsRecursive() {
-		return array_keys( $this->buildParentCategoriesArray(true) );
+		return array_keys($this->buildParentCategoriesArray(true));
 	}
 
 

Braces +18 added lines, -6 removed lines

@@ -21,12 +21,18 @@ 
 
 		// add the main parent
 		$parent = $this->owner->Parent();
-		if (!$parent || !$parent->exists()) return $out;
-		if ($parent->ClassName == 'ProductCategory') $out[$parent->ID] = $parent;
+		if (!$parent || !$parent->exists()) {
+			return $out;
+		}
+		if ($parent->ClassName == 'ProductCategory') {
+			$out[$parent->ID] = $parent;
+		}
 
 		if ($recursive) {
 			foreach ($parent->getAncestors() as $rec) {
-				if ($rec->ClassName == 'ProductCategory') $out[$rec->ID] = $rec;
+				if ($rec->ClassName == 'ProductCategory') {
+					$out[$rec->ID] = $rec;
+				}
 			}
 		}
 
@@ -35,7 +41,9 @@ 
 			$out[$cat->ID] = $cat;
 			if ($recursive) {
 				foreach ($cat->getAncestors() as $rec) {
-					if ($rec->ClassName == 'ProductCategory') $out[$rec->ID] = $rec;
+					if ($rec->ClassName == 'ProductCategory') {
+						$out[$rec->ID] = $rec;
+					}
 				}
 			}
 		}
@@ -87,7 +95,9 @@ 
 	public function getAllCategoryTitles() {
 		$cats = $this->buildParentCategoriesArray(false);
 		$out = array();
-		foreach ($cats as $cat) $out[] = $cat->Title;
+		foreach ($cats as $cat) {
+			$out[] = $cat->Title;
+		}
 		return $out;
 	}
 
@@ -99,7 +109,9 @@ 
 	public function getAllCategoryTitlesRecursive() {
 		$cats = $this->buildParentCategoriesArray(true);
 		$out = array();
-		foreach ($cats as $cat) $out[] = $cat->Title;
+		foreach ($cats as $cat) {
+			$out[] = $cat->Title;
+		}
 		return $out;
 	}
 

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * Adds some methods to the Product class to list out all categories
- * a product is in. This is generally useful, but also really helps
- * with building search indexes.
- *
- * @author Mark Guinn <mark@adaircreative.com>
- * @date 05.23.2014
- * @package shop_search
- * @subpackage helpers
- */
+	 * Adds some methods to the Product class to list out all categories
+	 * a product is in. This is generally useful, but also really helps
+	 * with building search indexes.
+	 *
+	 * @author Mark Guinn <mark@adaircreative.com>
+	 * @date 05.23.2014
+	 * @package shop_search
+	 * @subpackage helpers
+	 */
 class ProductCategoryHelperMethods extends DataExtension
 {
 	/**

code/helpers/VirtualFieldIndexQueuedJob.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * If the queued jobs module is installed, this will be used instead of
- * updating vfi's in onBeforeWrite.
- *
- * @author  Mark Guinn <mark@adaircreative.com>
- * @date    07.02.2015
- * @package shop_search
- * @subpackage helpers
- */
+	 * If the queued jobs module is installed, this will be used instead of
+	 * updating vfi's in onBeforeWrite.
+	 *
+	 * @author  Mark Guinn <mark@adaircreative.com>
+	 * @date    07.02.2015
+	 * @package shop_search
+	 * @subpackage helpers
+	 */
 if(!interface_exists('QueuedJob')) return;
 
 class VirtualFieldIndexQueuedJob extends AbstractQueuedJob implements QueuedJob

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  * @package shop_search
  * @subpackage helpers
  */
-if(!interface_exists('QueuedJob')) return;
+if (!interface_exists('QueuedJob')) return;
 
 class VirtualFieldIndexQueuedJob extends AbstractQueuedJob implements QueuedJob
 {

Braces +3 added lines, -1 removed lines

@@ -8,7 +8,9 @@
  * @package shop_search
  * @subpackage helpers
  */
-if(!interface_exists('QueuedJob')) return;
+if(!interface_exists('QueuedJob')) {
+	return;
+}
 
 class VirtualFieldIndexQueuedJob extends AbstractQueuedJob implements QueuedJob
 {

tasks/BuildVFI.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Rebuilds all VirtualFieldIndexes
- *
- * @author Mark Guinn <mark@adaircreative.com>
- * @date 9.26.13
- * @package shop_search
- * @subpackage tasks
- */
+	 * Rebuilds all VirtualFieldIndexes
+	 *
+	 * @author Mark Guinn <mark@adaircreative.com>
+	 * @date 9.26.13
+	 * @package shop_search
+	 * @subpackage tasks
+	 */
 class BuildVFI extends BuildTask
 {
 	protected $title = 'Rebuild Virtual Field Indexes';

Spacing +5 added lines, -5 removed lines

@@ -76,9 +76,9 @@ 
 			$this->runFrom($_GET['class'], $_GET['start'], $_GET['field']);
 		}
 		else {
-			foreach(array('framework','sapphire') as $dirname) {
+			foreach (array('framework', 'sapphire') as $dirname) {
 				$script = sprintf("%s%s$dirname%scli-script.php", BASE_PATH, DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR);
-				if(file_exists($script)) {
+				if (file_exists($script)) {
 					break;
 				}
 			}
@@ -90,7 +90,7 @@ 
 				$query = $singleton->get($class);
 				$dtaQuery = $query->dataQuery();
 				$sqlQuery = $dtaQuery->getFinalisedQuery();
-				$singleton->extend('augmentSQL',$sqlQuery,$dtaQuery);
+				$singleton->extend('augmentSQL', $sqlQuery, $dtaQuery);
 				$total = $query->count();
 				$startFrom = isset($_GET['startfrom']) ? $_GET['startfrom'] : 0;
 				$field = isset($_GET['field']) ? $_GET['field'] : '';
@@ -100,9 +100,9 @@ 
 				for ($offset = $startFrom; $offset < $total; $offset += $this->stat('recordsPerRequest')) {
 					echo "$offset..";
 					$cmd = "php $script dev/tasks/$self class=$class start=$offset field=$field";
-					if($verbose) echo "\n  Running '$cmd'\n";
+					if ($verbose) echo "\n  Running '$cmd'\n";
 					$res = $verbose ? passthru($cmd) : `$cmd`;
-					if($verbose) echo "  ".preg_replace('/\r\n|\n/', '$0  ', $res)."\n";
+					if ($verbose) echo "  " . preg_replace('/\r\n|\n/', '$0  ', $res) . "\n";
 				}
 			}
 		}

Braces +22 added lines, -9 removed lines

@@ -27,8 +27,12 @@ 
 			$count  = $list->count();
 			for ($i = $n; $i < $count; $i += 10) {
 				$chunk = $list->limit(10, $i);
-				if (Controller::curr() instanceof TaskRunner) echo "Processing VFI #$i...\n";
-				foreach ($chunk as $rec) $rec->rebuildVFI();
+				if (Controller::curr() instanceof TaskRunner) {
+					echo "Processing VFI #$i...\n";
+				}
+				foreach ($chunk as $rec) {
+					$rec->rebuildVFI();
+				}
 			}
 			VirtualFieldIndex::build($c);
 
@@ -58,7 +62,9 @@ 
 
 		if (isset($_GET['class']) && isset($_GET['id'])) {
 			$item = DataObject::get($_GET['class'])->byID($_GET['id']);
-			if (!$item || !$item->exists()) die('not found: ' . $_GET['id']);
+			if (!$item || !$item->exists()) {
+				die('not found: ' . $_GET['id']);
+			}
 			$item->rebuildVFI();
 			echo "done";
 			return;
@@ -66,7 +72,9 @@ 
 
 		if (isset($_GET['link'])) {
 			$item = SiteTree::get_by_link($_GET['link']);
-			if (!$item || !$item->exists()) die('not found: ' . $_GET['link']);
+			if (!$item || !$item->exists()) {
+				die('not found: ' . $_GET['link']);
+			}
 			$item->rebuildVFI();
 			echo "done";
 			return;
@@ -74,8 +82,7 @@ 
 
 		if (isset($_GET['start'])) {
 			$this->runFrom($_GET['class'], $_GET['start'], $_GET['field']);
-		}
-		else {
+		} else {
 			foreach(array('framework','sapphire') as $dirname) {
 				$script = sprintf("%s%s$dirname%scli-script.php", BASE_PATH, DIRECTORY_SEPARATOR, DIRECTORY_SEPARATOR);
 				if(file_exists($script)) {
@@ -85,7 +92,9 @@ 
 
 			$classes = VirtualFieldIndex::get_classes_with_vfi();
 			foreach ($classes as $class) {
-				if (isset($_GET['class']) && $class != $_GET['class']) continue;
+				if (isset($_GET['class']) && $class != $_GET['class']) {
+					continue;
+				}
 				$singleton = singleton($class);
 				$query = $singleton->get($class);
 				$dtaQuery = $query->dataQuery();
@@ -100,9 +109,13 @@ 
 				for ($offset = $startFrom; $offset < $total; $offset += $this->stat('recordsPerRequest')) {
 					echo "$offset..";
 					$cmd = "php $script dev/tasks/$self class=$class start=$offset field=$field";
-					if($verbose) echo "\n  Running '$cmd'\n";
+					if($verbose) {
+						echo "\n  Running '$cmd'\n";
+					}
 					$res = $verbose ? passthru($cmd) : `$cmd`;
-					if($verbose) echo "  ".preg_replace('/\r\n|\n/', '$0  ', $res)."\n";
+					if($verbose) {
+						echo "  ".preg_replace('/\r\n|\n/', '$0  ', $res)."\n";
+					}
 				}
 			}
 		}

code/reports/SearchTermsReport.php

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Silverstripe report for searchs
- *
- * @author Mark Guinn <mark@adaircreative.com>
- * @date 09.24.2014
- * @package apluswhs.com
- * @subpackage
- */
+	 * Silverstripe report for searchs
+	 *
+	 * @author Mark Guinn <mark@adaircreative.com>
+	 * @date 09.24.2014
+	 * @package apluswhs.com
+	 * @subpackage
+	 */
 class SearchTermsReport extends ShopPeriodReport
 {
 	protected $title = "Search Terms";