MAGETWO-54963: Extensibility and modularity improvements

- Placeholders added to orders list
- Unit test fix

Author: nikshostko

app/code/Magento/Sales/Block/Order/History.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Sales\Block\Order;
 
+use \Magento\Framework\App\ObjectManager;
+use \Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface;
+
 /**
  * Sales order history block
  */
@@ -33,16 +36,21 @@ class History extends \Magento\Framework\View\Element\Template
     /** @var \Magento\Sales\Model\ResourceModel\Order\Collection */
     protected $orders;
 
+    /**
+     * @var CollectionFactoryInterface
+     */
+    private $orderCollectionFactory;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
-     * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface $orderCollectionFactory
+     * @param \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Sales\Model\Order\Config $orderConfig
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
-        \Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface $orderCollectionFactory,
+        \Magento\Sales\Model\ResourceModel\Order\CollectionFactory $orderCollectionFactory,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Sales\Model\Order\Config $orderConfig,
         array $data = []
@@ -62,6 +70,19 @@ protected function _construct()
         $this->pageConfig->getTitle()->set(__('My Orders'));
     }
 
+    /**
+     * @return CollectionFactoryInterface
+     *
+     * @deprecated
+     */
+    private function getOrderCollectionFactory()
+    {
+        if ($this->orderCollectionFactory === null) {
+            $this->orderCollectionFactory = ObjectManager::getInstance()->get(CollectionFactoryInterface::class);
+        }
+        return $this->orderCollectionFactory;
+    }
+
     /**
      * @return bool|\Magento\Sales\Model\ResourceModel\Order\Collection
      */
@@ -71,7 +92,7 @@ public function getOrders()
             return false;
         }
         if (!$this->orders) {
-            $this->orders = $this->_orderCollectionFactory->create($customerId)->addFieldToSelect(
+            $this->orders = $this->getOrderCollectionFactory()->create($customerId)->addFieldToSelect(
                 '*'
             )->addFieldToFilter(
                 'status',

app/code/Magento/Sales/Test/Unit/Block/Order/HistoryTest.php

@@ -22,6 +22,16 @@ class HistoryTest extends \PHPUnit_Framework_TestCase
      */
     protected $orderCollectionFactory;
 
+    /**
+     * @var \Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderCollectionFactoryInterface;
+
+    /**
+     * @var \Magento\Framework\App\ObjectManager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $objectManager;
+
     /**
      * @var \Magento\Customer\Model\Session|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -48,6 +58,14 @@ protected function setUp()
         $this->orderCollectionFactory =
             $this->getMockBuilder('Magento\Sales\Model\ResourceModel\Order\CollectionFactory')
             ->disableOriginalConstructor()->setMethods(['create'])->getMock();
+        $this->orderCollectionFactoryInterface =
+            $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order\CollectionFactoryInterface::class)
+                ->disableOriginalConstructor()->setMethods(['create'])->getMock();
+        $this->objectManager = $this->getMock(\Magento\Framework\ObjectManagerInterface::class, [], [], '', false);
+        $this->objectManager->expects($this->any())
+            ->method('get')
+            ->will($this->returnValue($this->orderCollectionFactoryInterface));
+        \Magento\Framework\App\ObjectManager::setInstance($this->objectManager);
 
         $this->customerSession = $this->getMockBuilder('Magento\Customer\Model\Session')
             ->setMethods(['getCustomerId'])->disableOriginalConstructor()->getMock();
@@ -101,7 +119,7 @@ public function testConstructMethod()
             ->method('setOrder')
             ->with('created_at', 'desc')
             ->will($this->returnSelf());
-        $this->orderCollectionFactory->expects($this->atLeastOnce())
+        $this->orderCollectionFactoryInterface->expects($this->atLeastOnce())
             ->method('create')
             ->will($this->returnValue($orderCollection));
         $this->pageConfig->expects($this->atLeastOnce())