markguinn / silverstripe-shop-search

tasks/BuildVFI.php

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

code/ShopSearch.php

Spacing +6 added lines, -6 removed lines

@@ -175,13 +175,13 @@ 
      * @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');
         }
@@ -211,7 +211,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')) {
@@ -269,7 +269,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")';
@@ -301,7 +301,7 @@ 
      * @param string $str
      * @return array
      */
-    public function suggest($str='')
+    public function suggest($str = '')
     {
         $adapter = self::adapter();
         if ($adapter->hasMethod('suggest')) {
@@ -349,7 +349,7 @@ 
                 ? $results['products']->getTotalItems()
                 : $results['products']->count();
 
-            $products   = array();
+            $products = array();
             foreach ($results['products'] as $prod) {
                 if (!$prod || !$prod->exists()) {
                     continue;

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
      */
-    public function searchFromVars($keywords, array $filters=array(), array $facetSpec=array(), $start=-1, $limit=-1, $sort='');
+    public function searchFromVars($keywords, array $filters = array(), array $facetSpec = array(), $start = -1, $limit = -1, $sort = '');
 }

code/ShopSearchControllerExtension.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,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 {

code/ShopSearchForm.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,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/ShopSearchSimple.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
      * @param string $sort [optional]
      * @return ArrayData
      */
-    public function searchFromVars($keywords, array $filters=array(), array $facetSpec=array(), $start=-1, $limit=-1, $sort='')
+    public function searchFromVars($keywords, array $filters = array(), array $facetSpec = array(), $start = -1, $limit = -1, $sort = '')
     {
         $searchable = ShopSearch::get_searchable_classes();
         $matches = new ArrayList;

code/adapters/ShopSearchSolr.php

Spacing +18 added lines, -18 removed lines

@@ -251,7 +251,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(
@@ -371,14 +371,14 @@ 
 
         foreach ($query->classes as $class) {
             if (!empty($class['includeSubclasses'])) {
-                $classq[] = 'ClassHierarchy:'.$class['class'];
+                $classq[] = 'ClassHierarchy:' . $class['class'];
             } else {
-                $classq[] = 'ClassName:'.$class['class'];
+                $classq[] = 'ClassName:' . $class['class'];
             }
         }
 
         if ($classq) {
-            $fq[] = '+('.implode(' ', $classq).')';
+            $fq[] = '+(' . implode(' ', $classq) . ')';
         }
 
         // Filter by filters
@@ -401,11 +401,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) {
@@ -428,11 +428,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()) {
@@ -550,11 +550,11 @@ 
                     $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;
                 }
             }
         }
@@ -565,14 +565,14 @@ 
 
         foreach ($query->classes as $class) {
             if (!empty($class['includeSubclasses'])) {
-                $classq[] = 'ClassHierarchy:'.$class['class'];
+                $classq[] = 'ClassHierarchy:' . $class['class'];
             } else {
-                $classq[] = 'ClassName:'.$class['class'];
+                $classq[] = 'ClassName:' . $class['class'];
             }
         }
 
         if ($classq) {
-            $fq[] = '+('.implode(' ', $classq).')';
+            $fq[] = '+(' . implode(' ', $classq) . ')';
         }
 
         // Filter by filters
@@ -596,11 +596,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) {
@@ -623,11 +623,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()) {

code/helpers/FacetHelper.php

Spacing +15 added lines, -15 removed lines

@@ -67,7 +67,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());
@@ -170,7 +170,7 @@ 
                 $facets[$field]['Source'] = $field;
             }
             if (empty($facets[$field]['Type'])) {
-                $facets[$field]['Type']  = ShopSearch::FACET_TYPE_LINK;
+                $facets[$field]['Type'] = ShopSearch::FACET_TYPE_LINK;
             }
 
             if (empty($facets[$field]['Values'])) {
@@ -222,7 +222,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())) {
@@ -389,9 +389,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')
@@ -401,7 +401,7 @@ 
 
         $facet['Values'] = array();
         foreach ($q as $row) {
-            $facet['Values'][ $row['Value'] ] = new ArrayData($row);
+            $facet['Values'][$row['Value']] = new ArrayData($row);
         }
     }
 
@@ -426,11 +426,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(
@@ -448,12 +448,12 @@ 
         foreach ($q as $row) {
             if ($curType != $row['TypeID']) {
                 if ($curType > 0) {
-                    $facets['ATT'.$curType] = $curFacet;
+                    $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(),
                 );
@@ -461,11 +461,11 @@ 
 
             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;
+            $facets['ATT' . $curType] = $curFacet;
         }
         return $facets;
     }
@@ -599,7 +599,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;
 
@@ -651,7 +651,7 @@ 
 
                     // 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();

code/helpers/FacetedCategory.php

Spacing +3 added lines, -3 removed lines

@@ -73,7 +73,7 @@ 
      */
     protected function getFilters()
     {
-        $qs_f       = Config::inst()->get('ShopSearch', 'qs_filters');
+        $qs_f = Config::inst()->get('ShopSearch', 'qs_filters');
         if (!$qs_f) {
             return array();
         }
@@ -90,7 +90,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');
@@ -124,7 +124,7 @@ 
      */
     public function Facets()
     {
-        $spec       = $this->getFacetSpec();
+        $spec = $this->getFacetSpec();
         if (empty($spec)) {
             return new ArrayList;
         }