Removed unreachable code (#2775)

OpenMage · Dec 4, 2022 · c7547af · c7547af
1 parent 96682f7
commit c7547af
Show file tree

Hide file tree

Showing 25 changed files with 16 additions and 224 deletions.
diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Create/Items/Grid.php
@@ -196,7 +196,6 @@ public function getSubtotalWithDiscount()
         if ($this->displayTotalsIncludeTax()) {
             return $address->getSubtotal() + $address->getTaxAmount()
                     + $address->getHiddenTaxAmount() + $this->getDiscountAmount();
-            return $subtotalInclTax;
         }
 
         return $address->getSubtotal() + $this->getDiscountAmount();

diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/Shipment/View/Tracking.php
@@ -124,13 +124,15 @@ public function getCarriers()
         return $carriers;
     }
 
+    /**
+     * @param $code
+     * @return false|string
+     */
     public function getCarrierTitle($code)
     {
         if ($carrier = Mage::getSingleton('shipping/config')->getCarrierInstance($code)) {
             return $carrier->getConfigData('title');
-        } else {
-            return Mage::helper('sales')->__('Custom Value');
         }
-        return false;
+        return Mage::helper('sales')->__('Custom Value');
     }
 }
diff --git a/app/code/core/Mage/Adminhtml/Model/Config/Data.php b/app/code/core/Mage/Adminhtml/Model/Config/Data.php
@@ -468,13 +468,10 @@ protected function _isValidField($field)
         switch ($this->getScope()) {
             case self::SCOPE_DEFAULT:
                 return (bool)(int)$field->show_in_default;
-                break;
             case self::SCOPE_WEBSITES:
                 return (bool)(int)$field->show_in_website;
-                break;
             case self::SCOPE_STORES:
                 return (bool)(int)$field->show_in_store;
-                break;
         }
 
         return true;

diff --git a/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php b/app/code/core/Mage/Adminhtml/Model/System/Config/Backend/File.php
@@ -59,7 +59,6 @@ protected function _beforeSave()
                 $result = $uploader->save($uploadDir);
             } catch (Exception $e) {
                 Mage::throwException($e->getMessage());
-                return $this;
             }
 
             $filename = $result['file'];

diff --git a/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Api/RoleController.php
@@ -221,7 +221,6 @@ protected function _deleteUserFromRole($userId, $roleId)
                 ->deleteFromRole();
         } catch (Exception $e) {
             throw $e;
-            return false;
         }
         return true;
     }

diff --git a/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php b/app/code/core/Mage/Adminhtml/controllers/Permissions/RoleController.php
@@ -272,7 +272,7 @@ public function editrolegridAction()
      *
      * @param int $userId
      * @param int $roleId
-     * @return bool
+     * @return true
      */
     protected function _deleteUserFromRole($userId, $roleId)
     {
@@ -283,7 +283,6 @@ protected function _deleteUserFromRole($userId, $roleId)
                 ->deleteFromRole();
         } catch (Exception $e) {
             throw $e;
-            return false;
         }
         return true;
     }

diff --git a/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php b/app/code/core/Mage/Api2/Model/Acl/Global/Rule/Tree.php
@@ -136,7 +136,6 @@ public function __construct($options)
 
             default:
                 throw new Exception(sprintf('Unknown tree type "%s".', $this->_type));
-                break;
         }
     }
 

diff --git a/app/code/core/Mage/Api2/Model/Resource.php b/app/code/core/Mage/Api2/Model/Resource.php
@@ -201,7 +201,8 @@ public function dispatch()
             case self::ACTION_TYPE_ENTITY . self::OPERATION_CREATE:
                 // Creation of objects is possible only when working with collection
                 $this->_critical(self::RESOURCE_METHOD_NOT_IMPLEMENTED);
-                break;
+                // exception thrown
+                // no break
             case self::ACTION_TYPE_COLLECTION . self::OPERATION_CREATE:
                 // If no of the methods(multi or single) is implemented, request body is not checked
                 if (!$this->_checkMethodExist('_create') && !$this->_checkMethodExist('_multiCreate')) {
@@ -282,7 +283,6 @@ public function dispatch()
                 break;
             default:
                 $this->_critical(self::RESOURCE_METHOD_NOT_IMPLEMENTED);
-                break;
         }
     }
 

diff --git a/app/code/core/Mage/Catalog/Helper/Product/Configuration.php b/app/code/core/Mage/Catalog/Helper/Product/Configuration.php
@@ -161,10 +161,8 @@ public function getOptions(Mage_Catalog_Model_Product_Configuration_Item_Interfa
         switch ($typeId) {
             case Mage_Catalog_Model_Product_Type_Configurable::TYPE_CODE:
                 return $this->getConfigurableOptions($item);
-                break;
             case Mage_Catalog_Model_Product_Type_Grouped::TYPE_CODE:
                 return $this->getGroupedOptions($item);
-                break;
         }
         return $this->getCustomOptions($item);
     }

