Merge remote-tracking branch 'origin/MAGETWO-31522' into MAGETWO-31522

Author: vpaladiychuk

app/code/Magento/Sales/Controller/Adminhtml/Order/CommentsHistory.php

@@ -6,8 +6,53 @@
  */
 namespace Magento\Sales\Controller\Adminhtml\Order;
 
+use Magento\Backend\App\Action;
+
 class CommentsHistory extends \Magento\Sales\Controller\Adminhtml\Order
 {
+    /**
+     * @var \Magento\Framework\View\LayoutFactory
+     */
+    protected $layoutFactory;
+
+    /**
+     * @param Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\App\Response\Http\FileFactory $fileFactory
+     * @param \Magento\Framework\Translate\InlineInterface $translateInline
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+     * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
+     */
+    public function __construct(
+        Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\App\Response\Http\FileFactory $fileFactory,
+        \Magento\Framework\Translate\InlineInterface $translateInline,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
+        \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        \Magento\Framework\View\LayoutFactory $layoutFactory
+    ) {
+        $this->layoutFactory = $layoutFactory;
+        parent::__construct(
+            $context,
+            $coreRegistry,
+            $fileFactory,
+            $translateInline,
+            $resultPageFactory,
+            $resultRedirectFactory,
+            $resultJsonFactory,
+            $resultLayoutFactory,
+            $resultRawFactory
+        );
+    }
+
     /**
      * Generate order history for ajax request
      *
@@ -16,9 +61,8 @@ class CommentsHistory extends \Magento\Sales\Controller\Adminhtml\Order
     public function execute()
     {
         $this->_initOrder();
-        $resultLayout = $this->resultLayoutFactory->create();
-        $html = $resultLayout->getLayout()
-            ->createBlock('Magento\Sales\Block\Adminhtml\Order\View\Tab\History')
+        $layout = $this->layoutFactory->create();
+        $html = $layout->createBlock('Magento\Sales\Block\Adminhtml\Order\View\Tab\History')
             ->toHtml();
         $this->_translateInline->processResponseBody($html);
         /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */