markguinn / silverstripe-shop-search

code/ShopSearch.php

Braces +25 added lines, -8 removed lines

@@ -177,11 +177,20 @@ 
 		$qs_ps  = $this->config()->get('qs_parent_search');
 		$qs_t   = $this->config()->get('qs_title');
 		$qs_sort= $this->config()->get('qs_sort');
-		if ($limit < 0) $limit  = $this->config()->get('page_size');
-		if ($start < 0) $start  = !empty($vars['start']) ? (int)$vars['start'] : 0; // as far as i can see, fulltextsearch hard codes 'start'
+		if ($limit < 0) {
+			$limit  = $this->config()->get('page_size');
+		}
+		if ($start < 0) {
+			$start  = !empty($vars['start']) ? (int)$vars['start'] : 0;
+		}
+		// as far as i can see, fulltextsearch hard codes 'start'
 		$facets = $useFacets ? $this->config()->get('facets') : array();
-		if (!is_array($facets)) $facets = array();
-		if (empty($limit)) $limit = -1;
+		if (!is_array($facets)) {
+			$facets = array();
+		}
+		if (empty($limit)) {
+			$limit = -1;
+		}
 
 		// figure out and scrub the sort
 		$sortOptions = $this->config()->get('sort_options');
@@ -201,9 +210,15 @@ 
 		$results  = self::adapter()->searchFromVars($keywords, $filters, $facets, $start, $limit, $sort);
 
 		// massage the results a bit
