MAGETWO-70498: [Magento Cloud] - /rest/default/V1/order/<order id>/ship and configurable products - for 2.1

Author: RuslanKostiv1

app/code/Magento/Shipping/Controller/Adminhtml/Order/ShipmentLoader.php

@@ -27,12 +27,11 @@
  * @method ShipmentLoader setTracking($tracking)
  * @method int getOrderId()
  * @method int getShipmentId()
+ * @method array|null getShipment()
  * @method array getTracking()
  */
 class ShipmentLoader extends DataObject
 {
-    const SHIPMENT = 'shipment';
-
     /**
      * @var ManagerInterface
      */
@@ -136,7 +135,7 @@ public function load()
                 return false;
             }
 
-            $shipmentItems = $this->getShipmentItems($this->getShipment());
+            $shipmentItems = $this->getShipmentItems((array)$this->getShipment());
 
             $shipment = $this->documentFactory->create(
                 $order,
@@ -195,14 +194,4 @@ private function getShipmentItems(array $shipmentData)
         }
         return $shipmentItems;
     }
-
-    /**
-      * Retrieve shipment.
-      *
-      * @return array
-      */
-    public function getShipment()
-    {
-        return $this->getData(self::SHIPMENT) ?: [];
-    }
 }