ENGCOM-1629: [Backport] Eliminate usage of 'else' statements #15309

 - Merge Pull Request #15309 from rogyar/magento2:2.1-eliminate-else-usage
 - Merged commits:
   1. b13d09a

Author: magento-engcom-team

app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php

@@ -31,8 +31,7 @@ public function getCondition()
     {
         if ($this->getValue()) {
             return $this->getColumn()->getValue();
-        } else {
-            return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]];
         }
+        return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]];
     }
 }

app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php

@@ -205,9 +205,8 @@ public function getSelectedJson()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return join(',', $selected);
-        } else {
-            return '';
         }
+        return '';
     }
 
     /**
@@ -220,9 +219,8 @@ public function getSelected()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return $selected;
-        } else {
-            return [];
         }
+        return [];
     }
 
     /**

app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php

@@ -215,9 +215,8 @@ public function getSelectedJson()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return join(',', $selected);
-        } else {
-            return '';
         }
+        return '';
     }
 
     /**
@@ -230,9 +229,8 @@ public function getSelected()
         if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {
             $selected = explode(',', $selected);
             return $selected;
-        } else {
-            return [];
         }
+        return [];
     }
 
     /**

app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php

@@ -46,9 +46,8 @@ public function execute()
         // redirect according to rewrite rule
         if ($requestUrl != $backendUrl) {
             return $this->getRedirect($backendUrl);
-        } else {
-            return $this->resultPageFactory->create();
         }
+        return $this->resultPageFactory->create();
     }
 
     /**

app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

@@ -29,9 +29,8 @@ private function getSecurityCookie()
     {
         if (!($this->securityCookie instanceof SecurityCookie)) {
             return \Magento\Framework\App\ObjectManager::getInstance()->get(SecurityCookie::class);
-        } else {
-            return $this->securityCookie;
         }
+        return $this->securityCookie;
     }
 
     /**

app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php

@@ -34,10 +34,9 @@ public function __get($name)
     {
         if (array_key_exists($name, $this->_attributes)) {
             return $this->_attributes[$name];
-        } else {
-            trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE);
-            return null;
         }
+        trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE);
+        return null;
     }
 
     /**

app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php

@@ -62,9 +62,8 @@ public function getChildren($item)
 
         if (isset($itemsArray[$item->getOrderItem()->getId()])) {
             return $itemsArray[$item->getOrderItem()->getId()];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -186,9 +185,8 @@ public function getOrderItem()
     {
         if ($this->getItem() instanceof \Magento\Sales\Model\Order\Item) {
             return $this->getItem();
-        } else {
-            return $this->getItem()->getOrderItem();
         }
+        return $this->getItem()->getOrderItem();
     }
 
     /**

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php

@@ -174,9 +174,8 @@ public function isSelected($selection)
             return in_array($selection->getSelectionId(), $selectedOptions);
         } elseif ($selectedOptions == 'None') {
             return false;
-        } else {
-            return $selection->getIsDefault() && $selection->isSaleable();
         }
+        return $selection->getIsDefault() && $selection->isSaleable();
     }
 
     /**

app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php

@@ -114,9 +114,8 @@ public function getValueHtml($item)
         if ($attributes = $this->getSelectionAttributes($item)) {
             return sprintf('%d', $attributes['qty']) . ' x ' . $this->escapeHtml($item->getName()) . " "
                 . $this->getOrder()->formatPrice($attributes['price']);
-        } else {
-            return $this->escapeHtml($item->getName());
         }
+        return $this->escapeHtml($item->getName());
     }
 
     /**
@@ -151,9 +150,8 @@ public function getChildren($item)
 
         if (isset($itemsArray[$item->getOrderItem()->getId()])) {
             return $itemsArray[$item->getOrderItem()->getId()];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**

app/code/Magento/Bundle/Model/Plugin/PriceBackend.php

@@ -29,8 +29,7 @@ public function aroundValidate(
             && $object->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC
         ) {
             return true;
-        } else {
-            return $proceed($object);
         }
+        return $proceed($object);
     }
 }