Skip to content
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

Jump to bottom

[Backport] Removed unused else block and corrected return types #21533

Closed
wants to merge 2 commits into from
Closed

[Backport] Removed unused else block and corrected return types #21533

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
6d49fe6
Corrected return types
yogeshsuhagiya Feb 22, 2019
c95f0f9
Fix static tests.
nmalevanec Feb 25, 2019
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
1 change: 0 additions & 1 deletion app/code/Magento/Fedex/Model/Carrier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,6 @@ public function setRequest(RateRequest $request)

if ($request->getDestPostcode()) {
$r->setDestPostal($request->getDestPostcode());
} else {
}

if ($request->getDestCity()) {
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public function getMessage()
/**
* Retrieve save url
*
* @return array
* @return string
* @codeCoverageIgnore
*/
public function getSaveUrl()
Expand Down
7 changes: 6 additions & 1 deletion app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

namespace Magento\GiftMessage\Block\Cart;

use Magento\Backend\Block\Template\Context;
use Magento\Framework\Json\Encoder;
use Magento\GiftMessage\Model\CompositeConfigProvider;

/**
* Gift options cart block.
*
* @api
* @since 100.0.2
*/
Expand Down Expand Up @@ -63,6 +66,8 @@ public function __construct(
}

/**
* Retrieve encoded js layout.
*
* @return string
*/
public function getJsLayout()
Expand All @@ -76,7 +81,7 @@ public function getJsLayout()
/**
* Retrieve gift message configuration
*
* @return array
* @return string
*/
public function getGiftOptionsConfigJson()
{
Expand Down
8 changes: 7 additions & 1 deletion app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

namespace Magento\GiftMessage\Model\Type\Plugin;

/**
* Add gift message to quote plugin.
*/
class Onepage
{
/**
Expand All @@ -30,9 +34,11 @@ public function __construct(
}

/**
* Add gift message ot quote.
*
* @param \Magento\Checkout\Model\Type\Onepage $subject
* @param array $result
* @return $this
* @return array
*/
public function afterSaveShippingMethod(
\Magento\Checkout\Model\Type\Onepage $subject,
Expand Down