ENGCOM-4356: Removed unused else block and corrected return types #21405

magento-engcom-team · magento-engcom-team · commit b1d7aee3ee18 · 2019-02-22T06:27:24.000-06:00
- Merge Pull Request #21405 from yogeshsuhagiya/magento2:2.3-develop-PR-yogesh-8 - Merged commits: 1. 15ef6d7
diff --git a/app/code/Magento/Fedex/Model/Carrier.php b/app/code/Magento/Fedex/Model/Carrier.php
@@ -363,7 +363,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
@@ -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
@@ -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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,6 @@ public function setRequest(RateRequest $request)`
`363`	`363`
`364`	`364`	`if ($request->getDestPostcode()) {`
`365`	`365`	`$r->setDestPostal($request->getDestPostcode());`
`366`		`- } else {`
`367`	`366`	`}`
`368`	`367`
`369`	`368`	`if ($request->getDestCity()) {`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function getJsLayout()`
`76`	`76`	`/**`
`77`	`77`	`* Retrieve gift message configuration`
`78`	`78`	`*`
`79`		`- * @return array`
	`79`	`+ * @return string`
`80`	`80`	`*/`
`81`	`81`	`public function getGiftOptionsConfigJson()`
`82`	`82`	`{`