-		if (!empty($keywords) && !$results->hasValue('Query')) $results->Query = $keywords;
-		if (!empty($filters) && !$results->hasValue('Filters')) $results->Filters = new ArrayData($filters);
-		if (!$results->hasValue('Sort')) $results->Sort = $sort;
+		if (!empty($keywords) && !$results->hasValue('Query')) {
+			$results->Query = $keywords;
+		}
+		if (!empty($filters) && !$results->hasValue('Filters')) {
+			$results->Filters = new ArrayData($filters);
+		}
+		if (!$results->hasValue('Sort')) {
+			$results->Sort = $sort;
+		}
 		if (!$results->hasValue('TotalMatches')) {
 			$results->TotalMatches = $results->Matches->hasMethod('getTotalItems')
 				? $results->Matches->getTotalItems()
@@ -329,7 +344,9 @@ 
 
 			$products   = array();
 			foreach ($results['products'] as $prod) {
-				if (!$prod || !$prod->exists()) continue;
+				if (!$prod || !$prod->exists()) {
+					continue;
+				}
 				$img = $prod->hasMethod('ProductImage') ? $prod->ProductImage() : $prod->Image();
 				$thumb = ($img && $img->exists()) ? $img->getThumbnail() : null;
 

code/ShopSearchAjax.php

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
 	 */
 	public function updateSearchResultsResponse(&$request, &$response, $results, $data) {
 		if ($request->isAjax() && $this->owner->hasExtension('AjaxControllerExtension')) {
-			if (!$response) $response = $this->owner->getAjaxResponse();
+			if (!$response) {
+				$response = $this->owner->getAjaxResponse();
+			}
 			$response->addRenderContext('RESULTS', $results);
 			$response->pushRegion('SearchResults', $results);
 			$response->pushRegion('SearchHeader', $results);

code/ShopSearchForm.php

Braces +6 added lines, -2 removed lines

@@ -29,7 +29,9 @@ 
 	function __construct($controller, $method, $suggestURL = '') {
 		$searchField = TextField::create('q', '');
 		$searchField->setAttribute('placeholder', _t('ShopSearch.SEARCH', 'Search'));
-		if ($suggestURL) $searchField->setAttribute('data-suggest-url', $suggestURL);
+		if ($suggestURL) {
+			$searchField->setAttribute('data-suggest-url', $suggestURL);
+		}
 
 		$fields = FieldList::create($searchField);
 		if (!self::config()->disable_category_dropdown) {
@@ -48,7 +50,9 @@ 
 
 		$this->setFormMethod('GET');
 		$this->disableSecurityToken();
-		if ($c = self::config()->css_classes) $this->addExtraClass($c);
+		if ($c = self::config()->css_classes) {
+			$this->addExtraClass($c);
+		}
 
 		Requirements::css(SHOP_SEARCH_FOLDER . '/css/ShopSearch.css');
 

code/adapters/ShopSearchSimple.php

Braces +3 added lines, -1 removed lines

@@ -37,7 +37,9 @@
 					$keywordFilter[$name] = $keywords;
 				}
 			}
-			if (count($keywordFilter) > 0) $list = $list->filterAny($keywordFilter);
+			if (count($keywordFilter) > 0) {
+				$list = $list->filterAny($keywordFilter);
+			}
 
 			// add in any other filters
 			$list = FacetHelper::inst()->addFiltersToDataList($list, $filters);

code/adapters/ShopSearchSolr.php

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

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

Braces +99 added lines, -33 removed lines

@@ -41,12 +41,18 @@ 
 	 * @return array
 	 */
 	public function scrubFilters($filters) {
-		if (!is_array($filters)) $filters = array();
+		if (!is_array($filters)) {
+			$filters = array();
+		}
 
 		foreach ($filters as $k => $v) {
-			if (empty($v)) unset($filters[$k]);
+			if (empty($v)) {
+				unset($filters[$k]);
+			}
 			// this allows you to send an array as a comma-separated list, which is easier on the query string length
-			if (is_string($v) && strpos($v, 'LIST~') === 0) $filters[$k] = explode(',', substr($v, 5));
+			if (is_string($v) && strpos($v, 'LIST~') === 0) {
+				$filters[$k] = explode(',', substr($v, 5));
+			}
 		}
 
 		return $filters;
@@ -60,8 +66,12 @@ 
 	 * @return DataList
 	 */
 	public function addFiltersToDataList($list, array $filters, $sing=null) {
-		if (!$sing) $sing = singleton($list->dataClass());
-		if (is_string($sing)) $sing = singleton($sing);
+		if (!$sing) {
+			$sing = singleton($list->dataClass());
+		}
+		if (is_string($sing)) {
+			$sing = singleton($sing);
+		}
 
 		if (!empty($filters)) {
 			foreach ($filters as $filterField => $filterVal) {
@@ -105,7 +115,9 @@ 
 				// Lists have to be handled a little differently
 				$f = $rec->getVFIFieldName($filterField) . ':PartialMatch';
 				if (is_array($filterVal)) {
-					foreach ($filterVal as &$val) $val = '|' . $val . '|';
+					foreach ($filterVal as &$val) {
+						$val = '|' . $val . '|';
+					}
 					return array($f => $filterVal);
 				} else {
 					return array($f => '|' . $filterVal . '|');
@@ -137,7 +149,9 @@ 
 	 * @return array
 	 */
 	public function expandFacetSpec(array $facetSpec) {
-		if (is_null($facetSpec)) return array();
+		if (is_null($facetSpec)) {
+			return array();
+		}
 		$facets = array();
 
 		foreach ($facetSpec as $field => $label) {
@@ -147,14 +161,20 @@ 
 				$facets[$field] = array('Label' => $label);
 			}
 
-			if (empty($facets[$field]['Source'])) $facets[$field]['Source'] = $field;
-			if (empty($facets[$field]['Type']))  $facets[$field]['Type']  = ShopSearch::FACET_TYPE_LINK;
+			if (empty($facets[$field]['Source'])) {
+				$facets[$field]['Source'] = $field;
+			}
+			if (empty($facets[$field]['Type'])) {
+				$facets[$field]['Type']  = ShopSearch::FACET_TYPE_LINK;
+			}
 
 			if (empty($facets[$field]['Values'])) {
 				$facets[$field]['Values'] = array();
 			} else {
 				$vals = $facets[$field]['Values'];
-				if (is_string($vals)) $vals = eval('return ' . $vals . ';');
+				if (is_string($vals)) {
+					$vals = eval('return ' . $vals . ';');
+				}
 				$facets[$field]['Values'] = array();
 				foreach ($vals as $val => $lbl) {
 					$facets[$field]['Values'][$val] = new ArrayData(array(
@@ -199,7 +219,9 @@ 
 	 */
 	public function buildFacets(SS_List $matches, array $facetSpec, $autoFacetAttributes=false) {
 		$facets = $this->expandFacetSpec($facetSpec);
-		if (!$autoFacetAttributes && (empty($facets) || !$matches || !$matches->count())) return new ArrayList();
+		if (!$autoFacetAttributes && (empty($facets) || !$matches || !$matches->count())) {
+			return new ArrayList();
+		}
 		$fasterMethod = (bool)$this->config()->faster_faceting;
 
 		// fill them in
@@ -212,8 +234,12 @@ 
 			// NOTE: using this method range and checkbox facets don't get counts
 			if ($fasterMethod && $facet['Type'] != ShopSearch::FACET_TYPE_LINK) {
 				if ($facet['Type'] == ShopSearch::FACET_TYPE_RANGE) {
-					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'];
+					}
 				}
 
 				continue;
@@ -222,25 +248,37 @@ 
 			foreach ($matches as $rec) {
 				// If it's a range facet, set up the min/max
 				if ($facet['Type'] == ShopSearch::FACET_TYPE_RANGE) {
-					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'];
+					}
 				}
 
 				// If the field is accessible via normal methods, including
 				// a user-defined getter, prefer that
 				$fieldValue = $rec->relObject($field);
-				if (is_null($fieldValue) && $rec->hasMethod($meth = "get{$field}")) $fieldValue = $rec->$meth();
+				if (is_null($fieldValue) && $rec->hasMethod($meth = "get{$field}")) {
+					$fieldValue = $rec->$meth();
+				}
 
 				// If not, look for a VFI field
-				if (!$fieldValue && $rec->hasExtension('VirtualFieldIndex')) $fieldValue = $rec->getVFI($field);
+				if (!$fieldValue && $rec->hasExtension('VirtualFieldIndex')) {
+					$fieldValue = $rec->getVFI($field);
+				}
 
 				// If we found something, process it
 				if (!empty($fieldValue)) {
 					// normalize so that it's iterable
-					if (!is_array($fieldValue) && !$fieldValue instanceof SS_List) $fieldValue = array($fieldValue);
+					if (!is_array($fieldValue) && !$fieldValue instanceof SS_List) {
+						$fieldValue = array($fieldValue);
+					}
 
 					foreach ($fieldValue as $obj) {
-						if (empty($obj)) continue;
+						if (empty($obj)) {
+							continue;
+						}
 
 						// figure out the right label
 						if (is_object($obj) && $obj->hasMethod('Nice')) {
@@ -311,7 +349,9 @@ 
 		$out = new ArrayList();
 		$sortValues = self::config()->sort_facet_values;
 		foreach ($facets as $f) {
-			if ($sortValues) ksort($f['Values']);
+			if ($sortValues) {
+				ksort($f['Values']);
+			}
 			$f['Values'] = new ArrayList($f['Values']);
 			$out->push(new ArrayData($f));
 		}
@@ -335,7 +375,9 @@ 
 		}
 
 		$baseTable = $q->getFrom();
-		if (is_array($baseTable)) $baseTable = reset($baseTable);
+		if (is_array($baseTable)) {
+			$baseTable = reset($baseTable);
+		}
 
 		$q = $q->setSelect(array())
 			->selectField('"ProductAttributeValue"."ID"', 'Value')
@@ -367,7 +409,9 @@ 
 
 		// this is the easiest way to get SiteTree vs SiteTree_Live
 		$baseTable = $q->getFrom();
-		if (is_array($baseTable)) $baseTable = reset($baseTable);
+		if (is_array($baseTable)) {
+			$baseTable = reset($baseTable);
+		}
 
 		$q = $q->setSelect(array())
 			->selectField('"ProductAttributeType"."ID"', 'TypeID')
@@ -395,7 +439,9 @@ 
 		$curFacet = null;
 		foreach ($q as $row) {
 			if ($curType != $row['TypeID']) {
-				if ($curType > 0) $facets['ATT'.$curType] = $curFacet;
+				if ($curType > 0) {
+					$facets['ATT'.$curType] = $curFacet;
+				}
 				$curType = $row['TypeID'];
 				$curFacet = array(
 					'Label'  => $row['TypeLabel'],
@@ -410,7 +456,9 @@ 
 			$curFacet['Values'][ $row['Value'] ] = new ArrayData($row);
 		}
 
-		if ($curType > 0) $facets['ATT'.$curType] = $curFacet;
+		if ($curType > 0) {
+			$facets['ATT'.$curType] = $curFacet;
+		}
 		return $facets;
 	}
 
@@ -432,7 +480,9 @@ 
 			switch ($facet->Type) {
 				case ShopSearch::FACET_TYPE_RANGE:
 					$params = array_merge($baseParams, array());
-					if (!isset($params[$qs_f])) $params[$qs_f] = array();
+					if (!isset($params[$qs_f])) {
+						$params[$qs_f] = array();
+					}
 					$params[$qs_f][$facet->Source] = 'RANGEFACETVALUE';
 					$params[$qs_t] = $facet->Label . ': RANGEFACETLABEL';
 					$facet->Link = $baseLink . '?' . http_build_query($params);
@@ -453,7 +503,9 @@ 
 						$params = array_merge($baseParams, array());
 
 						// add the filter for this value
-						if (!isset($params[$qs_f])) $params[$qs_f] = array();
+						if (!isset($params[$qs_f])) {
+							$params[$qs_f] = array();
+						}
 						if ($facet->Type == ShopSearch::FACET_TYPE_CHECKBOX) {
 							unset($params[$qs_f][$facet->Source]); // this will be figured out via javascript
 							$params[$qs_t] = ($value->Active ? 'Remove ' : '') . $facet->Label . ': ' . $value->Label;
@@ -481,7 +533,9 @@ 
 
 		foreach ($children as $child) {
 			$out[$child->Value] = $child->Value;
-			if (!empty($child->Children)) $out += $this->getRecursiveChildValues($child->Children);
+			if (!empty($child->Children)) {
+				$out += $this->getRecursiveChildValues($child->Children);
+			}
 		}
 
 		return $out;
@@ -507,7 +561,9 @@ 
 					}
 				} else {
 					$filterVals = $filters[$facet->Source];
-					if (!is_array($filterVals)) $filterVals = array($filterVals);
+					if (!is_array($filterVals)) {
+						$filterVals = array($filterVals);
+					}
 					$this->updateCheckboxFacetState(
 						!empty($facet->NestedValues) ? $facet->NestedValues : $facet->Values,
 						$filterVals,
@@ -541,7 +597,9 @@ 
 					// This wouldn't be normal, but even if it's not a leaf, we want to handle
 					// the case where a filter might be set for this node. It should still show up correctly.
 					$value->Active = true;
-					foreach ($value->Children as $c) $c->Active = true;
+					foreach ($value->Children as $c) {
+						$c->Active = true;
+					}
 					// TODO: handle more than one level of recursion here
 				} else {
 					$value->Active = $this->updateCheckboxFacetState($value->Children, $filterVals, $filterOnlyLeaves);
@@ -550,7 +608,9 @@ 
 				$value->Active = in_array($value->Value, $filterVals);
 			}
 
-			if ($value->Active) $out = true;
+			if ($value->Active) {
+				$out = true;
+			}
 		}
 
 		return $out;
@@ -571,19 +631,25 @@ 
 				$parentStack = array();
 
 				foreach ($facet->Values as $value) {
-					if (empty($value->Label)) continue;
+					if (empty($value->Label)) {
+						continue;
+					}
 					$value->FullLabel = $value->Label;
 
 					// Look for the most recent parent that matches the beginning of this one
 					while (count($parentStack) > 0) {
 						$curParent = $parentStack[ count($parentStack)-1 ];
 						if (strpos($value->Label, $curParent->FullLabel) === 0) {
-							if (!isset($curParent->Children)) $curParent->Children = new ArrayList();
+							if (!isset($curParent->Children)) {
+								$curParent->Children = new ArrayList();
+							}
 
 							// Modify the name so we only show the last component
 							$value->FullLabel = $value->Label;
 							$p = strrpos($value->Label, $facet->HierarchyDivider);
-							if ($p > -1) $value->Label = trim( substr($value->Label, $p + 1) );
+							if ($p > -1) {
+								$value->Label = trim( substr($value->Label, $p + 1) );
+							}
 
 							$curParent->Children->push($value);
 							break;

code/helpers/FacetedCategory.php

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

code/helpers/HasStaticAttributes.php

Braces +21 added lines, -7 removed lines

@@ -70,7 +70,9 @@ 
 		}
 
 		foreach ($this->owner->StaticAttributeValues() as $val) {
-			if (!isset($list[$val->TypeID])) continue;
+			if (!isset($list[$val->TypeID])) {
+				continue;
+			}
 			$list[$val->TypeID]->ActiveValues->push($val);
 		}
 
@@ -86,7 +88,9 @@ 
 			$defaultAttributes = Config::inst()->get($this->owner->ClassName, 'default_attributes');
 			if (!empty($defaultAttributes)) {
 				$types = $this->owner->StaticAttributeTypes();
-				foreach ($defaultAttributes as $typeID) $types->add($typeID);
+				foreach ($defaultAttributes as $typeID) {
+					$types->add($typeID);
+				}
 			}
 		}
 	}
@@ -131,11 +135,17 @@ 
 	 */
 	public function saveInto(DataObjectInterface $record) {
 		$fieldname  = $this->getFieldName();
-		if (empty($fieldname)) return;
+		if (empty($fieldname)) {
+			return;
+		}
 		$typeID     = $this->getAttributeTypeID();
-		if (empty($typeID)) return;
+		if (empty($typeID)) {
+			return;
+		}
 		$relation   = $record->$fieldname();
-		if (!$relation) return;
+		if (!$relation) {
+			return;
+		}
 		$relation   = $relation->filter('TypeID', $typeID);
 
 		// make a list of id's that should be there
@@ -160,10 +170,14 @@ 
 		}
 
 		// add
-		foreach ($idList as $id) $relation->add($id);
+		foreach ($idList as $id) {
+			$relation->add($id);
+		}
 
 		// remove
-		foreach ($toDelete as $id) $relation->removeByID($id);
+		foreach ($toDelete as $id) {
+			$relation->removeByID($id);
+		}
 	}