diff --git a/app/code/core/Mage/Catalog/Model/Product/Api/V2.php b/app/code/core/Mage/Catalog/Model/Product/Api/V2.php
@@ -204,7 +204,7 @@ public function update($productId, $productData, $store = null, $identifierType
      * @param array      $productData
      * @param string|int $store
      * @param string     $identifierType
-     * @return bool
+     * @return true|void
      */
     public function multiUpdate($productIds, $productData, $store = null, $identifierType = null)
     {
@@ -225,11 +225,9 @@ public function multiUpdate($productIds, $productData, $store = null, $identifie
 
         if (empty($failMessages)) {
             return true;
-        } else {
-            $this->_fault('partially_updated', implode("\n", $failMessages));
         }
 
-        return false;
+        $this->_fault('partially_updated', implode("\n", $failMessages));
     }
 
     /**

diff --git a/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php b/app/code/core/Mage/Catalog/Model/Product/Option/Type/File.php
@@ -193,7 +193,8 @@ protected function _validateUploadedFile()
                 switch ($this->getProcessMode()) {
                     case Mage_Catalog_Model_Product_Type_Abstract::PROCESS_MODE_FULL:
                         Mage::throwException(Mage::helper('catalog')->__('Please specify the product required option <em>%s</em>.', $option->getTitle()));
-                        break;
+                        // exception thrown
+                        // no break
                     default:
                         $this->setUserValue(null);
                         break;

diff --git a/app/code/core/Mage/CatalogIndex/Model/Aggregation.php b/app/code/core/Mage/CatalogIndex/Model/Aggregation.php
@@ -144,7 +144,6 @@ public function clearProductData($productIds)
     protected function _processKey($key)
     {
         return $key;
-        return md5($key);
     }
 
     /**

diff --git a/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php b/app/code/core/Mage/CatalogInventory/Model/Stock/Item.php
@@ -461,7 +461,7 @@ public function getCanBackInStock()
      * Check quantity
      *
      * @param   float $qty
-     * @exception Mage_Core_Exception
+     * @throws  Mage_Core_Exception
      * @return  bool
      */
     public function checkQty($qty)
@@ -477,7 +477,6 @@ public function checkQty($qty)
                     break;
                 default:
                     return false;
-                    break;
             }
         }
         return true;

