markguinn / silverstripe-shop-search

code/ShopSearch.php

Spacing +7 added lines, -7 removed lines

@@ -171,12 +171,12 @@ 
 	 * @param int $limit [optional]
 	 * @return ArrayData
 	 */
-	public function search(array $vars, $logSearch=true, $useFacets=true, $start=-1, $limit=-1) {
+	public function search(array $vars, $logSearch = true, $useFacets = true, $start = -1, $limit = -1) {
 		$qs_q   = $this->config()->get('qs_query');
 		$qs_f   = $this->config()->get('qs_filters');
 		$qs_ps  = $this->config()->get('qs_parent_search');
 		$qs_t   = $this->config()->get('qs_title');
-		$qs_sort= $this->config()->get('qs_sort');
+		$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'
 		$facets = $useFacets ? $this->config()->get('facets') : array();
@@ -187,7 +187,7 @@ 
 		$sortOptions = $this->config()->get('sort_options');
 		$sort        = !empty($vars[$qs_sort]) ? $vars[$qs_sort] : '';
 		if (!isset($sortOptions[$sort])) {
-			$sort    = current(array_keys($sortOptions));
+			$sort = current(array_keys($sortOptions));
 		}
 
 		// figure out and scrub the filters
@@ -198,7 +198,7 @@ 
 		if ($keywordRegex = $this->config()->get('keyword_filter_regex')) {
 			$keywords = preg_replace($keywordRegex, '', $keywords);
 		}
-		$results  = self::adapter()->searchFromVars($keywords, $filters, $facets, $start, $limit, $sort);
+		$results = self::adapter()->searchFromVars($keywords, $filters, $facets, $start, $limit, $sort);
 
 		// massage the results a bit
 		if (!empty($keywords) && !$results->hasValue('Query')) $results->Query = $keywords;
@@ -250,7 +250,7 @@ 
 	 * @param string $str
 	 * @return SS_Query
 	 */
-	public function getSuggestQuery($str='') {
+	public function getSuggestQuery($str = '') {
 		$hasResults = 'CASE WHEN max("SearchLog"."NumResults") > 0 THEN 1 ELSE 0 END';
 		$searchCount = 'count(distinct "SearchLog"."ID")';
 		$q = new SQLQuery();
@@ -281,7 +281,7 @@ 
 	 * @param string $str
 	 * @return array
 	 */
-	public function suggest($str='') {
+	public function suggest($str = '') {
 		$adapter = self::adapter();
 		if ($adapter->hasMethod('suggest')) {
 			return $adapter->suggest($str);
@@ -327,7 +327,7 @@ 
 				? $results['products']->getTotalItems()
 				: $results['products']->count();
 
-			$products   = array();
+			$products = array();
 			foreach ($results['products'] as $prod) {
 				if (!$prod || !$prod->exists()) continue;
 				$img = $prod->hasMethod('ProductImage') ? $prod->ProductImage() : $prod->Image();

code/ShopSearchAdapter.php

Spacing +1 added lines, -1 removed lines

@@ -17,5 +17,5 @@
 	 * @param string $sort [optional]
 	 * @return ArrayData - must contain at least 'Matches' with an list of data objects that match the search
 	 */
-	function searchFromVars($keywords, array $filters=array(), array $facetSpec=array(), $start=-1, $limit=-1, $sort='');
+	function searchFromVars($keywords, array $filters = array(), array $facetSpec = array(), $start = -1, $limit = -1, $sort = '');
 }

code/ShopSearchControllerExtension.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
 		// convert the search results into usable json for search-as-you-type
 		if (ShopSearch::config()->search_as_you_type_enabled) {
 			$searchVars = $req->requestVars();
-			$searchVars[ ShopSearch::config()->qs_query ] = $searchVars['term'];
+			$searchVars[ShopSearch::config()->qs_query] = $searchVars['term'];
 			unset($searchVars['term']);
 			$results = ShopSearch::inst()->suggestWithResults($searchVars);
 		} else {
@@ -56,7 +56,7 @@ 
 	 */
 	public function onAfterInit() {
 		$req = $this->owner->getRequest();
-		$src = $req->requestVar( Config::inst()->get('ShopSearch', 'qs_source') );
+		$src = $req->requestVar(Config::inst()->get('ShopSearch', 'qs_source'));
 		if ($src) {
 			$qs_q   = Config::inst()->get('ShopSearch', 'qs_query');
 			$qs_f   = Config::inst()->get('ShopSearch', 'qs_filters');

code/ShopSearchForm.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
 
 			$emptyString = self::config()->category_empty_string;
 			if ($emptyString !== 'NONE') {
-				$catField->setEmptyString(_t('ShopSearch.'.$emptyString, $emptyString));
+				$catField->setEmptyString(_t('ShopSearch.' . $emptyString, $emptyString));
 			}
 
 			$fields->push($catField);

code/adapters/ShopSearchMysql.php

Spacing +5 added lines, -5 removed lines

@@ -18,7 +18,7 @@ 
 	 * @param string $sort [optional]
 	 * @return ArrayData
 	 */
-	function searchFromVars($keywords, array $filters=array(), array $facetSpec=array(), $start=-1, $limit=-1, $sort='') {
+	function searchFromVars($keywords, array $filters = array(), array $facetSpec = array(), $start = -1, $limit = -1, $sort = '') {
 		$searchable = ShopSearch::get_searchable_classes();
 		$matches = new ArrayList;
 
@@ -32,13 +32,13 @@ 
 			$filter = array();
 
 			// Use parametrized query if SilverStripe >= 3.2
-			if(SHOP_SEARCH_IS_SS32){
-				foreach($keywordFields as $indexFields){
+			if (SHOP_SEARCH_IS_SS32) {
+				foreach ($keywordFields as $indexFields) {
 					$filter[] = array("MATCH ($indexFields) AGAINST (?)" => $keywords);
 				}
 				$list = $list->whereAny($filter);
 			} else {
-				foreach($keywordFields as $indexFields){
+				foreach ($keywordFields as $indexFields) {
 					$filter[] = sprintf("MATCH ($indexFields) AGAINST ('%s')", Convert::raw2sql($keywords));
 				}
 				// join all the filters with an "OR" statement
@@ -78,7 +78,7 @@ 
 			}
 		}
 
-		if(count($indexList) === 0){
+		if (count($indexList) === 0) {
 			throw new Exception("Class $className does not appear to have any fulltext indexes");
 		}
 

code/adapters/ShopSearchSimple.php

Spacing +6 added lines, -6 removed lines

@@ -19,7 +19,7 @@ 
 	 * @param string $sort [optional]
 	 * @return ArrayData
 	 */
-	function searchFromVars($keywords, array $filters=array(), array $facetSpec=array(), $start=-1, $limit=-1, $sort='') {
+	function searchFromVars($keywords, array $filters = array(), array $facetSpec = array(), $start = -1, $limit = -1, $sort = '') {
 		$searchable = ShopSearch::get_searchable_classes();
 		$matches = new ArrayList;
 
@@ -32,7 +32,7 @@ 
 			// convert that list into something we can pass to Datalist::filter
 			$keywordFilter = array();
 			if (!empty($keywords)) {
-				foreach($keywordFields as $searchField) {
+				foreach ($keywordFields as $searchField) {
 					$name = (strpos($searchField, ':') !== FALSE) ? $searchField : "$searchField:PartialMatch";
 					$keywordFilter[$name] = $keywords;
 				}
@@ -63,15 +63,15 @@ 
 	protected function scaffoldSearchFields($dataClass) {
 		$obj = singleton($dataClass);
 		$fields = null;
-		if($fieldSpecs = $obj->searchableFields()) {
+		if ($fieldSpecs = $obj->searchableFields()) {
 			$customSearchableFields = $obj->stat('searchable_fields');
-			foreach($fieldSpecs as $name => $spec) {
-				if(is_array($spec) && array_key_exists('filter', $spec)) {
+			foreach ($fieldSpecs as $name => $spec) {
+				if (is_array($spec) && array_key_exists('filter', $spec)) {
 					// The searchableFields() spec defaults to PartialMatch,
 					// so we need to check the original setting.
 					// If the field is defined $searchable_fields = array('MyField'),
 					// then default to StartsWith filter, which makes more sense in this context.
-					if(!$customSearchableFields || array_search($name, $customSearchableFields)) {
+					if (!$customSearchableFields || array_search($name, $customSearchableFields)) {
 						$filter = 'PartialMatch';
 					} else {
 						$filter = preg_replace('/Filter$/', '', $spec['filter']);

code/adapters/ShopSearchSolr.php

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

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

code/helpers/FacetHelper.php

Spacing +16 added lines, -16 removed lines

@@ -59,7 +59,7 @@ 
 	 * @param DataObject|string $sing - just a singleton object we can get information off of
 	 * @return DataList
 	 */
-	public function addFiltersToDataList($list, array $filters, $sing=null) {
+	public function addFiltersToDataList($list, array $filters, $sing = null) {
 		if (!$sing) $sing = singleton($list->dataClass());
 		if (is_string($sing)) $sing = singleton($sing);
 
@@ -148,7 +148,7 @@ 
 			}
 
 			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]['Type']))  $facets[$field]['Type'] = ShopSearch::FACET_TYPE_LINK;
 
 			if (empty($facets[$field]['Values'])) {
 				$facets[$field]['Values'] = array();
@@ -197,7 +197,7 @@ 
 	 * @param bool $autoFacetAttributes [optional]
 	 * @return ArrayList
 	 */
-	public function buildFacets(SS_List $matches, array $facetSpec, $autoFacetAttributes=false) {
+	public function buildFacets(SS_List $matches, array $facetSpec, $autoFacetAttributes = false) {
 		$facets = $this->expandFacetSpec($facetSpec);
 		if (!$autoFacetAttributes && (empty($facets) || !$matches || !$matches->count())) return new ArrayList();
 		$fasterMethod = (bool)$this->config()->faster_faceting;
@@ -340,9 +340,9 @@ 
 		$q = $q->setSelect(array())
 			->selectField('"ProductAttributeValue"."ID"', 'Value')
 			->selectField('"ProductAttributeValue"."Value"', 'Label')
-			->selectField('count(distinct '.$baseTable.'."ID")', 'Count')
+			->selectField('count(distinct ' . $baseTable . '."ID")', 'Count')
 			->selectField('"ProductAttributeValue"."Sort"')
-			->addInnerJoin('Product_StaticAttributeValues', $baseTable.'."ID" = "Product_StaticAttributeValues"."ProductID"')
+			->addInnerJoin('Product_StaticAttributeValues', $baseTable . '."ID" = "Product_StaticAttributeValues"."ProductID"')
 			->addInnerJoin('ProductAttributeValue', '"Product_StaticAttributeValues"."ProductAttributeValueID" = "ProductAttributeValue"."ID"')
 			->addWhere(sprintf("\"ProductAttributeValue\".\"TypeID\" = '%d'", $typeID))
 			->setOrderBy('"ProductAttributeValue"."Sort"', 'ASC')
@@ -352,7 +352,7 @@ 
 
 		$facet['Values'] = array();
 		foreach ($q as $row) {
-			$facet['Values'][ $row['Value'] ] = new ArrayData($row);
+			$facet['Values'][$row['Value']] = new ArrayData($row);
 		}
 	}
 
@@ -374,11 +374,11 @@ 
 			->selectField('"ProductAttributeType"."Label"', 'TypeLabel')
 			->selectField('"ProductAttributeValue"."ID"', 'Value')
 			->selectField('"ProductAttributeValue"."Value"', 'Label')
-			->selectField('count(distinct '.$baseTable.'."ID")', 'Count')
+			->selectField('count(distinct ' . $baseTable . '."ID")', 'Count')
 			->selectField('"ProductAttributeValue"."Sort"')
-			->addInnerJoin('Product_StaticAttributeTypes', $baseTable.'."ID" = "Product_StaticAttributeTypes"."ProductID"')
+			->addInnerJoin('Product_StaticAttributeTypes', $baseTable . '."ID" = "Product_StaticAttributeTypes"."ProductID"')
 			->addInnerJoin('ProductAttributeType', '"Product_StaticAttributeTypes"."ProductAttributeTypeID" = "ProductAttributeType"."ID"')
-			->addInnerJoin('Product_StaticAttributeValues', $baseTable.'."ID" = "Product_StaticAttributeValues"."ProductID"')
+			->addInnerJoin('Product_StaticAttributeValues', $baseTable . '."ID" = "Product_StaticAttributeValues"."ProductID"')
 			->addInnerJoin('ProductAttributeValue', '"Product_StaticAttributeValues"."ProductAttributeValueID" = "ProductAttributeValue"."ID"'
 			    . ' AND "ProductAttributeValue"."TypeID" = "ProductAttributeType"."ID"')
 			->setOrderBy(array(
@@ -395,11 +395,11 @@ 
 		$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'],
-					'Source' => 'ATT'.$curType,
+					'Source' => 'ATT' . $curType,
 					'Type'   => ShopSearch::FACET_TYPE_LINK,
 					'Values' => array(),
 				);
@@ -407,10 +407,10 @@ 
 
 			unset($row['TypeID']);
 			unset($row['TypeLabel']);
-			$curFacet['Values'][ $row['Value'] ] = new ArrayData($row);
+			$curFacet['Values'][$row['Value']] = new ArrayData($row);
 		}
 
-		if ($curType > 0) $facets['ATT'.$curType] = $curFacet;
+		if ($curType > 0) $facets['ATT' . $curType] = $curFacet;
 		return $facets;
 	}
 
@@ -532,7 +532,7 @@ 
 	 * @param bool      $filterOnlyLeaves [optional]
 	 * @return bool - true if any of the children are true, false if all children are false
 	 */
-	protected function updateCheckboxFacetState(ArrayList $values, array $filterVals, $filterOnlyLeaves=false) {
+	protected function updateCheckboxFacetState(ArrayList $values, array $filterVals, $filterOnlyLeaves = false) {
 		$out = false;
 
 		foreach ($values as $value) {
@@ -576,14 +576,14 @@ 
 
 					// Look for the most recent parent that matches the beginning of this one
 					while (count($parentStack) > 0) {
-						$curParent = $parentStack[ count($parentStack)-1 ];
+						$curParent = $parentStack[count($parentStack) - 1];
 						if (strpos($value->Label, $curParent->FullLabel) === 0) {
 							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;