Merge remote-tracking branch 'github-magento2ce/MAGETWO-70885' into EPAM-PR-71

Author: nikshostko

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

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Sales\Model;
 
@@ -247,8 +248,11 @@ public function deleteById($id)
     /**
      * Perform persist operations for one entity
      *
-     * @param \Magento\Sales\Api\Data\OrderInterface $entity
-     * @return \Magento\Sales\Api\Data\OrderInterface
+     * @param OrderInterface $entity
+     * @return OrderInterface
+     * @throws InputException
+     * @throws NoSuchEntityException
+     * @throws \Magento\Framework\Exception\AlreadyExistsException
      */
     public function save(\Magento\Sales\Api\Data\OrderInterface $entity)
     {
@@ -262,6 +266,7 @@ public function save(\Magento\Sales\Api\Data\OrderInterface $entity)
                 $entity->setShippingMethod($shipping->getMethod());
             }
         }
+
         $this->metadata->getMapper()->save($entity);
         $this->registry[$entity->getEntityId()] = $entity;
         return $this->registry[$entity->getEntityId()];

app/code/Magento/Sales/Model/ResourceModel/EntityAbstract.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\AbstractDb;
@@ -14,6 +16,7 @@
 /**
  * Abstract sales entity provides to its children knowledge about eventPrefix and eventObject
  *
+ * phpcs:disable Magento2.Classes.AbstractApi
  * @api
  * @SuppressWarnings(PHPMD.NumberOfChildren)
  * @since 100.0.2
@@ -96,6 +99,7 @@ public function saveAttribute(\Magento\Framework\Model\AbstractModel $object, $a
 
     /**
      * Prepares data for saving and removes update time (if exists).
+     *
      * This prevents saving same update time on each entity update.
      *
      * @param \Magento\Framework\Model\AbstractModel $object
@@ -114,6 +118,7 @@ protected function _prepareDataForSave(\Magento\Framework\Model\AbstractModel $o
 
     /**
      * Perform actions before object save
+     *
      * Perform actions before object save, calculate next sequence value for increment Id
      *
      * @param \Magento\Framework\Model\AbstractModel|\Magento\Framework\DataObject $object
@@ -122,7 +127,7 @@ protected function _prepareDataForSave(\Magento\Framework\Model\AbstractModel $o
     protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     {
         /** @var \Magento\Sales\Model\AbstractModel $object */
-        if ($object instanceof EntityInterface && $object->getIncrementId() == null) {
+        if ($object instanceof EntityInterface && $object->getEntityId() == null && $object->getIncrementId() == null) {
             $store = $object->getStore();
             $storeId = $store->getId();
             if ($storeId === null) {

app/code/Magento/Sales/Test/Unit/Model/ResourceModel/OrderTest.php

@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Sales\Test\Unit\Model\ResourceModel;
 
 use Magento\Framework\Model\ResourceModel\Db\VersionControl\RelationComposite;
@@ -198,7 +200,7 @@ public function testSave()
             ->with('10000001')
             ->willReturnSelf();
         $this->orderMock->expects($this->once())
-            ->method('getIncrementId')
+            ->method('getEntityId')
             ->willReturn(null);
         $this->orderMock->expects($this->once())
             ->method('getData')