MAGETWO-33059: Refactor CMS module

Author: Evgeniy Miskov

app/code/Magento/Cms/Controller/Adminhtml/Block.php

@@ -37,15 +37,9 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
      */
     protected function initPage($resultPage)
     {
-        $resultPage->setActiveMenu(
-            'Magento_Cms::cms_block'
-        )->addBreadcrumb(
-            __('CMS'),
-            __('CMS')
-        )->addBreadcrumb(
-            __('Static Blocks'),
-            __('Static Blocks')
-        );
+        $resultPage->setActiveMenu('Magento_Cms::cms_block')
+            ->addBreadcrumb(__('CMS'), __('CMS'))
+            ->addBreadcrumb(__('Static Blocks'), __('Static Blocks'));
         return $resultPage;
     }
 

app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php

@@ -1,8 +1,5 @@
 <?php
 /**
- * Default no route page action
- * Used if no route page don't configure or available
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */

app/code/Magento/Cms/Controller/Index/NoCookies.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,17 +8,17 @@
 class NoCookies extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @var \Magento\Backend\Model\View\Result\ForwardFactory
+     * @var \Magento\Framework\Controller\Result\ForwardFactory
      */
     protected $resultForwardFactory;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+     * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
-        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+        \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
     ) {
         $this->resultForwardFactory = $resultForwardFactory;
         parent::__construct($context);

app/code/Magento/Cms/Controller/Noroute/Index.php

@@ -9,17 +9,17 @@
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @var \Magento\Backend\Model\View\Result\ForwardFactory
+     * @var \Magento\Framework\Controller\Result\ForwardFactory
      */
     protected $resultForwardFactory;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+     * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
-        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+        \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
     ) {
         $this->resultForwardFactory = $resultForwardFactory;
         parent::__construct($context);

app/code/Magento/Cms/Controller/Page/View.php

@@ -9,17 +9,17 @@
 class View extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @var \Magento\Backend\Model\View\Result\ForwardFactory
+     * @var \Magento\Framework\Controller\Result\ForwardFactory
      */
     protected $resultForwardFactory;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+     * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
-        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+        \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
     ) {
         $this->resultForwardFactory = $resultForwardFactory;
         parent::__construct($context);

app/code/Magento/Cms/Helper/Page.php

@@ -161,7 +161,6 @@ public function prepareResultPage(Action $action, $pageId = null)
         /** @var \Magento\Framework\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $this->setLayoutType($inRange, $resultPage);
-        $resultPage->initLayout();
         $resultPage->addHandle('cms_page_view');
         $resultPage->addPageLayoutHandles(['id' => $this->_page->getIdentifier()]);