MAGETWO-36731: Refactor controller actions in the Search module

Author: Yuri Kovsher

app/code/Magento/Search/Controller/Adminhtml/Term/MassDelete.php

@@ -1,12 +1,14 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
-class MassDelete extends \Magento\Search\Controller\Adminhtml\Term
+use Magento\Search\Controller\Adminhtml\Term as TermController;
+use Magento\Framework\Controller\ResultFactory;
+
+class MassDelete extends TermController
 {
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
@@ -27,8 +29,9 @@ public function execute()
                 $this->messageManager->addError($e->getMessage());
             }
         }
-        /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
-        $redirectResult = $this->resultRedirectFactory->create();
-        return $redirectResult->setPath('search/*/');
+        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
+        $resultRedirect->setPath('search/*/');
+        return $resultRedirect;
     }
 }

app/code/Magento/Search/Controller/Adminhtml/Term/Report.php

@@ -1,42 +1,30 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Search\Controller\Adminhtml\Term;
 
-class Report extends \Magento\Reports\Controller\Adminhtml\Index
-{
-    /**
-     * Add reports to breadcrumb
-     *
-     * @return $this
-     */
-    public function _initAction()
-    {
-        $this->_view->loadLayout();
-        $this->_addBreadcrumb(__('Reports'), __('Reports'));
-        return $this;
-    }
+use Magento\Reports\Controller\Adminhtml\Index as ReportsIndexController;
+use Magento\Framework\Controller\ResultFactory;
 
+class Report extends ReportsIndexController
+{
     /**
      * Search terms report action
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\Page
      */
     public function execute()
     {
         $this->_eventManager->dispatch('on_view_report', ['report' => 'search']);
-
-        $this->_initAction()->_setActiveMenu(
-            'Magento_Reports::report_search'
-        )->_addBreadcrumb(
-            __('Search Terms'),
-            __('Search Terms')
-        );
-        $this->_view->getPage()->getConfig()->getTitle()->set(__('Search Terms Report'));
-        $this->_view->renderLayout();
+        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        $resultPage = $this->resultFactory->create(ResultFactory::TYPE_PAGE);
+        $resultPage->setActiveMenu('Magento_Reports::report_search')
+            ->addBreadcrumb(__('Reports'), __('Reports'))
+            ->addBreadcrumb(__('Search Terms'), __('Search Terms'));
+        $resultPage->getConfig()->getTitle()->set(__('Search Terms Report'));
+        return $resultPage;
     }
 
     /**