MAGETWO-33059: Refactor CMS module

Author: Evgeniy Miskov

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

@@ -78,11 +78,6 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_view;
 
-    /**
-     * @var \Magento\Framework\View\Page\Config
-     */
-    protected $pageConfig;
-
     /**
      * @var \Magento\Framework\View\Result\PageFactory
      */
@@ -100,7 +95,6 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\App\ViewInterface $view
-     * @param \Magento\Framework\View\Page\Config $pageConfig
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -114,7 +108,6 @@ public function __construct(
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Escaper $escaper,
         \Magento\Framework\App\ViewInterface $view,
-        \Magento\Framework\View\Page\Config $pageConfig,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory
     ) {
         $this->messageManager = $messageManager;
@@ -123,10 +116,8 @@ public function __construct(
         $this->_design = $design;
         $this->_pageFactory = $pageFactory;
         $this->_storeManager = $storeManager;
-        $this->_storeManager = $storeManager;
         $this->_localeDate = $localeDate;
         $this->_escaper = $escaper;
-        $this->pageConfig = $pageConfig;
         $this->resultPageFactory = $resultPageFactory;
         parent::__construct($context);
     }

dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php

@@ -186,7 +186,10 @@ public function testExecute()
             ->method('create')
             ->willReturn($this->rawMock);
 
-        $this->assertSame($this->rawMock, $this->wysiwygDirective->execute());
+        $this->assertSame(
+            $this->rawMock,
+            $this->wysiwygDirective->execute()
+        );
     }
 
     /**
@@ -231,7 +234,10 @@ public function testExecuteException()
             ->method('create')
             ->willReturn($this->rawMock);
 
-        $this->assertSame($this->rawMock, $this->wysiwygDirective->execute());
+        $this->assertSame(
+            $this->rawMock,
+            $this->wysiwygDirective->execute()
+        );
     }
 
     protected function prepareExecuteTest()

dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php

@@ -114,7 +114,10 @@ public function testExecuteResultPage()
         )->will(
             $this->returnValue($this->resultPageMock)
         );
-        $this->assertSame($this->resultPageMock, $this->_controller->execute());
+        $this->assertSame(
+            $this->resultPageMock,
+            $this->_controller->execute()
+        );
     }
 
     public function testExecuteResultForward()
@@ -144,6 +147,9 @@ public function testExecuteResultForward()
         )->will(
             $this->returnValue(false)
         );
-        $this->assertInstanceOf('Magento\Backend\Model\View\Result\Forward', $this->_controller->execute());
+        $this->assertSame(
+            $this->forwardMock,
+            $this->_controller->execute()
+        );
     }
 }