Add further checks for attribute keys.

Check if the array key exists rather than using isset to allow for blank values.
ctidigital · May 3, 2017 · db523cc · db523cc
1 parent d80ffa6
commit db523cc
Showing 1 changed file with 23 additions and 17 deletions.
diff --git a/Model/Component/Attributes.php b/Model/Component/Attributes.php
@@ -108,7 +108,6 @@ protected function checkForAttributeUpdates($attributeCode, $attributeArray, $at
         $requiresUpdate = false;
         $nest = 1;
         foreach ($attributeConfig as $name => $value) {
-
             if ($name == "product_types") {
                 $value = implode(',', $value);
             }
@@ -118,8 +117,7 @@ protected function checkForAttributeUpdates($attributeCode, $attributeArray, $at
             if ($name == 'option') {
                 continue;
             }
-
-            if (!isset($attributeArray[$name])) {
+            if (!array_key_exists($name, $attributeArray)) {
                 $this->log->logError(sprintf(
                     'Attribute %s type %s does not exist or is not mapped',
                     $attributeCode,
@@ -155,20 +153,28 @@ protected function checkForAttributeUpdates($attributeCode, $attributeArray, $at
 
     protected function mapAttributeConfig($name)
     {
-        if ($name == 'label') {
-            $name = 'frontend_label';
-        }
-
-        if ($name == 'type') {
-            $name = 'backend_type';
-        }
-
-        if ($name == 'input') {
-            $name = 'frontend_input';
-        }
-
-        if ($name == 'product_types') {
-            $name = 'apply_to';
+        switch ($name) {
+            case 'label':
+                $name = 'frontend_label';
+                break;
+            case 'type':
+                $name = 'backend_type';
+                break;
+            case 'input':
+                $name = 'frontend_input';
+                break;
+            case 'product_types':
+                $name = 'apply_to';
+                break;
+            case 'required':
+                $name = 'is_required';
+                break;
+            case 'source':
+                $name = 'source_model';
+                break;
+            case 'backend':
+                $name = 'backend_model';
+                break;
         }
         return $name;
     }