diff --git a/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php b/app/code/core/Mage/CatalogSearch/Block/Advanced/Form.php
@@ -145,10 +145,6 @@ public function getCurrencyCount()
     public function getCurrency($attribute)
     {
         return Mage::app()->getStore()->getCurrentCurrencyCode();
-
-        $baseCurrency = Mage::app()->getStore()->getBaseCurrency()->getCurrencyCode();
-        return $this->getAttributeValue($attribute, 'currency') ?
-            $this->getAttributeValue($attribute, 'currency') : $baseCurrency;
     }
 
     /**

diff --git a/app/code/core/Mage/Core/Model/File/Storage/File.php b/app/code/core/Mage/Core/Model/File/Storage/File.php
@@ -266,8 +266,6 @@ public function saveFile($file, $overwrite = true)
         } else {
             Mage::throwException(Mage::helper('core')->__('Wrong file info format'));
         }
-
-        return false;
     }
 
     /**

diff --git a/app/code/core/Mage/Core/Model/Resource/Setup.php b/app/code/core/Mage/Core/Model/Resource/Setup.php
@@ -316,7 +316,6 @@ public function applyUpdates()
                     break;
                 default:
                     return true;
-                   break;
             }
         } elseif ($configVer) {
             $this->_installResourceDb($configVer);

diff --git a/app/code/core/Mage/Core/functions.php b/app/code/core/Mage/Core/functions.php
@@ -231,21 +231,11 @@ function mageDebugBacktrace($return = false, $html = true, $showFirst = false)
 function mageSendErrorHeader()
 {
     return;
-    if (!isset($_SERVER['SCRIPT_NAME'])) {
-        return;
-    }
-    $action = Mage::app()->getRequest()->getBasePath() . "bugreport.php";
-    echo '<form id="error_report" method="post" style="display:none" action="' . $action . '"><textarea name="error">';
 }
 
 function mageSendErrorFooter()
 {
     return;
-    if (!isset($_SERVER['SCRIPT_NAME'])) {
-        return;
-    }
-    echo '</textarea></form><script type="text/javascript">document.getElementById("error_report").submit()</script>';
-    exit;
 }
 
 /**

diff --git a/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php b/app/code/core/Mage/Customer/Model/Customer/Attribute/Source/Store.php
@@ -81,9 +81,7 @@ public function getOptionText($value)
                 $values[] = $this->_options[$val];
             }
             return $values;
-        } else {
-            return $this->_options[$value];
         }
-        return false;
+        return $this->_options[$value];
     }
 }
diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php b/app/code/core/Mage/Dataflow/Model/Convert/Adapter/Io.php
@@ -54,7 +54,6 @@ public function getResource($forWrite = false)
                     if (!$validator->isValid($path)) {
                         foreach ($validator->getMessages() as $message) {
                             Mage::throwException($message);
-                            return false;
                         }
                     }
 

diff --git a/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php b/app/code/core/Mage/Dataflow/Model/Convert/Parser/Xml/Excel.php
@@ -154,75 +154,6 @@ public function parse()
             ->save();
 
         return $this;
-
-        $dom = new DOMDocument();
-        if (Mage::app()->getRequest()->getParam('files')) {
-            $path = Mage::app()->getConfig()->getTempVarDir() . '/import/';
-            $file = $path . urldecode(Mage::app()->getRequest()->getParam('files'));
-            if (file_exists($file)) {
-                $dom->load($file);
-            }
-        } else {
-            $this->validateDataString();
-            $dom->loadXML($this->getData());
-        }
-
-        $worksheets = $dom->getElementsByTagName('Worksheet');
-        if ($this->getVar('adapter') && $this->getVar('method')) {
-            $adapter = Mage::getModel($this->getVar('adapter'));
-        }
-        foreach ($worksheets as $worksheet) {
-            $wsName = $worksheet->getAttribute('ss:Name');
-            $rows = $worksheet->getElementsByTagName('Row');
-            $firstRow = true;
-            $fieldNames = [];
-            $wsData = [];
-            $i = 0;
-            foreach ($rows as $rowSet) {
-                $index = 1;
-                $cells = $rowSet->getElementsByTagName('Cell');
-                $rowData = [];
-                foreach ($cells as $cell) {
-                    $value = $cell->getElementsByTagName('Data')->item(0)->nodeValue;
-                    $ind = $cell->getAttribute('ss:Index');
-                    if (!is_null($ind) && $ind > 0) {
-                        $index = $ind;
-                    }
-                    if ($firstRow && !$this->getVar('fieldnames')) {
-                        $fieldNames[$index] = 'column' . $index;
-                    }
-                    if ($firstRow && $this->getVar('fieldnames')) {
-                        $fieldNames[$index] = $value;
-                    } else {
-                        $rowData[$fieldNames[$index]] = $value;
-                    }
-                    $index++;
-                }
-                $row = $rowData;
-                if ($row) {
-                    $loadMethod = $this->getVar('method');
-                    $adapter->$loadMethod(compact('i', 'row'));
-                }
-                $i++;
-
-                $firstRow = false;
-                if (!empty($rowData)) {
-                    $wsData[] = $rowData;
-                }
-            }
-            $data[$wsName] = $wsData;
-            $this->addException('Found worksheet "' . $wsName . '" with ' . count($wsData) . ' row(s)');
-        }
-        if ($wsName = $this->getVar('single_sheet')) {
-            if (isset($data[$wsName])) {
-                $data = $data[$wsName];
-            } else {
-                reset($data);
-                $data = current($data);
-            }
-        }
-        $this->setData($data);
-        return $this;
     }
 
     /**

diff --git a/app/code/core/Mage/Paygate/Model/Authorizenet.php b/app/code/core/Mage/Paygate/Model/Authorizenet.php
@@ -593,7 +593,6 @@ protected function _place($payment, $amount, $requestType)
             default:
                 Mage::throwException($defaultExceptionMessage);
         }
-        return $this;
     }
 
     /**

diff --git a/app/code/core/Mage/Sales/Model/Recurring/Profile.php b/app/code/core/Mage/Sales/Model/Recurring/Profile.php
@@ -459,7 +459,6 @@ public function getFieldComment($field)
             default:
                 return parent::getFieldComment($field);
         }
-        return null;
     }
 
     /**

diff --git a/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php b/app/code/core/Mage/Shipping/Model/Carrier/Abstract.php
@@ -112,7 +112,7 @@ abstract class Mage_Shipping_Model_Carrier_Abstract extends Varien_Object
      * Retrieve information from carrier configuration
      *
      * @param   string $field
-     * @return  mixed
+     * @return  string|false
      */
     public function getConfigData($field)
     {
@@ -514,7 +514,7 @@ public function getTotalNumOfBoxes($weight)
         */
         $this->_numBoxes = 1;
         $weight = $this->convertWeightToLbs($weight);
-        $maxPackageWeight = $this->getConfigData('max_package_weight');
+        $maxPackageWeight = (float)$this->getConfigData('max_package_weight');
         if ($weight > $maxPackageWeight && $maxPackageWeight != 0) {
             $this->_numBoxes = ceil($weight / $maxPackageWeight);
             $weight = $weight / $this->_numBoxes;

diff --git a/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php b/app/code/core/Mage/Sitemap/Model/Resource/Catalog/Abstract.php
@@ -98,7 +98,6 @@ protected function _addFilter($storeId, $attributeCode, $value, $type = '=')
                 break;
             default:
                 return false;
-                break;
         }
 
         if ($attribute['backend_type'] == 'static') {