Merge remote-tracking branch 'origin/MAGETWO-59074' into bugfixes

Author: Olexandr Lysenko

app/code/Magento/SalesInventory/Observer/RefundOrderInventoryObserver.php

@@ -22,22 +22,22 @@ class RefundOrderInventoryObserver implements ObserverInterface
     /**
      * @var StockConfigurationInterface
      */
-    protected $stockConfiguration;
+    private $stockConfiguration;
 
     /**
      * @var StockManagementInterface
      */
-    protected $stockManagement;
+    private $stockManagement;
 
     /**
      * @var \Magento\CatalogInventory\Model\Indexer\Stock\Processor
      */
-    protected $stockIndexerProcessor;
+    private $stockIndexerProcessor;
 
     /**
      * @var \Magento\Catalog\Model\Indexer\Product\Price\Processor
      */
-    protected $priceIndexer;
+    private $priceIndexer;
 
     /**
      * @var \Magento\SalesInventory\Model\Order\ReturnProcessor
@@ -59,12 +59,14 @@ public function __construct(
         StockConfigurationInterface $stockConfiguration,
         StockManagementInterface $stockManagement,
         \Magento\CatalogInventory\Model\Indexer\Stock\Processor $stockIndexerProcessor,
-        \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer
+        \Magento\Catalog\Model\Indexer\Product\Price\Processor $priceIndexer,
+        \Magento\Framework\App\ObjectManager $returnProcessor
     ) {
         $this->stockConfiguration = $stockConfiguration;
         $this->stockManagement = $stockManagement;
         $this->stockIndexerProcessor = $stockIndexerProcessor;
         $this->priceIndexer = $priceIndexer;
+        $this->returnProcessor = $returnProcessor;
     }
 
     /**
@@ -84,7 +86,7 @@ public function execute(EventObserver $observer)
                 $returnToStockItems[] = $item->getOrderItemId();
             }
         }
-        $this->getReturnProcessor()->execute(
+        $this->returnProcessor->execute(
             $creditmemo,
             $order,
             $returnToStockItems,
@@ -107,18 +109,4 @@ private function getOrderRepository()
         }
         return $this->orderRepository;
     }
-
-    /**
-     * Get OrderRepository
-     *
-     * @return ReturnProcessor
-     * @deprecated
-     */
-    private function getReturnProcessor()
-    {
-        if (!$this->returnProcessor) {
-            $this->returnProcessor = \Magento\Framework\App\ObjectManager::getInstance()->get(ReturnProcessor::class);
-        }
-        return $this->returnProcessor;
-    }
 }