ENGCOM-1651: [Backport] Removed redundant else statement #15435

magento-engcom-team · magento-engcom-team · commit 18f3b8a1d80a · 2018-05-23T02:01:24.000-05:00
- Merge Pull Request #15435 from rogyar/magento2:2.2-configurable-redundant-else - Merged commits: 1. d0ac1e1
diff --git a/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php b/app/code/Magento/ConfigurableImportExport/Model/Import/Product/Type/Configurable.php
@@ -258,9 +258,8 @@ protected function _getSuperAttributeId($productId, $attributeId)
     {
         if (isset($this->_productSuperAttrs["{$productId}_{$attributeId}"])) {
             return $this->_productSuperAttrs["{$productId}_{$attributeId}"];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -258,9 +258,8 @@ protected function _getSuperAttributeId($productId, $attributeId)`
`258`	`258`	`{`
`259`	`259`	`if (isset($this->_productSuperAttrs["{$productId}_{$attributeId}"])) {`
`260`	`260`	`return $this->_productSuperAttrs["{$productId}_{$attributeId}"];`
`261`		`- } else {`
`262`		`- return null;`
`263`	`261`	`}`
	`262`	`+ return null;`
`264`	`263`	`}`
`265`	`264`
`266`	`265`	`/**`