MAGETWO-54658: Order status change after Invoice creation through API

Author: NadiyaS

app/code/Magento/Sales/Model/Order/StateResolver.php

@@ -13,53 +13,48 @@
  */
 class StateResolver implements OrderStateResolverInterface
 {
-
     /**
-     * Check is order in complete state
+     * Check if order should be in complete state
      *
      * @param OrderInterface $order
      * @return bool
      */
-    private function checkIsOrderComplete(OrderInterface $order)
+    private function isOrderComplete(OrderInterface $order)
     {
-        /** @var  $order Order|OrderInterface */
+        /** @var $order Order|OrderInterface */
         if (0 == $order->getBaseGrandTotal() || $order->canCreditmemo()) {
-            if ($order->getState() !== Order::STATE_COMPLETE) {
-                return true;
-            }
+            return true;
         }
         return false;
     }
 
     /**
-     * Check is order in cancel state
+     * Check if order should be in closed state
      *
      * @param OrderInterface $order
      * @param array $arguments
      * @return bool
      */
-    private function checkIsOrderClosed(OrderInterface $order, $arguments)
+    private function isOrderClosed(OrderInterface $order, $arguments)
     {
-        /** @var  $order Order|OrderInterface */
+        /** @var $order Order|OrderInterface */
         $forceCreditmemo = in_array(self::FORCED_CREDITMEMO, $arguments);
         if (floatval($order->getTotalRefunded()) || !$order->getTotalRefunded() && $forceCreditmemo) {
-            if ($order->getState() !== Order::STATE_CLOSED) {
-                return true;
-            }
+            return true;
         }
         return false;
     }
 
     /**
-     * Check is order in cancel state
+     * Check if order is processing
      *
      * @param OrderInterface $order
      * @param array $arguments
      * @return bool
      */
-    private function checkIsOrderProcessing(OrderInterface $order, $arguments)
+    private function isOrderProcessing(OrderInterface $order, $arguments)
     {
-        /** @var  $order Order|OrderInterface */
+        /** @var $order Order|OrderInterface */
         if ($order->getState() == Order::STATE_NEW && in_array(self::IN_PROGRESS, $arguments)) {
             return true;
         }
@@ -84,16 +79,16 @@ private function getInitialOrderState(OrderInterface $order)
      */
     public function getStateForOrder(OrderInterface $order, array $arguments = [])
     {
-        /** @var  $order Order|OrderInterface */
+        /** @var $order Order|OrderInterface */
         $orderState = $this->getInitialOrderState($order);
         if (!$order->isCanceled() && !$order->canUnhold() && !$order->canInvoice() && !$order->canShip()) {
-            if ($this->checkIsOrderComplete($order)) {
+            if ($this->isOrderComplete($order)) {
                 $orderState = Order::STATE_COMPLETE;
-            } elseif ($this->checkIsOrderClosed($order, $arguments)) {
+            } elseif ($this->isOrderClosed($order, $arguments)) {
                 $orderState = Order::STATE_CLOSED;
             }
         }
-        if ($this->checkIsOrderProcessing($order, $arguments)) {
+        if ($this->isOrderProcessing($order, $arguments)) {
             $orderState = Order::STATE_PROCESSING;
         }
         return $orderState;

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

@@ -138,7 +138,7 @@ public function execute(
         InvoiceCommentCreationInterface $comment = null,
         InvoiceCreationArgumentsInterface $arguments = null
     ) {
-        $connection = $this->resourceConnection->getConnectionByName('sales');
+        $connection = $this->resourceConnection->getConnection('sales');
         $order = $this->orderRepository->get($orderId);
         $invoice = $this->invoiceDocumentFactory->create(
             $order,

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

@@ -192,7 +192,7 @@ protected function setUp()
     public function testOrderInvoice($orderId, $capture, $items, $notify, $appendComment)
     {
         $this->resourceConnectionMock->expects($this->once())
-            ->method('getConnectionByName')
+            ->method('getConnection')
             ->with('sales')
             ->willReturn($this->adapterInterface);
 
@@ -336,7 +336,7 @@ public function testCouldNotInvoiceException()
         $notify = true;
         $appendComment = true;
         $this->resourceConnectionMock->expects($this->once())
-            ->method('getConnectionByName')
+            ->method('getConnection')
             ->with('sales')
             ->willReturn($this->adapterInterface);