rector: ChangeIfElseValueAssignToEarlyReturnRector

- see https://getrector.com/rule-detail/change-if-else-value-assign-to-early-return-rector

Author: sreichel

.rector.php

@@ -99,7 +99,6 @@
             DeadCode\Ternary\TernaryToBooleanOrFalseToBooleanAndRector::class, # todo: TMP
             DeadCode\TryCatch\RemoveDeadTryCatchRector::class, # todo: TMP  (!?!)
             EarlyReturn\Foreach_\ChangeNestedForeachIfsToEarlyContinueRector::class, # todo: TMP
-            EarlyReturn\If_\ChangeIfElseValueAssignToEarlyReturnRector::class, # todo: TMP
             EarlyReturn\If_\ChangeNestedIfsToEarlyReturnRector::class, # todo: TMP
             EarlyReturn\If_\ChangeOrIfContinueToMultiContinueRector::class, # todo: TMP
             EarlyReturn\Return_\ReturnBinaryOrToEarlyReturnRector::class, # todo: TMP

app/code/core/Mage/Adminhtml/Block/Catalog/Category/Widget/Chooser.php

@@ -123,25 +123,24 @@ public function getNodeClickListener()
         }
 
         if ($this->getUseMassaction()) {
-            $js = '
+            return '
                 function (node, e) {
                     if (node.ui.toggleCheck) {
                         node.ui.toggleCheck(true);
                     }
                 }
             ';
-        } else {
-            $chooserJsObject = $this->getId();
-            $js = '
+        }
+
+        $chooserJsObject = $this->getId();
+
+        return '
                 function (node, e) {
                     ' . $chooserJsObject . '.setElementValue("category/" + node.attributes.id);
                     ' . $chooserJsObject . '.setElementLabel(node.text);
                     ' . $chooserJsObject . '.close();
                 }
             ';
-        }
-
-        return $js;
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/Customer/Edit/Tab/View.php

@@ -183,12 +183,10 @@ public function getBillingAddressHtml()
     {
         $html = '';
         if ($address = $this->getCustomer()->getPrimaryBillingAddress()) {
-            $html = $address->format('html');
-        } else {
-            $html = Mage::helper('customer')->__('The customer does not have default billing address.');
+            return $address->format('html');
         }
 
-        return $html;
+        return Mage::helper('customer')->__('The customer does not have default billing address.');
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/Dashboard/Searches/Renderer/Searchquery.php

@@ -18,12 +18,10 @@ public function render(Varien_Object $row)
     {
         $value = $row->getData($this->getColumn()->getIndex());
         if (Mage::helper('core/string')->strlen($value) > 30) {
-            $value = '<span title="' . $this->escapeHtml($value) . '">'
+            return '<span title="' . $this->escapeHtml($value) . '">'
                 . $this->escapeHtml(Mage::helper('core/string')->truncate($value, 30)) . '</span>';
-        } else {
-            $value = $this->escapeHtml($value);
         }
 
-        return $value;
+        return $this->escapeHtml($value);
     }
 }

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create.php

@@ -115,14 +115,12 @@ protected function _getSession()
     public function getCancelUrl()
     {
         if ($this->_getSession()->getOrder()->getId()) {
-            $url = $this->getUrl('*/sales_order/view', [
+            return $this->getUrl('*/sales_order/view', [
                 'order_id' => Mage::getSingleton('adminhtml/session_quote')->getOrder()->getId(),
             ]);
-        } else {
-            $url = $this->getUrl('*/*/cancel');
         }
 
-        return $url;
+        return $this->getUrl('*/*/cancel');
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Shipping/Address.php

@@ -109,12 +109,10 @@ public function getAddressId()
     public function getAddress()
     {
         if ($this->getIsAsBilling()) {
-            $address = $this->getCreateOrderModel()->getBillingAddress();
-        } else {
-            $address = $this->getCreateOrderModel()->getShippingAddress();
+            return $this->getCreateOrderModel()->getBillingAddress();
         }
 
-        return $address;
+        return $this->getCreateOrderModel()->getShippingAddress();
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/Sales/Order/Creditmemo/Create.php

@@ -42,18 +42,16 @@ public function getCreditmemo()
     public function getHeaderText()
     {
         if ($this->getCreditmemo()->getInvoice()) {
-            $header = Mage::helper('sales')->__(
+            return Mage::helper('sales')->__(
                 'New Credit Memo for Invoice #%s',
                 $this->escapeHtml($this->getCreditmemo()->getInvoice()->getIncrementId()),
             );
-        } else {
-            $header = Mage::helper('sales')->__(
-                'New Credit Memo for Order #%s',
-                $this->escapeHtml($this->getCreditmemo()->getOrder()->getRealOrderId()),
-            );
         }
 
-        return $header;
+        return Mage::helper('sales')->__(
+            'New Credit Memo for Order #%s',
+            $this->escapeHtml($this->getCreditmemo()->getOrder()->getRealOrderId()),
+        );
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging.php

@@ -193,12 +193,10 @@ public function getPackages()
     {
         $packages = $this->getShipment()->getPackages();
         if ($packages) {
-            $packages = unserialize($packages, ['allowed_classes' => false]);
-        } else {
-            $packages = [];
+            return unserialize($packages, ['allowed_classes' => false]);
         }
 
-        return $packages;
+        return [];
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/Packaging/Grid.php

@@ -28,13 +28,11 @@ public function __construct()
     public function getCollection()
     {
         if ($this->getShipment()->getId()) {
-            $collection = Mage::getModel('sales/order_shipment_item')->getCollection()
+            return Mage::getModel('sales/order_shipment_item')->getCollection()
                     ->setShipmentFilter($this->getShipment()->getId());
-        } else {
-            $collection = $this->getShipment()->getAllItems();
         }
 
-        return $collection;
+        return $this->getShipment()->getAllItems();
     }
 
     /**

app/code/core/Mage/Adminhtml/Block/Sales/Order/Status/Grid.php

@@ -86,12 +86,10 @@ protected function _prepareColumns()
     public function decorateState($value, $row, $column, $isExport)
     {
         if ($value) {
-            $cell = $value . ' [' . Mage::getSingleton('sales/order_config')->getStateLabel($value) . ']';
-        } else {
-            $cell = $value;
+            return $value . ' [' . Mage::getSingleton('sales/order_config')->getStateLabel($value) . ']';
         }
 
-        return $cell;
+        return $value;
     }
 
     public function decorateAction($value, $row, $column, $isExport)