MAGETWO-64120: Error processing your request when placing reorder for simple product of configurable if attribute is changed

Author: olysenko

app/code/Magento/Sales/Controller/Adminhtml/Order/Create/Reorder.php

@@ -30,24 +30,24 @@ class Reorder extends \Magento\Sales\Controller\Adminhtml\Order\Create
     private $reorderHelper;
 
     /**
-     * @param UnavailableProductsProvider $unavailableProductsProvider
-     * @param OrderRepositoryInterface $orderRepository
-     * @param ReorderHelper $reorderHelper
      * @param Action\Context $context
      * @param \Magento\Catalog\Helper\Product $productHelper
      * @param \Magento\Framework\Escaper $escaper
      * @param PageFactory $resultPageFactory
      * @param ForwardFactory $resultForwardFactory
+     * @param UnavailableProductsProvider $unavailableProductsProvider
+     * @param OrderRepositoryInterface $orderRepository
+     * @param ReorderHelper $reorderHelper
      */
     public function __construct(
-        UnavailableProductsProvider $unavailableProductsProvider,
-        OrderRepositoryInterface $orderRepository,
-        ReorderHelper $reorderHelper,
         Action\Context $context,
         \Magento\Catalog\Helper\Product $productHelper,
         \Magento\Framework\Escaper $escaper,
         PageFactory $resultPageFactory,
-        ForwardFactory $resultForwardFactory
+        ForwardFactory $resultForwardFactory,
+        UnavailableProductsProvider $unavailableProductsProvider,
+        OrderRepositoryInterface $orderRepository,
+        ReorderHelper $reorderHelper
     ) {
         $this->unavailableProductsProvider = $unavailableProductsProvider;
         $this->orderRepository = $orderRepository;

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/Create/ReorderTest.php

@@ -23,6 +23,8 @@
 
 /**
  * Class ReorderTest
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class ReorderTest extends \PHPUnit_Framework_TestCase
 {

app/code/Magento/Sales/Test/Unit/Model/Order/Reorder/OrderProductAvailabilityCheckerTest.php

@@ -64,9 +64,9 @@ protected function setUp()
         $this->configurableCheckerMock = $this->getMockBuilder(ConfigurableProductChecker::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $fakeInstanceMock = $this->getMockBuilder(FakeInstance::class)->getMock();
+        $fakeClass = new \stdClass();
         $this->productAvailabilityChecks[$this->productTypeConfigurable] = $this->configurableCheckerMock;
-        $this->productAvailabilityChecks[$this->productTypeSimple] = $fakeInstanceMock;
+        $this->productAvailabilityChecks[$this->productTypeSimple] = $fakeClass;
 
         $this->checker = $objectManager->getObject(
             OrderedProductAvailabilityChecker::class,

dev/tests/integration/testsuite/Magento/Sales/Model/Order/Reorder/UnavailableProductsProviderTest.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Model\Order\Reorder;
 
-use Magento\Sales\Api\OrderRepositoryInterface;
+use Magento\Sales\Api\Data\OrderInterfaceFactory;
 
 /**
  * Class UnavailableProductsProviderTest
@@ -18,10 +18,10 @@ class UnavailableProductsProviderTest extends \PHPUnit_Framework_TestCase
     public function testGetForOrder()
     {
         $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
-        /** @var \Magento\Sales\Model\OrderRepository $orderRepository */
-        $orderRepository = $objectManager->get(OrderRepositoryInterface::class);
+        /** @var \Magento\Sales\Model\OrderFactory $orderFactory */
+        $orderFactory = $objectManager->get(OrderInterfaceFactory::class);
         /** @var \Magento\Sales\Model\Order $order */
-        $order = $orderRepository->get(1);
+        $order = $orderFactory->create()->loadByIncrementId('100000001');
         $orderItems = $order->getItems();
         $orderItemSimple = $orderItems[2];
         $orderItemSimple->getSku();