markguinn / silverstripe-shop-search

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

code/helpers/ProductCategoryHelperMethods.php

Spacing +1 added lines, -1 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();
 

code/adapters/ShopSearchMysql.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/ShopSearchForm.php

Spacing +6 added lines, -6 removed lines

@@ -55,13 +55,13 @@ 
             $this->addExtraClass($c);
         }
 
-        Requirements::css(SHOP_SEARCH_FOLDER . '/css/ShopSearch.css');
+        Requirements::css(SHOP_SEARCH_FOLDER.'/css/ShopSearch.css');
 
         if (Config::inst()->get('ShopSearch', 'suggest_enabled')) {
-            Requirements::javascript(THIRDPARTY_DIR . '/jquery-ui/jquery-ui.js');
-            Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css');
-            Requirements::javascript(SHOP_SEARCH_FOLDER . '/javascript/search.suggest.js');
-            Requirements::javascript(SHOP_SEARCH_FOLDER . '/javascript/search.js');
+            Requirements::javascript(THIRDPARTY_DIR.'/jquery-ui/jquery-ui.js');
+            Requirements::css(THIRDPARTY_DIR.'/jquery-ui-themes/smoothness/jquery-ui.css');
+            Requirements::javascript(SHOP_SEARCH_FOLDER.'/javascript/search.suggest.js');
+            Requirements::javascript(SHOP_SEARCH_FOLDER.'/javascript/search.js');
         }
     }
 
@@ -124,7 +124,7 @@ 
         $sortParams = array_merge($data, array($qs_sort => 'NEWSORTVALUE'));
         unset($sortParams['url']);
         $results->SortControl = DropdownField::create($qs_sort, ShopSearch::config()->sort_label, $options, $results->Sort)
-            ->setAttribute('data-url', $baseLink . '?' . http_build_query($sortParams));
+            ->setAttribute('data-url', $baseLink.'?'.http_build_query($sortParams));
 
         // a little more output management
         $results->Title = "Search Results";

code/ShopSearch.php

Spacing +9 added lines, -9 removed lines

@@ -135,9 +135,9 @@ 
         }
 
         foreach ($cats as $cat) {
-            $out[$cat->ID] = $prefix . $cat->Title;
+            $out[$cat->ID] = $prefix.$cat->Title;
             if ($maxDepth > 1) {
-                $out += self::get_category_hierarchy($cat->ID, $prefix . $cat->Title . ' > ', $maxDepth - 1);
+                $out += self::get_category_hierarchy($cat->ID, $prefix.$cat->Title.' > ', $maxDepth - 1);
             }
         }
 
@@ -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;
@@ -358,7 +358,7 @@ 
                 $thumb = ($img && $img->exists()) ? $img->getThumbnail() : null;
 
                 $json = array(
-                    'link'  => $prod->Link() . '?' . ShopSearch::config()->qs_source . '=' . urlencode(base64_encode(json_encode($searchVars))),
+                    'link'  => $prod->Link().'?'.ShopSearch::config()->qs_source.'='.urlencode(base64_encode(json_encode($searchVars))),
                     'title' => $prod->Title,
                     'desc'  => $prod->obj('Content')->Summary(),
                     'thumb' => $thumb ? $thumb->Link() : '',

code/helpers/VirtualFieldIndexQueuedJob.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     public function getTitle()
     {
         $obj = $this->getObject();
-        return "Update Virtual Field Indexes: " . ($obj ? $obj->getTitle() : '???');
+        return "Update Virtual Field Indexes: ".($obj ? $obj->getTitle() : '???');
     }
 
 

code/helpers/FacetHelper.php

Spacing +16 added lines, -16 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());
@@ -117,14 +117,14 @@ 
         if ($rec->hasExtension('VirtualFieldIndex') && ($spec = $rec->getVFISpec($filterField))) {
             if ($spec['Type'] == VirtualFieldIndex::TYPE_LIST) {
                 // Lists have to be handled a little differently
-                $f = $rec->getVFIFieldName($filterField) . ':PartialMatch';
+                $f = $rec->getVFIFieldName($filterField).':PartialMatch';
                 if (is_array($filterVal)) {
                     foreach ($filterVal as &$val) {
-                        $val = '|' . $val . '|';
+                        $val = '|'.$val.'|';
                     }
                     return array($f => $filterVal);
                 } else {
-                    return array($f => '|' . $filterVal . '|');
+                    return array($f => '|'.$filterVal.'|');
                 }
             } else {
                 // Simples are simple
@@ -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'])) {
@@ -178,7 +178,7 @@ 
             } else {
                 $vals = $facets[$field]['Values'];
                 if (is_string($vals)) {
-                    $vals = eval('return ' . $vals . ';');
+                    $vals = eval('return '.$vals.';');
                 }
                 $facets[$field]['Values'] = array();
                 foreach ($vals as $val => $lbl) {
@@ -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())) {
@@ -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);
         }
     }
 
