Merge pull request #14 from robbieaverill/hotfix/12-swatch-order

[#12] Fix for when there are no attribute options at all

README.md

@@ -17,6 +17,10 @@ You can use this extension module to restore to relevance ordering until the cor
 
 ## Changelog:
 
+### 1.1.2
+
+* Fix #12 - hot fix for empty attribute option arrays in the helper
+
 ### 1.1.1
 
 * Fix #12 - added support for ordering swatch options

app/code/local/RobbieAverill/AttributeFix/Helper/Data.php

@@ -15,9 +15,12 @@ class RobbieAverill_AttributeFix_Helper_Data extends Mage_Core_Helper_Abstract
      */
     public function sortOptionValues($options)
     {
+        if (empty($options)) {
+            return $options;
+        }
         $optionIds = array_keys($options);
-        $sortOrder = $this->getSortOrderForAttributeOptions($optionIds);
 
+        $sortOrder = $this->getSortOrderForAttributeOptions($optionIds);
         foreach ($sortOrder as $optionId => &$value) {
             $value = $options[$optionId];
         }

app/code/local/RobbieAverill/AttributeFix/Test/Helper/DataTest.php

@@ -24,7 +24,7 @@ public function testShouldGetAttributeOrdersThenOrderThem($testCase, $input, $or
         $mock = $this->getHelperMock('attributefix', ['getSortOrderForAttributeOptions']);
 
         $mock
-            ->expects($this->once())
+            ->expects(empty($input) ? $this->any() : $this->once())
             ->method('getSortOrderForAttributeOptions')
             ->will($this->returnValue($order));
 

app/code/local/RobbieAverill/AttributeFix/Test/Helper/expectations/testShouldGetAttributeOrdersThenOrderThem.yaml

@@ -12,3 +12,6 @@ tc_2:
     2: attr2
     3: attr3
     4: attr4
+# No options - whatever passed in should be returned
+tc_3:
+  result: []

app/code/local/RobbieAverill/AttributeFix/Test/Helper/providers/testShouldGetAttributeOrdersThenOrderThem.yaml

@@ -19,4 +19,9 @@
     - 1: 0
       2: 0
       3: 0
-      4: 0
+      4: 0
+# No options at all
+-
+    - 3
+    - []
+    - []

app/code/local/RobbieAverill/AttributeFix/etc/config.xml

@@ -11,7 +11,7 @@
     -->
     <modules>
         <RobbieAverill_AttributeFix>
-            <version>1.1.1</version>
+            <version>1.1.2</version>
         </RobbieAverill_AttributeFix>
     </modules>    
     <global>