Skip to content

[Backport] Removed unreachable code #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[Backport] Removed unreachable code #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3745f85
Removed unreachable code
sreichel Jul 28, 2018
c450203
Fixed static test (supress warnings for unused parameter)
sreichel Jul 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions app/code/Magento/CatalogSearch/Block/Advanced/Form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,19 +177,11 @@ public function getCurrencyCount()
*
* @param AbstractAttribute $attribute
* @return string
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function getCurrency($attribute)
{
return $this->_storeManager->getStore()->getCurrentCurrencyCode();

$baseCurrency = $this->_storeManager->getStore()->getBaseCurrency()->getCurrencyCode();
return $this->getAttributeValue(
$attribute,
'currency'
) ? $this->getAttributeValue(
$attribute,
'currency'
) : $baseCurrency;
}

/**
Expand Down
11 changes: 4 additions & 7 deletions app/code/Magento/MediaStorage/Model/File/Storage/File.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,11 +286,10 @@ public function saveDir($dir)
*/
public function saveFile($file, $overwrite = true)
{
if (isset(
$file['filename']
) && !empty($file['filename']) && isset(
$file['content']
) && !empty($file['content'])
if (isset($file['filename'])
&& !empty($file['filename'])
&& isset($file['content'])
&& !empty($file['content'])
) {
try {
$filename = isset(
Expand All @@ -307,8 +306,6 @@ public function saveFile($file, $overwrite = true)
} else {
throw new \Magento\Framework\Exception\LocalizedException(__('Wrong file info format'));
}

return false;
}

/**
Expand Down
13 changes: 1 addition & 12 deletions app/code/Magento/Sales/Model/Service/CreditmemoService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,22 +100,11 @@ public function __construct(
* @param int $id Credit Memo Id
* @return bool
* @throws \Magento\Framework\Exception\LocalizedException
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function cancel($id)
{
throw new \Magento\Framework\Exception\LocalizedException(__('You can not cancel Credit Memo'));
try {
$creditmemo = $this->creditmemoRepository->get($id);
$creditmemo->setState(\Magento\Sales\Model\Order\Creditmemo::STATE_CANCELED);
foreach ($creditmemo->getAllItems() as $item) {
$item->cancel();
}
$this->eventManager->dispatch('sales_order_creditmemo_cancel', ['creditmemo' => $creditmemo]);
$this->creditmemoRepository->save($creditmemo);
} catch (\Exception $e) {
throw new \Magento\Framework\Exception\LocalizedException(__('Could not cancel creditmemo'), $e);
}
return true;
}

/**
Expand Down
7 changes: 1 addition & 6 deletions app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,6 @@ public function getRemoveUrl($track)
public function getCarrierTitle($code)
{
$carrier = $this->_carrierFactory->create($code);
if ($carrier) {
return $carrier->getConfigData('title');
} else {
return __('Custom Value');
}
return false;
return $carrier ? $carrier->getConfigData('title') : __('Custom Value');
}
}
2 changes: 0 additions & 2 deletions app/code/Magento/Widget/Controller/Adminhtml/Widget/Instance/Save.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,5 @@ public function execute()
$this->_redirect('adminhtml/*/edit', ['_current' => true]);
return;
}
$this->_redirect('adminhtml/*/');
return;
}
}