Merge pull request magento#895 from magento-engcom/MSI-788-Synchronization-With-Core

MSI-788: Synchronization with core.

Author: Volodymyr Kublytskyi

app/code/Magento/InventoryShipping/Model/ShipmentProvider.php

@@ -29,7 +29,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function getShipment(): array
+    public function getShipmentData(): array
     {
         $sourceCode = $this->request->getParam('sourceCode');
         $items = $this->request->getParam('items', []);

app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/NewAction.php

@@ -7,6 +7,7 @@
 namespace Magento\Shipping\Controller\Adminhtml\Order\Shipment;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\App\ObjectManager;
 
 class NewAction extends \Magento\Backend\App\Action
 {
@@ -35,10 +36,11 @@ class NewAction extends \Magento\Backend\App\Action
     public function __construct(
         Action\Context $context,
         \Magento\Shipping\Controller\Adminhtml\Order\ShipmentLoader $shipmentLoader,
-        \Magento\Shipping\Model\ShipmentProviderInterface $shipmentProvider
+        \Magento\Shipping\Model\ShipmentProviderInterface $shipmentProvider = null
     ) {
         $this->shipmentLoader = $shipmentLoader;
-        $this->shipmentProvider = $shipmentProvider;
+        $this->shipmentProvider = $shipmentProvider ?: ObjectManager::getInstance()
+            ->get(\Magento\Shipping\Model\ShipmentProviderInterface::class);
         parent::__construct($context);
     }
 
@@ -51,7 +53,7 @@ public function execute()
     {
         $this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id'));
         $this->shipmentLoader->setShipmentId($this->getRequest()->getParam('shipment_id'));
-        $this->shipmentLoader->setShipment($this->shipmentProvider->getShipment());
+        $this->shipmentLoader->setShipment($this->shipmentProvider->getShipmentData());
         $this->shipmentLoader->setTracking($this->getRequest()->getParam('tracking'));
         $shipment = $this->shipmentLoader->load();
         if ($shipment) {

app/code/Magento/Shipping/Model/ShipmentProvider.php

@@ -30,7 +30,7 @@ public function __construct(RequestInterface $request)
     /**
      * @inheritdoc
      */
-    public function getShipment(): array
+    public function getShipmentData(): array
     {
         return $this->request->getParam('shipment', []);
     }

app/code/Magento/Shipping/Model/ShipmentProviderInterface.php

@@ -8,16 +8,16 @@
 namespace Magento\Shipping\Model;
 
 /**
- * Provide shipment items data from request.
+ * Provide shipment items data.
  *
  * @api
  */
 interface ShipmentProviderInterface
 {
     /**
-     * Retrieve shipment items from request.
+     * Retrieve shipment items.
      *
      * @return array
      */
-    public function getShipment(): array;
+    public function getShipmentData(): array;
 }

app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/NewActionTest.php

@@ -135,7 +135,7 @@ protected function setUp()
         );
         $this->shipmentProviderMock = $this->getMockBuilder(\Magento\Shipping\Model\ShipmentProviderInterface::class)
             ->disableOriginalConstructor()
-            ->setMethods(['getShipment'])
+            ->setMethods(['getShipmentData'])
             ->getMockForAbstractClass();
         $this->actionFlag = $this->createPartialMock(\Magento\Framework\App\ActionFlag::class, ['get']);
         $this->helper = $this->createPartialMock(\Magento\Backend\Helper\Data::class, ['getUrl']);
@@ -270,7 +270,7 @@ public function testExecute()
             ->with('menu')
             ->will($this->returnValue($menuBlock));
         $this->shipmentProviderMock->expects($this->once())
-            ->method('getShipment')
+            ->method('getShipmentData')
             ->willReturn($shipmentData);
 
         $this->assertNull($this->newAction->execute());