@@ -461,7 +461,7 @@ 
 
             unset($row['TypeID']);
             unset($row['TypeLabel']);
-            $curFacet['Values'][ $row['Value'] ] = new ArrayData($row);
+            $curFacet['Values'][$row['Value']] = new ArrayData($row);
         }
 
         if ($curType > 0) {
@@ -493,8 +493,8 @@ 
                         $params[$qs_f] = array();
                     }
                     $params[$qs_f][$facet->Source] = 'RANGEFACETVALUE';
-                    $params[$qs_t] = $facet->Label . ': RANGEFACETLABEL';
-                    $facet->Link = $baseLink . '?' . http_build_query($params);
+                    $params[$qs_t] = $facet->Label.': RANGEFACETLABEL';
+                    $facet->Link = $baseLink.'?'.http_build_query($params);
                 break;
 
                 case ShopSearch::FACET_TYPE_CHECKBOX;
@@ -517,14 +517,14 @@ 
                         }
                         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;
+                            $params[$qs_t] = ($value->Active ? 'Remove ' : '').$facet->Label.': '.$value->Label;
                         } else {
                             $params[$qs_f][$facet->Source] = $value->Value;
-                            $params[$qs_t] = $facet->Label . ': ' . $value->Label;
+                            $params[$qs_t] = $facet->Label.': '.$value->Label;
                         }
 
                         // build a new link
-                        $value->Link = $baseLink . '?' . http_build_query($params);
+                        $value->Link = $baseLink.'?'.http_build_query($params);
                     }
             }
         }
@@ -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/VirtualFieldIndex.php

Spacing +8 added lines, -8 removed lines

@@ -89,7 +89,7 @@ 
         );
 
         foreach ($vfi_def as $field => $spec) {
-            $fn = 'VFI_' . $field;
+            $fn = 'VFI_'.$field;
             $out['db'][$fn] = isset($spec['DBField']) ? $spec['DBField'] : 'Varchar(255)';
             $out['indexes'][$fn] = true;
         }
@@ -158,7 +158,7 @@ 
      *
      * @param string $class [optional] - if not given all indexes will be rebuilt
      */
-    public static function build($class='')
+    public static function build($class = '')
     {
         if ($class) {
             $list   = DataObject::get($class);
@@ -248,7 +248,7 @@ 
      */
     public function getVFIFieldName($name)
     {
-        return 'VFI_' . $name;
+        return 'VFI_'.$name;
     }
 
 
@@ -273,7 +273,7 @@ 
      * @param bool   $forceIDs [optional] - if true, it will return an ID even if the norm is to return a DataObject
      * @return string|array|SS_List
      */
-    public function getVFI($field, $fromSource=false, $forceIDs=false)
+    public function getVFI($field, $fromSource = false, $forceIDs = false)
     {
         $spec = $this->getVFISpec($field);
         if (!$spec) {
@@ -330,9 +330,9 @@ 
             foreach ($list as $rec) {
                 $ids[] = $rec->ID;
             }
-            $val = '>' . $list[0]->ClassName . '|' . implode('|', $ids) . '|';
+            $val = '>'.$list[0]->ClassName.'|'.implode('|', $ids).'|';
         } else {
-            $val = '|' . implode('|', $list) . '|';
+            $val = '|'.implode('|', $list).'|';
         }
 
         return $val;
@@ -344,14 +344,14 @@ 
      * @param bool   $forceIDs [optional] - if true encoded objects will not be returned as objects but as id's
      * @return array
      */
-    protected static function decode_list($val, $forceIDs=false)
+    protected static function decode_list($val, $forceIDs = false)
     {
         if ($val[0] == '>') {
             $firstBar = strpos($val, '|');
             if ($firstBar < 3) {
                 return array();
             }
-            $className = substr($val, 1, $firstBar-1);
+            $className = substr($val, 1, $firstBar - 1);
             $ids = explode('|', trim(substr($val, $firstBar), '|'));
             return $forceIDs ? $ids : DataObject::get($className)->filter('ID', $ids)->toArray();
         } else {