Completed
Pull Request — master (#9)
by
unknown
29:04 queued 09:08
created
code/ShopSearch.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Fulltext search index for shop buyables
4
- *
5
- * @author Mark Guinn <[email protected]>
6
- * @date 08.29.2013
7
- * @package shop_search
8
- */
3
+	 * Fulltext search index for shop buyables
4
+	 *
5
+	 * @author Mark Guinn <[email protected]>
6
+	 * @date 08.29.2013
7
+	 * @package shop_search
8
+	 */
9 9
 class ShopSearch extends Object
10 10
 {
11 11
 	const FACET_TYPE_LINK       = 'link';
Please login to merge, or discard this patch.
code/ShopSearchAdapter.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Interface for shop search drivers.
4
- *
5
- * @author Mark Guinn <[email protected]>
6
- * @date 09.03.2013
7
- * @package shop_search
8
- */
3
+	 * Interface for shop search drivers.
4
+	 *
5
+	 * @author Mark Guinn <[email protected]>
6
+	 * @date 09.03.2013
7
+	 * @package shop_search
8
+	 */
9 9
 interface ShopSearchAdapter
10 10
 {
11 11
 	/**
Please login to merge, or discard this patch.
code/ShopSearchAjax.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Pending some changes introduced to the core shop module, this will supply
4
- * some standard, easily overridable ajax features.
5
- *
6
- * @author Mark Guinn <[email protected]>
7
- * @date 07.21.2014
8
- * @package shop_search
9
- */
3
+	 * Pending some changes introduced to the core shop module, this will supply
4
+	 * some standard, easily overridable ajax features.
5
+	 *
6
+	 * @author Mark Guinn <[email protected]>
7
+	 * @date 07.21.2014
8
+	 * @package shop_search
9
+	 */
10 10
 class ShopSearchAjax extends Extension
11 11
 {
12 12
 	/**
Please login to merge, or discard this patch.
code/ShopSearchControllerExtension.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Adds SearchForm and results methods to the controller.
4
- *
5
- * @author Mark Guinn <[email protected]>
6
- * @date 08.29.2013
7
- * @package shop_search
8
- */
3
+	 * Adds SearchForm and results methods to the controller.
4
+	 *
5
+	 * @author Mark Guinn <[email protected]>
6
+	 * @date 08.29.2013
7
+	 * @package shop_search
8
+	 */
9 9
 class ShopSearchControllerExtension extends Extension
10 10
 {
11 11
 	private static $allowed_actions = array('SearchForm', 'results', 'search_suggest');
Please login to merge, or discard this patch.
code/adapters/ShopSearchSimple.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * VERY simple adapter to use DataList and :PartialMatch searches. Bare mininum
4
- * that will probably get terrible results but doesn't require any
5
- * additional setup.
6
- *
7
- * @author Mark Guinn <[email protected]>
8
- * @date 09.03.2013
9
- * @package shop_search
10
- */
3
+	 * VERY simple adapter to use DataList and :PartialMatch searches. Bare mininum
4
+	 * that will probably get terrible results but doesn't require any
5
+	 * additional setup.
6
+	 *
7
+	 * @author Mark Guinn <[email protected]>
8
+	 * @date 09.03.2013
9
+	 * @package shop_search
10
+	 */
11 11
 class ShopSearchSimple extends Object implements ShopSearchAdapter
12 12
 {
13 13
 	/**
Please login to merge, or discard this patch.
code/adapters/ShopSearchSolr.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -191,9 +191,9 @@  discard block
 block discarded – undo
191 191
 
192 192
 
193 193
 		/**
194
-	 * Overrides the parent to add a field for autocomplete
195
-	 * @return HTMLText
196
-	 */
194
+		 * Overrides the parent to add a field for autocomplete
195
+		 * @return HTMLText
196
+		 */
197 197
 	function getTypes() {
198 198
 		$val = parent::getTypes();
199 199
 		if (!$val || !is_object($val)) return $val;
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
 
467 467
 			foreach ($facets as $name => $spec) {
468 468
 				// With our current implementation, "range" facets aren't true facets in solr terms.
469
-	            // They're just a type of filter which can be handled elsewhere.
469
+				// They're just a type of filter which can be handled elsewhere.
470 470
 				// For the other types we just ignore the rest of the spec and let Solr do its thing
471 471
 				if ($spec['Type'] != ShopSearch::FACET_TYPE_RANGE && isset($this->fieldMap[$name])) {
472 472
 					$params['facet.field'] = $this->fieldMap[$name];
Please login to merge, or discard this patch.
code/helpers/BetweenFilter.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Checks if the value is within a range (inclusive). Equivalent
4
- * of mysql's between statement but doesn't use that for compatibility.
5
- *
6
- * @author Mark Guinn <[email protected]>
7
- * @date 10.18.2013
8
- * @package shop_Search
9
- * @subpackage helpers
10
- */
3
+	 * Checks if the value is within a range (inclusive). Equivalent
4
+	 * of mysql's between statement but doesn't use that for compatibility.
5
+	 *
6
+	 * @author Mark Guinn <[email protected]>
7
+	 * @date 10.18.2013
8
+	 * @package shop_Search
9
+	 * @subpackage helpers
10
+	 */
11 11
 class BetweenFilter extends SearchFilter
12 12
 {
13 13
 	/**
Please login to merge, or discard this patch.
code/helpers/FacetHelper.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Adds methods for limited kinds of faceting using the silverstripe ORM.
4
- * This is used by the default ShopSearchSimple adapter but also can
5
- * be added to other contexts (such as ProductCategory).
6
- *
7
- * TODO: Facet class + subclasses
8
- *
9
- * @author Mark Guinn <[email protected]>
10
- * @date 10.21.2013
11
- * @package shop_search
12
- * @subpackage helpers
13
- */
3
+	 * Adds methods for limited kinds of faceting using the silverstripe ORM.
4
+	 * This is used by the default ShopSearchSimple adapter but also can
5
+	 * be added to other contexts (such as ProductCategory).
6
+	 *
7
+	 * TODO: Facet class + subclasses
8
+	 *
9
+	 * @author Mark Guinn <[email protected]>
10
+	 * @date 10.21.2013
11
+	 * @package shop_search
12
+	 * @subpackage helpers
13
+	 */
14 14
 class FacetHelper extends Object
15 15
 {
16 16
 	/** @var bool - if this is turned on it will use an algorithm that doesn't require traversing the data set if possible */
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
 			->addInnerJoin('ProductAttributeType', '"Product_StaticAttributeTypes"."ProductAttributeTypeID" = "ProductAttributeType"."ID"')
381 381
 			->addInnerJoin('Product_StaticAttributeValues', $baseTable.'."ID" = "Product_StaticAttributeValues"."ProductID"')
382 382
 			->addInnerJoin('ProductAttributeValue', '"Product_StaticAttributeValues"."ProductAttributeValueID" = "ProductAttributeValue"."ID"'
383
-			    . ' AND "ProductAttributeValue"."TypeID" = "ProductAttributeType"."ID"')
383
+				. ' AND "ProductAttributeValue"."TypeID" = "ProductAttributeType"."ID"')
384 384
 			->setOrderBy(array(
385 385
 				'"ProductAttributeType"."Label"' => 'ASC',
386 386
 				'"ProductAttributeValue"."Sort"' => 'ASC',
Please login to merge, or discard this patch.
code/helpers/HasStaticAttributes.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,14 +1,14 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Extension for Product that allows static attributes in the same way
4
- * they're used for variations. I'm separating this out because it will
5
- * probably be useful in other projects.
6
- *
7
- * @author Mark Guinn <[email protected]>
8
- * @date 01.21.2014
9
- * @package Daywind
10
- * @subpackage extensions
11
- */
3
+	 * Extension for Product that allows static attributes in the same way
4
+	 * they're used for variations. I'm separating this out because it will
5
+	 * probably be useful in other projects.
6
+	 *
7
+	 * @author Mark Guinn <[email protected]>
8
+	 * @date 01.21.2014
9
+	 * @package Daywind
10
+	 * @subpackage extensions
11
+	 */
12 12
 class HasStaticAttributes extends DataExtension
13 13
 {
14 14
 	private static $many_many = array(
Please login to merge, or discard this patch.