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

Stanislav Idolov · web-flow · commit e73f29c73c59 · 2018-05-22T09:28:15.000+03:00
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Radio.php b/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')]];
     }
 }
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php b/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 [];
     }
 
     /**
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Massaction/Extended.php b/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 [];
     }
 
     /**
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Auth/Login.php b/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();
     }
 
     /**
diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php b/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;
     }
 
     /**
diff --git a/app/code/Magento/Braintree/Test/Unit/Model/Report/BraintreeTransactionStub.php b/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;
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php b/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();
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php b/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();
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php b/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;
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Model/Plugin/PriceBackend.php b/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);
     }
 }
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -948,9 +948,8 @@ public function shakeSelections($firstItem, $secondItem)
         ];
         if ($aPosition == $bPosition) {
             return 0;
-        } else {
-            return $aPosition < $bPosition ? -1 : 1;
         }
+        return $aPosition < $bPosition ? -1 : 1;
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php b/app/code/Magento/Bundle/Model/Sales/Order/Pdf/Items/AbstractItems.php
@@ -44,9 +44,8 @@ public function getChildren($item)
 
         if (isset($itemsArray[$item->getOrderItem()->getId()])) {
             return $itemsArray[$item->getOrderItem()->getId()];
-        } else {
-            return null;
         }
+        return null;
     }
 
     /**
@@ -196,9 +195,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();
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php b/app/code/Magento/Bundle/Pricing/Adjustment/Calculator.php
@@ -267,9 +267,8 @@ public function calculateBundleAmount($basePriceValue, $bundleProduct, $selectio
     {
         if ($bundleProduct->getPriceType() == Price::PRICE_TYPE_FIXED) {
             return $this->calculateFixedBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude);
-        } else {
-            return $this->calculateDynamicBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude);
         }
+        return $this->calculateDynamicBundleAmount($basePriceValue, $bundleProduct, $selectionPriceList, $exclude);
     }
 
     /**
diff --git a/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php b/app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php
@@ -163,8 +163,7 @@ public function getProduct()
     {
         if ($this->bundleProduct->getPriceType() == Price::PRICE_TYPE_DYNAMIC) {
             return parent::getProduct();
-        } else {
-            return $this->bundleProduct;
         }
+        return $this->bundleProduct;
     }
 }
diff --git a/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php b/app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php
@@ -124,9 +124,8 @@ public function getValue()
                 $this->priceInfo
                     ->getPrice(BundleDiscountPrice::PRICE_CODE)
                     ->calculateDiscount($configuredOptionsAmount);
-        } else {
-            return parent::getValue();
         }
+        return parent::getValue();
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,7 @@ public function getCondition()`
`31`	`31`	`{`
`32`	`32`	`if ($this->getValue()) {`
`33`	`33`	`return $this->getColumn()->getValue();`
`34`		`- } else {`
`35`		`- return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]];`
`36`	`34`	`}`
	`35`	`+ return [['neq' => $this->getColumn()->getValue()], ['is' => new \Zend_Db_Expr('NULL')]];`
`37`	`36`	`}`
`38`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -205,9 +205,8 @@ public function getSelectedJson()`
`205`	`205`	`if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {`
`206`	`206`	`$selected = explode(',', $selected);`
`207`	`207`	`return join(',', $selected);`
`208`		`- } else {`
`209`		`- return '';`
`210`	`208`	`}`
	`209`	`+ return '';`
`211`	`210`	`}`
`212`	`211`
`213`	`212`	`/**`
`@@ -220,9 +219,8 @@ public function getSelected()`
`220`	`219`	`if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {`
`221`	`220`	`$selected = explode(',', $selected);`
`222`	`221`	`return $selected;`
`223`		`- } else {`
`224`		`- return [];`
`225`	`222`	`}`
	`223`	`+ return [];`
`226`	`224`	`}`
`227`	`225`
`228`	`226`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -215,9 +215,8 @@ public function getSelectedJson()`
`215`	`215`	`if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {`
`216`	`216`	`$selected = explode(',', $selected);`
`217`	`217`	`return join(',', $selected);`
`218`		`- } else {`
`219`		`- return '';`
`220`	`218`	`}`
	`219`	`+ return '';`
`221`	`220`	`}`
`222`	`221`
`223`	`222`	`/**`
`@@ -230,9 +229,8 @@ public function getSelected()`
`230`	`229`	`if ($selected = $this->getRequest()->getParam($this->getFormFieldNameInternal())) {`
`231`	`230`	`$selected = explode(',', $selected);`
`232`	`231`	`return $selected;`
`233`		`- } else {`
`234`		`- return [];`
`235`	`232`	`}`
	`233`	`+ return [];`
`236`	`234`	`}`
`237`	`235`
`238`	`236`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,8 @@ public function execute()`
`46`	`46`	`// redirect according to rewrite rule`
`47`	`47`	`if ($requestUrl != $backendUrl) {`
`48`	`48`	`return $this->getRedirect($backendUrl);`
`49`		`- } else {`
`50`		`- return $this->resultPageFactory->create();`
`51`	`49`	`}`
	`50`	`+ return $this->resultPageFactory->create();`
`52`	`51`	`}`
`53`	`52`
`54`	`53`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,8 @@ private function getSecurityCookie()`
`29`	`29`	`{`
`30`	`30`	`if (!($this->securityCookie instanceof SecurityCookie)) {`
`31`	`31`	`return \Magento\Framework\App\ObjectManager::getInstance()->get(SecurityCookie::class);`
`32`		`- } else {`
`33`		`- return $this->securityCookie;`
`34`	`32`	`}`
	`33`	`+ return $this->securityCookie;`
`35`	`34`	`}`
`36`	`35`
`37`	`36`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,9 @@ public function __get($name)`
`34`	`34`	`{`
`35`	`35`	`if (array_key_exists($name, $this->_attributes)) {`
`36`	`36`	`return $this->_attributes[$name];`
`37`		`- } else {`
`38`		`- trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE);`
`39`		`- return null;`
`40`	`37`	`}`
	`38`	`+ trigger_error('Undefined property on ' . get_class($this) . ': ' . $name, E_USER_NOTICE);`
	`39`	`+ return null;`
`41`	`40`	`}`
`42`	`41`
`43`	`42`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,8 @@ public function getChildren($item)`
`62`	`62`
`63`	`63`	`if (isset($itemsArray[$item->getOrderItem()->getId()])) {`
`64`	`64`	`return $itemsArray[$item->getOrderItem()->getId()];`
`65`		`- } else {`
`66`		`- return null;`
`67`	`65`	`}`
	`66`	`+ return null;`
`68`	`67`	`}`
`69`	`68`
`70`	`69`	`/**`
`@@ -186,9 +185,8 @@ public function getOrderItem()`
`186`	`185`	`{`
`187`	`186`	`if ($this->getItem() instanceof \Magento\Sales\Model\Order\Item) {`
`188`	`187`	`return $this->getItem();`
`189`		`- } else {`
`190`		`- return $this->getItem()->getOrderItem();`
`191`	`188`	`}`
	`189`	`+ return $this->getItem()->getOrderItem();`
`192`	`190`	`}`
`193`	`191`
`194`	`192`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -174,9 +174,8 @@ public function isSelected($selection)`
`174`	`174`	`return in_array($selection->getSelectionId(), $selectedOptions);`
`175`	`175`	`} elseif ($selectedOptions == 'None') {`
`176`	`176`	`return false;`
`177`		`- } else {`
`178`		`- return $selection->getIsDefault() && $selection->isSaleable();`
`179`	`177`	`}`
	`178`	`+ return $selection->getIsDefault() && $selection->isSaleable();`
`180`	`179`	`}`
`181`	`180`
`182`	`181`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -114,9 +114,8 @@ public function getValueHtml($item)`
`114`	`114`	`if ($attributes = $this->getSelectionAttributes($item)) {`
`115`	`115`	`return sprintf('%d', $attributes['qty']) . ' x ' . $this->escapeHtml($item->getName()) . " "`
`116`	`116`	`. $this->getOrder()->formatPrice($attributes['price']);`
`117`		`- } else {`
`118`		`- return $this->escapeHtml($item->getName());`
`119`	`117`	`}`
	`118`	`+ return $this->escapeHtml($item->getName());`
`120`	`119`	`}`
`121`	`120`
`122`	`121`	`/**`
`@@ -151,9 +150,8 @@ public function getChildren($item)`
`151`	`150`
`152`	`151`	`if (isset($itemsArray[$item->getOrderItem()->getId()])) {`
`153`	`152`	`return $itemsArray[$item->getOrderItem()->getId()];`
`154`		`- } else {`
`155`		`- return null;`
`156`	`153`	`}`
	`154`	`+ return null;`
`157`	`155`	`}`
`158`	`156`
`159`	`157`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ public function aroundValidate(`
`29`	`29`	`&& $object->getPriceType() == \Magento\Bundle\Model\Product\Price::PRICE_TYPE_DYNAMIC`
`30`	`30`	`) {`
`31`	`31`	`return true;`
`32`		`- } else {`
`33`		`- return $proceed($object);`
`34`	`32`	`}`
	`33`	`+ return $proceed($object);`
`35`	`34`	`}`
`36`	`35`	`}`