From 6d49fe604b7e8078c8698817217c3ef21b564dd8 Mon Sep 17 00:00:00 2001
From: Yogesh Suhagiya <yksuhagiya@gmail.com>
Date: Fri, 22 Feb 2019 17:02:19 +0530
Subject: [PATCH 1/2] Corrected return types

---
 app/code/Magento/Fedex/Model/Carrier.php                        | 1 -
 .../GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php      | 2 +-
 app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php         | 2 +-
 app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php      | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
index e88cae4ea7155..3d5218f34b6be 100644
--- a/app/code/Magento/Fedex/Model/Carrier.php
+++ b/app/code/Magento/Fedex/Model/Carrier.php
@@ -365,7 +365,6 @@ public function setRequest(RateRequest $request)
 
         if ($request->getDestPostcode()) {
             $r->setDestPostal($request->getDestPostcode());
-        } else {
         }
 
         if ($request->getDestCity()) {
diff --git a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
index c923ced8918d2..c15b76583187a 100644
--- a/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
+++ b/app/code/Magento/GiftMessage/Block/Adminhtml/Sales/Order/View/Items.php
@@ -171,7 +171,7 @@ public function getMessage()
     /**
      * Retrieve save url
      *
-     * @return array
+     * @return string
      * @codeCoverageIgnore
      */
     public function getSaveUrl()
diff --git a/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php b/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php
index 5da8b3b55700e..6483ec8be6335 100644
--- a/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php
+++ b/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php
@@ -76,7 +76,7 @@ public function getJsLayout()
     /**
      * Retrieve gift message configuration
      *
-     * @return array
+     * @return string
      */
     public function getGiftOptionsConfigJson()
     {
diff --git a/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php b/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php
index adb500a818517..d09f882820a92 100644
--- a/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php
+++ b/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php
@@ -32,7 +32,7 @@ public function __construct(
     /**
      * @param \Magento\Checkout\Model\Type\Onepage $subject
      * @param array $result
-     * @return $this
+     * @return array
      */
     public function afterSaveShippingMethod(
         \Magento\Checkout\Model\Type\Onepage $subject,

From c95f0f94df41b89fec11af450da1d50425526099 Mon Sep 17 00:00:00 2001
From: nmalevanec <mikola.malevanec@transoftgroup.com>
Date: Mon, 25 Feb 2019 14:11:09 +0200
Subject: [PATCH 2/2] Fix static tests.

---
 app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php    | 5 +++++
 app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php b/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php
index 6483ec8be6335..28a6baa436ef6 100644
--- a/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php
+++ b/app/code/Magento/GiftMessage/Block/Cart/GiftOptions.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\GiftMessage\Block\Cart;
 
 use Magento\Backend\Block\Template\Context;
@@ -10,6 +11,8 @@
 use Magento\GiftMessage\Model\CompositeConfigProvider;
 
 /**
+ * Gift options cart block.
+ *
  * @api
  * @since 100.0.2
  */
@@ -63,6 +66,8 @@ public function __construct(
     }
 
     /**
+     * Retrieve encoded js layout.
+     *
      * @return string
      */
     public function getJsLayout()
diff --git a/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php b/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php
index d09f882820a92..e1c8c0b5bf5a5 100644
--- a/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php
+++ b/app/code/Magento/GiftMessage/Model/Type/Plugin/Onepage.php
@@ -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
 {
     /**
@@ -30,6 +34,8 @@ public function __construct(
     }
 
     /**
+     * Add gift message ot quote.
+     *
      * @param \Magento\Checkout\Model\Type\Onepage $subject
      * @param array $result
      * @return array