🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #20866: [Backport] Issue #20380 fixed for 2.2 (by @maheshWebkul721)


Fixed GitHub Issues:
 - #20380: Get Shipping Method as object from order instance gives undefined index. (reported by @maheshWebkul721) has been fixed in #20866 by @maheshWebkul721 in 2.2-develop branch
   Related commits:
     1. c495f31

Author: magento-engcom-team

app/code/Magento/Sales/Model/Order.php

@@ -1298,12 +1298,12 @@ public function getTrackingNumbers()
      * Retrieve shipping method
      *
      * @param bool $asObject return carrier code and shipping method data as object
-     * @return string|\Magento\Framework\DataObject
+     * @return string|null|\Magento\Framework\DataObject
      */
     public function getShippingMethod($asObject = false)
     {
         $shippingMethod = parent::getShippingMethod();
-        if (!$asObject) {
+        if (!$asObject || !$shippingMethod) {
             return $shippingMethod;
         } else {
             list($carrierCode, $method) = explode('_', $shippingMethod, 2);