Merge branch 'MC-37794' of https://github.com/magento-mpi/magento2ce into TANGO-PR-10-21-2020-24

Author: thiaramus

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

@@ -5,25 +5,15 @@
  */
 namespace Magento\Sales\Model;
 
-use DomainException;
 use Magento\Framework\App\ResourceConnection;
-use Magento\Sales\Api\Data\ShipmentCommentCreationInterface;
-use Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface;
-use Magento\Sales\Api\Data\ShipmentItemCreationInterface;
-use Magento\Sales\Api\Data\ShipmentPackageCreationInterface;
-use Magento\Sales\Api\Data\ShipmentTrackCreationInterface;
-use Magento\Sales\Api\Exception\CouldNotShipExceptionInterface;
-use Magento\Sales\Api\Exception\DocumentValidationExceptionInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Sales\Api\ShipmentRepositoryInterface;
 use Magento\Sales\Api\ShipOrderInterface;
-use Magento\Sales\Exception\CouldNotShipException;
-use Magento\Sales\Exception\DocumentValidationException;
 use Magento\Sales\Model\Order\Config as OrderConfig;
 use Magento\Sales\Model\Order\OrderStateResolverInterface;
+use Magento\Sales\Model\Order\ShipmentDocumentFactory;
 use Magento\Sales\Model\Order\Shipment\NotifierInterface;
 use Magento\Sales\Model\Order\Shipment\OrderRegistrarInterface;
-use Magento\Sales\Model\Order\ShipmentDocumentFactory;
 use Magento\Sales\Model\Order\Validation\ShipOrderInterface as ShipOrderValidator;
 use Psr\Log\LoggerInterface;
 
@@ -126,27 +116,29 @@ public function __construct(
      * Process the shipment and save shipment and order data
      *
      * @param int $orderId
-     * @param ShipmentItemCreationInterface[] $items
+     * @param \Magento\Sales\Api\Data\ShipmentItemCreationInterface[] $items
      * @param bool $notify
      * @param bool $appendComment
-     * @param ShipmentCommentCreationInterface|null $comment
-     * @param ShipmentTrackCreationInterface[] $tracks
-     * @param ShipmentPackageCreationInterface[] $packages
-     * @param ShipmentCreationArgumentsInterface|null $arguments
+     * @param \Magento\Sales\Api\Data\ShipmentCommentCreationInterface|null $comment
+     * @param \Magento\Sales\Api\Data\ShipmentTrackCreationInterface[] $tracks
+     * @param \Magento\Sales\Api\Data\ShipmentPackageCreationInterface[] $packages
+     * @param \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface|null $arguments
      * @return int
-     * @throws DocumentValidationExceptionInterface
-     * @throws CouldNotShipExceptionInterface
-     * @throws DomainException
+     * @throws \Magento\Sales\Api\Exception\DocumentValidationExceptionInterface
+     * @throws \Magento\Sales\Api\Exception\CouldNotShipExceptionInterface
+     * @throws \Magento\Framework\Exception\InputException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \DomainException
      */
     public function execute(
         $orderId,
         array $items = [],
         $notify = false,
         $appendComment = false,
-        ShipmentCommentCreationInterface $comment = null,
+        \Magento\Sales\Api\Data\ShipmentCommentCreationInterface $comment = null,
         array $tracks = [],
         array $packages = [],
-        ShipmentCreationArgumentsInterface $arguments = null
+        \Magento\Sales\Api\Data\ShipmentCreationArgumentsInterface $arguments = null
     ) {
         $connection = $this->resourceConnection->getConnection('sales');
         $order = $this->orderRepository->get($orderId);
@@ -170,7 +162,7 @@ public function execute(
             $packages
         );
         if ($validationMessages->hasMessages()) {
-            throw new DocumentValidationException(
+            throw new \Magento\Sales\Exception\DocumentValidationException(
                 __("Shipment Document Validation Error(s):\n" . implode("\n", $validationMessages->getMessages()))
             );
         }
@@ -189,7 +181,7 @@ public function execute(
         } catch (\Exception $e) {
             $this->logger->critical($e);
             $connection->rollBack();
-            throw new CouldNotShipException(
+            throw new \Magento\Sales\Exception\CouldNotShipException(
                 __('Could not save a shipment, see error log for details')
             );
         }

app/code/Magento/Sales/Plugin/ProcessOrderAndShipmentViaAPI.php

@@ -189,7 +189,7 @@ protected function setUp(): void
             ->getMockForAbstractClass();
         $this->shipOrderValidatorMock = $this->getMockBuilder(ShipOrderInterface::class)
             ->disableOriginalConstructor()
-            ->getMock();
+            ->getMockForAbstractClass();
         $this->validationMessagesMock = $this->getMockBuilder(ValidatorResultInterface::class)
             ->disableOriginalConstructor()
             ->setMethods(['hasMessages', 'getMessages', 'addMessage'])

app/code/Magento/Sales/Test/Unit/Model/ShipOrderTest.php

@@ -19,7 +19,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Sales\Model\Order\ShipmentRepository">
-        <plugin name="process_order_and_shipment_via_api" type="Magento\Sales\Plugin\ProcessOrderAndShipmentViaAPI" />
-    </type>
 </config>

app/code/Magento/Sales/etc/webapi_rest/di.xml

@@ -19,7 +19,4 @@
             </argument>
         </arguments>
     </type>
-    <type name="Magento\Sales\Model\Order\ShipmentRepository">
-        <plugin name="process_order_and_shipment_via_api" type="Magento\Sales\Plugin\ProcessOrderAndShipmentViaAPI" />
-    </type>
 </config>