From bd0b179d1d007f7b623382a4b5cd4eb7c4a7dad0 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Mon, 29 Dec 2014 16:23:19 +0200
Subject: [PATCH 01/94] MAGETWO-15418: Sold products aren't displayed in
 Bestsellers

---
 .../Adminhtml/Dashboard/RefreshStatistics.php | 24 ++++++
 .../layout/adminhtml_dashboard_index.xml      |  4 +-
 .../adminhtml/templates/dashboard/index.phtml |  1 +
 .../totalbar/refreshstatistics.phtml          | 11 +++
 .../Adminhtml/Report/Statistics.php           | 23 +++---
 app/code/Magento/Reports/etc/adminhtml/di.xml | 14 ++++
 .../Test/Block/Dashboard/StoreStats.php       | 28 +++++++
 .../Test/Block/Dashboard/StoreStats.xml       | 13 ++++
 .../Test/Block/Dashboard/Tab/Products.php     | 31 ++++++++
 .../Block/Dashboard/Tab/Products/Ordered.php  | 40 ++++++++++
 .../AssertBestsellersOnDashboard.php          | 76 ++++++++++++++++++
 .../Backend/Test/Page/Adminhtml/Dashboard.xml |  5 ++
 .../Magento/Backend/Test/etc/constraint.xml   |  3 +
 .../Dashboard/RefreshStatisticsTest.php       | 78 +++++++++++++++++++
 14 files changed, 339 insertions(+), 12 deletions(-)
 create mode 100644 app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
 create mode 100644 app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
 create mode 100644 dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.xml
 create mode 100644 dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
 create mode 100644 dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
new file mode 100644
index 0000000000000..decd27a4ecba0
--- /dev/null
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ *
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Backend\Controller\Adminhtml\Dashboard;
+
+class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
+{
+    public function execute()
+    {
+        try {
+            $collectionsNames = array_values($this->reportTypes);
+            foreach ($collectionsNames as $collectionName) {
+                $this->_objectManager->create($collectionName)->aggregate();
+            }
+            $this->messageManager->addSuccess(__('We updated lifetime statistic.'));
+        } catch (\Exception $e) {
+            $this->messageManager->addError(__('We can\'t refresh lifetime statistics.'));
+            $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+        }
+        $this->_redirect('*/*');
+    }
+}
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml
index 5c1b722c541fc..f08cf89c6c9af 100644
--- a/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml
+++ b/app/code/Magento/Backend/view/adminhtml/layout/adminhtml_dashboard_index.xml
@@ -14,7 +14,9 @@
             </block>
         </referenceContainer>
         <referenceContainer name="content">
-            <block class="Magento\Backend\Block\Dashboard" name="dashboard"/>
+            <block class="Magento\Backend\Block\Dashboard" name="dashboard">
+                <block class="Magento\Backend\Block\Template" name="refresh_statistics" template="Magento_Backend::dashboard/totalbar/refreshstatistics.phtml"/>
+            </block>
         </referenceContainer>
     </body>
 </page>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
index 3510a20e8e916..811407e82efde 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
@@ -78,6 +78,7 @@ function toggleCal(id) {
              <div class="dashboard-store-stats">
                  <?php echo $this->getChildHtml('grids') ?>
                  <div id="grid_tab_content" class="dashboard-store-stats-content"></div>
+                 <?php echo $this->getChildHtml('refresh_statistics') ?>
              </div>
          </div>
          <div class="dashboard-secondary">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
new file mode 100644
index 0000000000000..a8bd71bf1b5af
--- /dev/null
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
@@ -0,0 +1,11 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+?>
+<form action="<?php echo $this->getUrl('*/*/refreshStatistics'); ?>" method="post">
+    <input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>" />
+    <button type="submit" style="float:right; margin: 15px"  title="Refresh data">
+        <?php echo __('Refresh data') ?>
+    </button>
+</form>
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
index c8c3045f0bfb9..3c8240ce02882 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
@@ -27,15 +27,25 @@ class Statistics extends \Magento\Backend\App\Action
      */
     protected $_dateFilter;
 
+    /**
+     * Codes for Refresh Statistics
+     *
+     * @var []
+     */
+    protected $reportTypes;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
+     * @param [] $reportTypes
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
+        \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
+        array $reportTypes
     ) {
         $this->_dateFilter = $dateFilter;
+        $this->reportTypes = $reportTypes;
         parent::__construct($context);
     }
 
@@ -71,16 +81,7 @@ protected function _getCollectionNames()
             $codes = explode(',', $codes);
         }
 
-        $aliases = [
-            'sales' => 'Magento\Sales\Model\Resource\Report\Order',
-            'tax' => 'Magento\Tax\Model\Resource\Report\Tax',
-            'shipping' => 'Magento\Sales\Model\Resource\Report\Shipping',
-            'invoiced' => 'Magento\Sales\Model\Resource\Report\Invoiced',
-            'refunded' => 'Magento\Sales\Model\Resource\Report\Refunded',
-            'coupons' => 'Magento\SalesRule\Model\Resource\Report\Rule',
-            'bestsellers' => 'Magento\Sales\Model\Resource\Report\Bestsellers',
-            'viewed' => 'Magento\Reports\Model\Resource\Report\Product\Viewed',
-        ];
+        $aliases = $this->reportTypes;
         $out = [];
         foreach ($codes as $code) {
             $out[] = $aliases[$code];
diff --git a/app/code/Magento/Reports/etc/adminhtml/di.xml b/app/code/Magento/Reports/etc/adminhtml/di.xml
index 903b024e1d921..5d48f4f612cdb 100644
--- a/app/code/Magento/Reports/etc/adminhtml/di.xml
+++ b/app/code/Magento/Reports/etc/adminhtml/di.xml
@@ -10,4 +10,18 @@
             <argument name="modelName" xsi:type="string">Magento\Customer\Model\Backend\Customer</argument>
         </arguments>
     </type>
+    <type name="Magento\Reports\Controller\Adminhtml\Report\Statistics">
+        <arguments>
+            <argument name="reportTypes" xsi:type="array">
+                <item name="sales" xsi:type="string">Magento\Sales\Model\Resource\Report\Order</item>
+                <item name="tax" xsi:type="string">Magento\Tax\Model\Resource\Report\Tax</item>
+                <item name="shipping" xsi:type="string">Magento\Sales\Model\Resource\Report\Shipping</item>
+                <item name="invoiced" xsi:type="string">Magento\Sales\Model\Resource\Report\Invoiced</item>
+                <item name="refunded" xsi:type="string">Magento\Sales\Model\Resource\Report\Refunded</item>
+                <item name="coupons" xsi:type="string">Magento\SalesRule\Model\Resource\Report\Rule</item>
+                <item name="bestsellers" xsi:type="string">Magento\Sales\Model\Resource\Report\Bestsellers</item>
+                <item name="viewed" xsi:type="string">Magento\Reports\Model\Resource\Report\Product\Viewed</item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php
new file mode 100644
index 0000000000000..2fee6aad9cb53
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Backend\Test\Block\Dashboard;
+
+use Mtf\Client\Element\Locator;
+use Magento\Backend\Test\Block\Widget\FormTabs;
+
+class StoreStats extends FormTabs
+{
+    /**
+     * Refresh data button
+     *
+     * @var string
+     */
+    protected $refreshData = '//button[@title="Refresh data"]';
+
+    /**
+     * Click Refresh Data button
+     *
+     * return void
+     */
+    public function refreshData()
+    {
+        $this->_rootElement->find($this->refreshData, Locator::SELECTOR_XPATH)->click();
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.xml
new file mode 100644
index 0000000000000..fd0baa2eb287d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+-->
+<tabs>
+    <bestsellers>
+        <class>\Magento\Backend\Test\Block\Dashboard\Tab\Products</class>
+        <selector>#grid_tab_ordered_products</selector>
+        <strategy>css selector</strategy>
+    </bestsellers>
+</tabs>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php
new file mode 100644
index 0000000000000..9f1c788773563
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Backend\Test\Block\Dashboard\Tab;
+
+use Mtf\Client\Element;
+use Magento\Backend\Test\Block\Widget\Tab;
+
+class Products extends Tab
+{
+    /**
+     * Locator for ordered products grid
+     *
+     * @var string
+     */
+    protected $orderedProductsGrid = '#grid_tab_ordered_products_content';
+
+    /**
+     * Get bestsellers grid
+     *
+     * @return \Magento\Backend\Test\Block\Dashboard\Tab\Products\Ordered
+     */
+    public function getBestsellersGrid()
+    {
+        return $this->blockFactory->create(
+            '\Magento\Backend\Test\Block\Dashboard\Tab\Products\Ordered',
+            ['element' => $this->browser->find($this->orderedProductsGrid)]
+        );
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
new file mode 100644
index 0000000000000..8ed9b12ee2532
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+
+namespace Magento\Backend\Test\Block\Dashboard\Tab\Products;
+
+use Mtf\Client\Element\Locator;
+use Magento\Backend\Test\Block\Widget\Grid;
+
+/**
+ * Ordered products grid on bestsellers tab on Dashboard
+ */
+class Ordered extends Grid
+{
+    // @codingStandardsIgnoreStart
+    /**
+     * Ordered products row in bestsellers grid
+     *
+     * @var string
+     */
+    protected $orderedProductsRow = '//table[@id="productsOrderedGrid_table"]/tbody/tr[td[contains(., "%s")] and td[contains(., "%d")] and td[contains(., "%d")]]';
+    // @codingStandardsIgnoreEnd
+
+    /**
+     * Check if ordered product is in grid
+     *
+     * @param array $filter
+     * @return bool
+     */
+    public function isProductVisible($filter)
+    {
+        if ($this->_rootElement->find(sprintf($this->orderedProductsRow, $filter['name'], $filter['price'],
+            $filter['qty']), Locator::SELECTOR_XPATH)->isVisible()
+        ) {
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
new file mode 100644
index 0000000000000..b12354683392d
--- /dev/null
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+namespace Magento\Backend\Test\Constraint;
+
+use Mtf\Constraint\AbstractConstraint;
+use Magento\Sales\Test\Fixture\OrderInjectable;
+use Magento\Backend\Test\Page\Adminhtml\Dashboard;
+
+/**
+ * Assert that bestsellers tab content on Dashboard successfully refreshed after clicking on Refreshing data button
+ */
+class AssertBestsellersOnDashboard extends AbstractConstraint
+{
+    /* tags */
+    const SEVERITY = 'low';
+    /* end tags */
+
+    /**
+     * Assert that ordered products in bestsellers on Dashboard successfully refreshed
+     *
+     * @param OrderInjectable $order
+     * @param Dashboard $dashboard
+     * @return void
+     */
+    public function processAssert(OrderInjectable $order, Dashboard $dashboard)
+    {
+        $dashboard->open();
+        $dashboard->getStoreStatsBlock()->refreshData();
+        /** @var \Magento\Backend\Test\Block\Dashboard\Tab\Products\Ordered $bestsellersGrid */
+        $bestsellersGrid = $dashboard->getStoreStatsBlock()->getTabElement('bestsellers')->getBestsellersGrid();
+        $products = $order->getEntityId()['products'];
+        foreach($products as $product) {
+            $filter = [
+                'name' => $product->getName(),
+                'price' => $product->getPrice(),
+                'qty' => $product->getCheckoutData()['qty'],
+            ];
+            \PHPUnit_Framework_Assert::assertTrue(
+                $bestsellersGrid->isProductVisible($filter),
+                'Bestseller does not present in report grid after refresh data.'
+            );
+        }
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Bestsellers successfully updated after Refreshing data.';
+    }
+}
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
index ac4a3670f2f0f..d2e60c58a98ab 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Page/Adminhtml/Dashboard.xml
@@ -26,5 +26,10 @@
             <locator>.navigation</locator>
             <strategy>css selector</strategy>
         </menuBlock>
+        <storeStatsBlock>
+            <class>Magento\Backend\Test\Block\Dashboard\StoreStats</class>
+            <locator>.dashboard-store-stats</locator>
+            <strategy>css selector</strategy>
+        </storeStatsBlock>
     </blocks>
 </page>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml
index e6f96b2219e9c..55f76a3cf2ae8 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/etc/constraint.xml
@@ -17,4 +17,7 @@
     <assertGlobalSearchCustomerName module="Magento_Backend">
         <severity>low</severity>
     </assertGlobalSearchCustomerName>
+    <assertBestsellersOnDashboard module="Magento_Backend">
+        <severity>low</severity>
+    </assertBestsellersOnDashboard>
 </constraint>
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
new file mode 100644
index 0000000000000..e518d906c5c23
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ */
+namespace Magento\Backend\Controller\Adminhtml\Dashboard;
+
+/**
+ * Test for \Magento\Backend\Controller\Adminhtml\Dashboard\RefreshStatistics
+ */
+class RefreshStatisticsTest extends \PHPUnit_Framework_TestCase
+{
+    public function testExecute()
+    {
+        $path = '*/*';
+
+        $reportTypes = [
+            'sales' => 'Magento\Sales\Model\Resource\Report\Order'
+        ];
+
+        $request = $this->getMock('Magento\Framework\App\RequestInterface', [], [], '', false);
+        $response = $this->getMock(
+            'Magento\Framework\App\ResponseInterface',
+            ['setRedirect', 'sendResponse'],
+            [],
+            '',
+            false
+        );
+        $response->expects($this->once())->method('setRedirect')->with($path);
+
+        $messageManager = $this->getMock('\Magento\Framework\Message\Manager', [], [], '', false);
+        $messageManager->expects($this->once())->method('addSuccess')->with(__('We updated lifetime statistic.'));
+
+        $adminSession = $this->getMock('Magento\Backend\Model\Auth\Session', ['setIsUrlNotice'], [], '', false);
+        $adminSession->expects($this->atLeastOnce())->method('setIsUrlNotice')->with(true);
+
+        $actionFlag = $this->getMock('Magento\Framework\App\ActionFlag', ['get'], [], '', false);
+        $actionFlag->expects($this->atLeastOnce())
+            ->method('get')
+            ->with('', 'check_url_settings')
+            ->will($this->returnValue(true));
+
+        $date = $this->getMock('Magento\Framework\Stdlib\DateTime\Filter\Date', [], [], '', false);
+
+        $order = $this->getMock('Magento\Sales\Model\Resource\Report\Order', [], [], '', false);
+
+        $objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface', [], [], '', false);
+        $objectManager->expects($this->any())->method('create')->with('Magento\Sales\Model\Resource\Report\Order')
+            ->will($this->returnValue($order));
+        $objectManager->expects($this->once())
+            ->method('get')
+            ->with('Magento\Backend\Model\Auth\Session')
+            ->will($this->returnValue($adminSession));
+
+        $helper = $this->getMock('\Magento\Backend\Helper\Data', ['getUrl'], [], '', false);
+        $helper->expects($this->atLeastOnce())->method('getUrl')->with($path)->will($this->returnValue($path));
+
+        $context = $this->getMock('Magento\Backend\App\Action\Context', [], [], '', false);
+        $context->expects($this->once())->method('getRequest')->will($this->returnValue($request));
+        $context->expects($this->once())->method('getResponse')->will($this->returnValue($response));
+        $context->expects($this->once())->method('getMessageManager')->will($this->returnValue($messageManager));
+        $context->expects($this->once())->method('getActionFlag')->will($this->returnValue($actionFlag));
+        $context->expects($this->any())->method('getObjectManager')->will($this->returnValue($objectManager));
+        $context->expects($this->atLeastOnce())->method('getHelper')->will($this->returnValue($helper));
+
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+        /** @var \Magento\Backend\Controller\Adminhtml\Dashboard\RefreshStatistics $refreshStatisticsController */
+        $refreshStatisticsController = $objectManagerHelper->getObject(
+            'Magento\Backend\Controller\Adminhtml\Dashboard\RefreshStatistics',
+            [
+                'context' => $context,
+                'dateFilter' => $date,
+                'reportTypes' => $reportTypes
+            ]
+        );
+
+        $refreshStatisticsController->execute();
+    }
+}

From ac47173dc641893403357e5adf84928ec26bf5f3 Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Thu, 22 Jan 2015 18:31:13 +0200
Subject: [PATCH 02/94] MAGETWO-31524: Refactor controller actions in the CMS
 module

---
 .../Cms/Controller/Adminhtml/Block/Delete.php | 29 +++++++++++---
 .../Adminhtml/Block/Widget/Chooser.php        | 39 +++++++++++++++++--
 2 files changed, 60 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
old mode 100644
new mode 100755
index 2c91e21aebea9..c3a010969b126
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
@@ -8,6 +8,25 @@
 
 class Delete extends \Magento\Cms\Controller\Adminhtml\Block
 {
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+    ) {
+        $this->resultRedirectFactory = $resultRedirectFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
     /**
      * Delete action
      *
@@ -15,6 +34,8 @@ class Delete extends \Magento\Cms\Controller\Adminhtml\Block
      */
     public function execute()
     {
+        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
         // check if we know what should be deleted
         $id = $this->getRequest()->getParam('block_id');
         if ($id) {
@@ -26,19 +47,17 @@ public function execute()
                 // display success message
                 $this->messageManager->addSuccess(__('The block has been deleted.'));
                 // go to grid
-                $this->_redirect('*/*/');
-                return;
+                return $resultRedirect->setPath('*/*/');
             } catch (\Exception $e) {
                 // display error message
                 $this->messageManager->addError($e->getMessage());
                 // go back to edit form
-                $this->_redirect('*/*/edit', ['block_id' => $id]);
-                return;
+                return $resultRedirect->setPath('*/*/edit', ['block_id' => $id]);
             }
         }
         // display error message
         $this->messageManager->addError(__('We can\'t find a block to delete.'));
         // go to grid
-        $this->_redirect('*/*/');
+        return $resultRedirect->setPath('*/*/');
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php
old mode 100644
new mode 100755
index 6690917e839b4..e785e256d97b3
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Widget/Chooser.php
@@ -6,21 +6,54 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Block\Widget;
 
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\View\LayoutFactory;
+use Magento\Framework\Controller\Result\RawFactory;
+
 class Chooser extends \Magento\Backend\App\Action
 {
+    /**
+     * @var \Magento\Framework\View\LayoutFactory
+     */
+    protected $layoutFactory;
+
+    /**
+     * @var RawFactory
+     */
+    protected $resultRawFactory;
+
+    /**
+     * @param Context $context
+     * @param LayoutFactory $layoutFactory
+     * @param RawFactory $resultRawFactory
+     */
+    public function __construct(Context $context, LayoutFactory $layoutFactory, RawFactory $resultRawFactory)
+    {
+        $this->layoutFactory = $layoutFactory;
+        $this->resultRawFactory = $resultRawFactory;
+        parent::__construct($context);
+    }
+
     /**
      * Chooser Source action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
+        /** @var \Magento\Framework\View\Layout $layout */
+        $layout = $this->layoutFactory->create();
+
         $uniqId = $this->getRequest()->getParam('uniq_id');
-        $pagesGrid = $this->_view->getLayout()->createBlock(
+        $pagesGrid = $layout->createBlock(
             'Magento\Cms\Block\Adminhtml\Block\Widget\Chooser',
             '',
             ['data' => ['id' => $uniqId]]
         );
-        $this->getResponse()->setBody($pagesGrid->toHtml());
+
+        /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+        $resultRaw = $this->resultRawFactory->create();
+        $resultRaw->setContents($pagesGrid->toHtml());
+        return $resultRaw;
     }
 }

From 06ee1f5bf2362400efe4cffd5d635bbc8e85445f Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Fri, 23 Jan 2015 16:24:54 +0200
Subject: [PATCH 03/94] MAGETWO-31524: Refactor controller actions in the CMS
 module

---
 .../Cms/Controller/Adminhtml/Block.php        | 20 +++++++++
 .../Cms/Controller/Adminhtml/Block/Delete.php |  2 +-
 .../Cms/Controller/Adminhtml/Block/Edit.php   | 44 +++++++++++++++----
 .../Cms/Controller/Adminhtml/Block/Index.php  | 25 +++++++++--
 4 files changed, 79 insertions(+), 12 deletions(-)
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Block.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block.php b/app/code/Magento/Cms/Controller/Adminhtml/Block.php
old mode 100644
new mode 100755
index befeb1f30b990..47c29e0c7af43
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block.php
@@ -29,6 +29,26 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
         parent::__construct($context);
     }
 
+    /**
+     * Init page
+     *
+     * @param \Magento\Backend\Model\View\Result\Page $resultPage
+     * @return \Magento\Backend\Model\View\Result\Page
+     */
+    protected function _initPage($resultPage)
+    {
+        $resultPage->setActiveMenu(
+            'Magento_Cms::cms_block'
+        )->addBreadcrumb(
+            __('CMS'),
+            __('CMS')
+        )->addBreadcrumb(
+            __('Static Blocks'),
+            __('Static Blocks')
+        );
+        return $resultPage;
+    }
+
     /**
      * Init actions
      *
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
index c3a010969b126..df5ed33ff756e 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Delete.php
@@ -30,7 +30,7 @@ public function __construct(
     /**
      * Delete action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
old mode 100644
new mode 100755
index 20c6ef8e79769..c65ccc5318ebc
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
@@ -8,10 +8,35 @@
 
 class Edit extends \Magento\Cms\Controller\Adminhtml\Block
 {
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    protected $resultPageFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory
+    ) {
+        $this->resultRedirectFactory = $resultRedirectFactory;
+        $this->resultPageFactory = $resultPageFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
     /**
      * Edit CMS block
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
@@ -24,8 +49,9 @@ public function execute()
             $model->load($id);
             if (!$model->getId()) {
                 $this->messageManager->addError(__('This block no longer exists.'));
-                $this->_redirect('*/*/');
-                return;
+                /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+                $resultRedirect = $this->resultRedirectFactory->create();
+                return $resultRedirect->setPath('*/*/');
             }
         }
         // 3. Set entered data if was error when we do save
@@ -37,14 +63,16 @@ public function execute()
         // 4. Register model to use later in blocks
         $this->_coreRegistry->register('cms_block', $model);
 
+        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        $resultPage = $this->resultPageFactory->create();
+
         // 5. Build edit form
-        $this->_initAction()->_addBreadcrumb(
+        $this->_initPage($resultPage)->addBreadcrumb(
             $id ? __('Edit Block') : __('New Block'),
             $id ? __('Edit Block') : __('New Block')
         );
-        $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Blocks'));
-        $this->_view->getPage()
-            ->getConfig()->getTitle()->prepend($model->getId() ? $model->getTitle() : __('New Block'));
-        $this->_view->renderLayout();
+        $resultPage->getConfig()->getTitle()->prepend(__('Blocks'));
+        $resultPage->getConfig()->getTitle()->prepend($model->getId() ? $model->getTitle() : __('New Block'));
+        return $resultPage;
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
old mode 100644
new mode 100755
index 7422bd9adee3e..e524e9ced8506
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
@@ -8,6 +8,25 @@
 
 class Index extends \Magento\Cms\Controller\Adminhtml\Block
 {
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    protected $resultPageFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory
+    ) {
+        $this->resultPageFactory = $resultPageFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
     /**
      * Index action
      *
@@ -15,8 +34,8 @@ class Index extends \Magento\Cms\Controller\Adminhtml\Block
      */
     public function execute()
     {
-        $this->_initAction();
-        $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Blocks'));
-        $this->_view->renderLayout();
+        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        $resultPage = $this->resultPageFactory->create();
+        $this->_initPage($resultPage)->getConfig()->getTitle()->prepend(__('Blocks'));
     }
 }

From 913d573688768459f527908d88a45d4dc50d6a96 Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Fri, 23 Jan 2015 17:31:53 +0200
Subject: [PATCH 04/94] MAGETWO-31524: Refactor controller actions in the CMS
 module

---
 .../Controller/Adminhtml/Block/NewAction.php  | 24 +++++++++++--
 .../Cms/Controller/Adminhtml/Block/Save.php   | 35 ++++++++++++++-----
 2 files changed, 48 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
old mode 100644
new mode 100755
index 5a6836e29317e..e4355e91af57e
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
@@ -8,6 +8,25 @@
 
 class NewAction extends \Magento\Cms\Controller\Adminhtml\Block
 {
+    /**
+     * @var \Magento\Backend\Model\View\Result\ForwardFactory
+     */
+    protected $resultForwardFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+    ) {
+        $this->resultForwardFactory = $resultForwardFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
     /**
      * Create new CMS block
      *
@@ -15,7 +34,8 @@ class NewAction extends \Magento\Cms\Controller\Adminhtml\Block
      */
     public function execute()
     {
-        // the same form is used to create and edit
-        $this->_forward('edit');
+        /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
+        $resultForward = $this->resultForwardFactory->create();
+        return $resultForward->forward('edit');
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
old mode 100644
new mode 100755
index b7be060697e8d..48d7dc97c19dd
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
@@ -8,6 +8,25 @@
 
 class Save extends \Magento\Cms\Controller\Adminhtml\Block
 {
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+    ) {
+        $this->resultRedirectFactory = $resultRedirectFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
     /**
      * Save action
      *
@@ -15,6 +34,8 @@ class Save extends \Magento\Cms\Controller\Adminhtml\Block
      */
     public function execute()
     {
+        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
         // check if data sent
         $data = $this->getRequest()->getPost();
         if ($data) {
@@ -22,8 +43,7 @@ public function execute()
             $model = $this->_objectManager->create('Magento\Cms\Model\Block')->load($id);
             if (!$model->getId() && $id) {
                 $this->messageManager->addError(__('This block no longer exists.'));
-                $this->_redirect('*/*/');
-                return;
+                return $resultRedirect->setPath('*/*/');
             }
 
             // init model and set data
@@ -41,22 +61,19 @@ public function execute()
 
                 // check if 'Save and Continue'
                 if ($this->getRequest()->getParam('back')) {
-                    $this->_redirect('*/*/edit', ['block_id' => $model->getId()]);
-                    return;
+                    return $resultRedirect->setPath('*/*/edit', ['block_id' => $model->getId()]);
                 }
                 // go to grid
-                $this->_redirect('*/*/');
-                return;
+                return $resultRedirect->setPath('*/*/');
             } catch (\Exception $e) {
                 // display error message
                 $this->messageManager->addError($e->getMessage());
                 // save data in session
                 $this->_objectManager->get('Magento\Backend\Model\Session')->setFormData($data);
                 // redirect to edit form
-                $this->_redirect('*/*/edit', ['block_id' => $this->getRequest()->getParam('block_id')]);
-                return;
+                return $resultRedirect->setPath('*/*/edit', ['block_id' => $this->getRequest()->getParam('block_id')]);
             }
         }
-        $this->_redirect('*/*/');
+        return $resultRedirect->setPath('*/*/');
     }
 }

From 0f6d5dab1852d70184421d170a58a5d37987bd00 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Fri, 23 Jan 2015 19:45:40 +0200
Subject: [PATCH 05/94] MAGETWO-15418: Sold products aren't displayed in
 Bestsellers

- Changed Mtf namespace to Magento/Mtf;
- Unit test modified;
- Added ResultInterface to controller;
---
 .../Adminhtml/Dashboard/RefreshStatistics.php |   5 +-
 .../Adminhtml/Report/Statistics.php           |   8 +
 dev/tests/functional/phpunit.xml.dist         |   2 +-
 .../Test/Block/Dashboard/StoreStats.php       |   2 +-
 .../Test/Block/Dashboard/Tab/Products.php     |   2 +-
 .../Block/Dashboard/Tab/Products/Ordered.php  |   2 +-
 .../AssertBestsellersOnDashboard.php          |   2 +-
 .../Test/TestStep/CreateCatalogRuleStep.php   |   4 +-
 ...axCalculationAfterCheckoutDownloadable.php |   2 +-
 ...axRuleIsAppliedToAllPricesDownloadable.php |   4 +-
 .../AbstractAssertOrderTaxOnBackend.php       |   4 +-
 ...tractAssertTaxCalculationAfterCheckout.php |   4 +-
 .../Tax/Test/TestStep/CreateTaxRuleStep.php   |   4 +-
 .../Dashboard/RefreshStatisticsTest.php       | 138 ++++++++++++------
 14 files changed, 123 insertions(+), 60 deletions(-)

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
index decd27a4ecba0..a0f73d5d254f4 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
@@ -7,6 +7,9 @@
 
 class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
 {
+    /**
+     * @return \Magento\Backend\Model\View\Result\Redirect
+     */
     public function execute()
     {
         try {
@@ -19,6 +22,6 @@ public function execute()
             $this->messageManager->addError(__('We can\'t refresh lifetime statistics.'));
             $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
         }
-        $this->_redirect('*/*');
+        return $this->resultRedirectFactory->create()->setPath('*/*');
     }
 }
diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
index 7cd6638e9206d..cfb52a444d5ae 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
@@ -35,18 +35,26 @@ class Statistics extends \Magento\Backend\App\Action
      */
     protected $reportTypes;
 
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
      * @param [] $reportTypes
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
         array $reportTypes
     ) {
         $this->_dateFilter = $dateFilter;
         $this->reportTypes = $reportTypes;
+        $this->resultRedirectFactory = $resultRedirectFactory;
         parent::__construct($context);
     }
 
diff --git a/dev/tests/functional/phpunit.xml.dist b/dev/tests/functional/phpunit.xml.dist
index 1bc47ba8998a8..53ebfb2bb9bb4 100755
--- a/dev/tests/functional/phpunit.xml.dist
+++ b/dev/tests/functional/phpunit.xml.dist
@@ -38,7 +38,7 @@
         <env name="handlers_config_path" value="config/handler.yml.dist" />
         <env name="install_config_path" value="config/install_data.yml.dist" />
         <env name="testsuite_rule" value="basic" />
-        <env name="testsuite_rule_path" value="Mtf/TestSuite/InjectableTests" />
+        <env name="testsuite_rule_path" value="Magento/Mtf/TestSuite/InjectableTests" />
         <env name="log_directory" value="var/log" />
         <env name="events_preset" value="base" />
         <env name="module_whitelist" value="Magento_Install" />
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php
index 2fee6aad9cb53..19d417da04374 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php
@@ -4,7 +4,7 @@
  */
 namespace Magento\Backend\Test\Block\Dashboard;
 
-use Mtf\Client\Element\Locator;
+use Magento\Mtf\Client\Locator;
 use Magento\Backend\Test\Block\Widget\FormTabs;
 
 class StoreStats extends FormTabs
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php
index 9f1c788773563..22b19e53b6614 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php
@@ -4,7 +4,7 @@
  */
 namespace Magento\Backend\Test\Block\Dashboard\Tab;
 
-use Mtf\Client\Element;
+use Magento\Mtf\Client\Element;
 use Magento\Backend\Test\Block\Widget\Tab;
 
 class Products extends Tab
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
index 8ed9b12ee2532..c4400052a5c5e 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
@@ -5,7 +5,7 @@
 
 namespace Magento\Backend\Test\Block\Dashboard\Tab\Products;
 
-use Mtf\Client\Element\Locator;
+use Magento\Mtf\Client\Locator;
 use Magento\Backend\Test\Block\Widget\Grid;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
index b12354683392d..66e64440114d1 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
@@ -24,7 +24,7 @@
 
 namespace Magento\Backend\Test\Constraint;
 
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Sales\Test\Fixture\OrderInjectable;
 use Magento\Backend\Test\Page\Adminhtml\Dashboard;
 
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
index f17c6b3962160..3cf247de49fd1 100644
--- a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
+++ b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestStep/CreateCatalogRuleStep.php
@@ -6,8 +6,8 @@
 
 namespace Magento\CatalogRule\Test\TestStep;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Creating catalog rule
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
index f8bf3012cfa96..009f5e1cacd07 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxCalculationAfterCheckoutDownloadable.php
@@ -11,7 +11,7 @@
 use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Sales\Test\Page\OrderView;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 use Magento\Tax\Test\Constraint\AbstractAssertTaxCalculationAfterCheckout;
 
 /**
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
index bd74cdb32ae3b..a0c10b6fc59fb 100644
--- a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
+++ b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Constraint/AbstractAssertTaxRuleIsAppliedToAllPricesDownloadable.php
@@ -11,8 +11,8 @@
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Tax\Test\Constraint\AbstractAssertTaxRuleIsAppliedToAllPrices;
-use Mtf\Fixture\FixtureFactory;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Checks that product prices excl tax on category, product and cart pages are equal to specified in dataset.
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
index aa63949e9de9d..f039b6f00b8e3 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertOrderTaxOnBackend.php
@@ -6,12 +6,12 @@
 
 namespace Magento\Tax\Test\Constraint;
 
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Sales\Test\Page\Adminhtml\OrderView;
 use Magento\Sales\Test\Page\Adminhtml\OrderIndex;
 use Magento\Sales\Test\Page\Adminhtml\OrderInvoiceNew;
 use Magento\Sales\Test\Page\Adminhtml\OrderCreditMemoNew;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Checks that prices displayed excluding tax in order are correct on backend.
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
index debc24c79bb65..fd580fd0c21bb 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/Constraint/AbstractAssertTaxCalculationAfterCheckout.php
@@ -6,13 +6,13 @@
 
 namespace Magento\Tax\Test\Constraint;
 
-use Mtf\Constraint\AbstractConstraint;
+use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Checkout\Test\Page\CheckoutCart;
 use Magento\Checkout\Test\Page\CheckoutOnepage;
 use Magento\Checkout\Test\Page\CheckoutOnepageSuccess;
 use Magento\Customer\Test\Fixture\CustomerInjectable;
 use Magento\Sales\Test\Page\OrderView;
-use Mtf\Fixture\InjectableFixture;
+use Magento\Mtf\Fixture\InjectableFixture;
 
 /**
  * Checks that prices excluding tax on order review and customer order pages are equal to specified in dataset.
diff --git a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
index e90c0be6bc439..555af5a2594c6 100644
--- a/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
+++ b/dev/tests/functional/tests/app/Magento/Tax/Test/TestStep/CreateTaxRuleStep.php
@@ -6,8 +6,8 @@
 
 namespace Magento\Tax\Test\TestStep;
 
-use Mtf\Fixture\FixtureFactory;
-use Mtf\TestStep\TestStepInterface;
+use Magento\Mtf\Fixture\FixtureFactory;
+use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
  * Creating tax rule
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
index e518d906c5c23..d422e193f9ca5 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
@@ -9,70 +9,122 @@
  */
 class RefreshStatisticsTest extends \PHPUnit_Framework_TestCase
 {
-    public function testExecute()
-    {
-        $path = '*/*';
+    /**
+     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultRedirect;
+
+    /**
+     * @var  \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultRedirectFactory;
+
+    /**
+     * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $request;
+
+    /**
+     * @var \Magento\Framework\App\ResponseInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $response;
+
+    /**
+     * @var \Magento\Framework\Message\Manager|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $messageManager;
+
+    /**
+     * @var \Magento\Sales\Model\Resource\Report\Order|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $order;
+
+    /**
+     * @var \Magento\Framework\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $objectManager;
 
+    /**
+     * @var \Magento\Backend\Controller\Adminhtml\Dashboard\RefreshStatistics
+     */
+    protected $refreshStatisticsController;
+
+    /**
+     * @var \Magento\Backend\App\Action\Context|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $context;
+
+    public function setUp()
+    {
         $reportTypes = [
             'sales' => 'Magento\Sales\Model\Resource\Report\Order'
         ];
 
-        $request = $this->getMock('Magento\Framework\App\RequestInterface', [], [], '', false);
-        $response = $this->getMock(
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+        $this->resultRedirectFactory = $this->getMock(
+            'Magento\Backend\Model\View\Result\RedirectFactory',
+            ['create'],
+            [],
+            '',
+            false
+        );
+        $this->resultRedirect = $this->getMock('Magento\Backend\Model\View\Result\Redirect', [], [], '', false);
+
+        $this->request = $this->getMock('Magento\Framework\App\RequestInterface', [], [], '', false);
+        $this->response = $this->getMock(
             'Magento\Framework\App\ResponseInterface',
             ['setRedirect', 'sendResponse'],
             [],
             '',
             false
         );
-        $response->expects($this->once())->method('setRedirect')->with($path);
-
-        $messageManager = $this->getMock('\Magento\Framework\Message\Manager', [], [], '', false);
-        $messageManager->expects($this->once())->method('addSuccess')->with(__('We updated lifetime statistic.'));
-
-        $adminSession = $this->getMock('Magento\Backend\Model\Auth\Session', ['setIsUrlNotice'], [], '', false);
-        $adminSession->expects($this->atLeastOnce())->method('setIsUrlNotice')->with(true);
-
-        $actionFlag = $this->getMock('Magento\Framework\App\ActionFlag', ['get'], [], '', false);
-        $actionFlag->expects($this->atLeastOnce())
-            ->method('get')
-            ->with('', 'check_url_settings')
-            ->will($this->returnValue(true));
 
-        $date = $this->getMock('Magento\Framework\Stdlib\DateTime\Filter\Date', [], [], '', false);
+        $this->messageManager = $this->getMock('\Magento\Framework\Message\Manager', [], [], '', false);
 
-        $order = $this->getMock('Magento\Sales\Model\Resource\Report\Order', [], [], '', false);
+        $this->order = $this->getMock('Magento\Sales\Model\Resource\Report\Order', [], [], '', false);
 
-        $objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface', [], [], '', false);
-        $objectManager->expects($this->any())->method('create')->with('Magento\Sales\Model\Resource\Report\Order')
-            ->will($this->returnValue($order));
-        $objectManager->expects($this->once())
-            ->method('get')
-            ->with('Magento\Backend\Model\Auth\Session')
-            ->will($this->returnValue($adminSession));
+        $this->objectManager = $this->getMock('Magento\Framework\ObjectManagerInterface', [], [], '', false);
 
-        $helper = $this->getMock('\Magento\Backend\Helper\Data', ['getUrl'], [], '', false);
-        $helper->expects($this->atLeastOnce())->method('getUrl')->with($path)->will($this->returnValue($path));
+        $this->context = $this->getMock('Magento\Backend\App\Action\Context', [], [], '', false);
+        $this->context->expects($this->once())->method('getRequest')->willReturn($this->request);
+        $this->context->expects($this->once())->method('getResponse')->willReturn($this->response);
+        $this->context->expects($this->once())->method('getMessageManager')->willReturn($this->messageManager);
+        $this->context->expects($this->any())->method('getObjectManager')->willReturn($this->objectManager);
 
-        $context = $this->getMock('Magento\Backend\App\Action\Context', [], [], '', false);
-        $context->expects($this->once())->method('getRequest')->will($this->returnValue($request));
-        $context->expects($this->once())->method('getResponse')->will($this->returnValue($response));
-        $context->expects($this->once())->method('getMessageManager')->will($this->returnValue($messageManager));
-        $context->expects($this->once())->method('getActionFlag')->will($this->returnValue($actionFlag));
-        $context->expects($this->any())->method('getObjectManager')->will($this->returnValue($objectManager));
-        $context->expects($this->atLeastOnce())->method('getHelper')->will($this->returnValue($helper));
-
-        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
-        /** @var \Magento\Backend\Controller\Adminhtml\Dashboard\RefreshStatistics $refreshStatisticsController */
-        $refreshStatisticsController = $objectManagerHelper->getObject(
+        $this->refreshStatisticsController = $objectManagerHelper->getObject(
             'Magento\Backend\Controller\Adminhtml\Dashboard\RefreshStatistics',
             [
-                'context' => $context,
-                'dateFilter' => $date,
+                'context' => $this->context,
+                'resultRedirectFactory' => $this->resultRedirectFactory,
                 'reportTypes' => $reportTypes
             ]
         );
+    }
 
-        $refreshStatisticsController->execute();
+    public function testExecute()
+    {
+        $path = '*/*';
+
+        $this->resultRedirectFactory->expects($this->any())->method('create')->willReturn($this->resultRedirect);
+
+        $this->messageManager->expects($this->once())
+            ->method('addSuccess')
+            ->with(__('We updated lifetime statistic.'));
+
+        $this->objectManager->expects($this->any())
+            ->method('create')
+            ->with('Magento\Sales\Model\Resource\Report\Order')
+            ->willReturn($this->order);
+
+        $this->resultRedirect->expects($this->once())
+            ->method('setPath')
+            ->with($path)
+            ->willReturnSelf();
+
+        $this->assertInstanceOf(
+            'Magento\Backend\Model\View\Result\Redirect',
+            $this->refreshStatisticsController->execute()
+        );
     }
 }

From 503af5fcc03eae1df8c83d0192c6c9a6a7f89439 Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Mon, 26 Jan 2015 19:02:31 +0200
Subject: [PATCH 06/94] MAGETWO-33059: Refactor CMS module

---
 .../Adminhtml/AbstractMassDelete.php          | 24 +++++++-
 .../Cms/Controller/Adminhtml/Page/Delete.php  | 31 ++++++++--
 .../Cms/Controller/Adminhtml/Page/Edit.php    | 59 ++++++++++++-------
 .../Cms/Controller/Adminhtml/Page/Index.php   | 44 ++++++++++----
 .../Controller/Adminhtml/Page/NewAction.php   | 23 +++++++-
 .../Cms/Controller/Adminhtml/Page/Save.php    | 31 ++++++----
 .../Adminhtml/Page/Widget/Chooser.php         | 39 +++++++++++-
 .../Adminhtml/Wysiwyg/Directive.php           | 24 ++++++--
 .../Adminhtml/Wysiwyg/Images/Thumbnail.php    | 25 +++++++-
 .../Cms/Controller/Index/DefaultNoCookies.php | 22 ++++++-
 .../Cms/Controller/Index/DefaultNoRoute.php   | 29 ++++++---
 .../Magento/Cms/Controller/Index/Index.php    | 24 +++++++-
 .../Cms/Controller/Index/NoCookies.php        | 20 ++++++-
 .../Magento/Cms/Controller/Noroute/Index.php  | 34 ++++++++++-
 app/code/Magento/Cms/Controller/Page/View.php | 22 ++++++-
 15 files changed, 366 insertions(+), 85 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php
index da2844521bc31..b6ecd9d8f0ba9 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php
@@ -37,15 +37,33 @@ class AbstractMassDelete extends \Magento\Backend\App\Action
      */
     protected $model = 'Magento\Framework\Model\AbstractModel';
 
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+    ) {
+        $this->resultRedirectFactory = $resultRedirectFactory;
+        parent::__construct($context);
+    }
+
     /**
      * Execute action
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
     {
         $data = $this->getRequest()->getParam('massaction', '[]');
         $data = json_decode($data, true);
+        $resultRedirect = $this->resultRedirectFactory->create();
 
         try {
             if (isset($data['all_selected']) && $data['all_selected'] === true) {
@@ -58,13 +76,13 @@ public function execute()
                 $this->selectedDelete($data['selected']);
             } else {
                 $this->messageManager->addError(__('Please select item(s).'));
-                $this->_redirect(static::REDIRECT_URL);
+                $resultRedirect->setPath(static::REDIRECT_URL);
             }
         } catch (\Exception $e) {
             $this->messageManager->addError($e->getMessage());
         }
 
-        $this->_redirect(static::REDIRECT_URL);
+        $resultRedirect->setPath(static::REDIRECT_URL);
     }
 
     /**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
index 558ba3021d724..cd471a88ba149 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
@@ -6,8 +6,27 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
+use Magento\Backend\App\Action;
+
 class Delete extends \Magento\Backend\App\Action
 {
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
+    /**
+     * @param Action\Context $context
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+     */
+    public function __construct(
+        Action\Context $context,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory)
+    {
+        $this->resultRedirectFactory = $resultRedirectFactory;
+        parent::__construct($context);
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -19,12 +38,14 @@ protected function _isAllowed()
     /**
      * Delete action
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
     {
         // check if we know what should be deleted
         $id = $this->getRequest()->getParam('page_id');
+        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
         if ($id) {
             $title = "";
             try {
@@ -40,8 +61,7 @@ public function execute()
                     'adminhtml_cmspage_on_delete',
                     ['title' => $title, 'status' => 'success']
                 );
-                $this->_redirect('*/*/');
-                return;
+                return $resultRedirect->setPath('*/*/');
             } catch (\Exception $e) {
                 $this->_eventManager->dispatch(
                     'adminhtml_cmspage_on_delete',
@@ -50,13 +70,12 @@ public function execute()
                 // display error message
                 $this->messageManager->addError($e->getMessage());
                 // go back to edit form
-                $this->_redirect('*/*/edit', ['page_id' => $id]);
-                return;
+                return $resultRedirect->setPath('*/*/edit', ['page_id' => $id]);
             }
         }
         // display error message
         $this->messageManager->addError(__('We can\'t find a page to delete.'));
         // go to grid
-        $this->_redirect('*/*/');
+        return $resultRedirect->setPath('*/*/');
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
index 4c3a0427bb553..ca8bcae134f76 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
@@ -17,13 +17,28 @@ class Edit extends \Magento\Backend\App\Action
      */
     protected $_coreRegistry = null;
 
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    protected $resultPageFactory;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
     /**
      * @param Action\Context $context
-     * @param \Magento\Framework\Registry $registry
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
      */
-    public function __construct(Action\Context $context, \Magento\Framework\Registry $registry)
+    public function __construct(
+        Action\Context $context,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory)
     {
-        $this->_coreRegistry = $registry;
+        $this->resultPageFactory = $resultPageFactory;
+        $this->resultRedirectFactory = $resultRedirectFactory;
         parent::__construct($context);
     }
 
@@ -38,28 +53,23 @@ protected function _isAllowed()
     /**
      * Init actions
      *
-     * @return $this
+     * @return \Magento\Backend\Model\View\Result\Page
      */
     protected function _initAction()
     {
         // load layout, set active menu and breadcrumbs
-        $this->_view->loadLayout();
-        $this->_setActiveMenu(
-            'Magento_Cms::cms_page'
-        )->_addBreadcrumb(
-            __('CMS'),
-            __('CMS')
-        )->_addBreadcrumb(
-            __('Manage Pages'),
-            __('Manage Pages')
-        );
-        return $this;
+        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        $resultPage = $this->resultPageFactory->create();
+        $resultPage->setActiveMenu('Magento_Cms::cms_page')
+            ->addBreadcrumb(__('CMS'), __('CMS'))
+            ->addBreadcrumb(__('Manage Pages'), __('Manage Pages'));
+        return $resultPage;
     }
 
     /**
      * Edit CMS page
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\Page|\Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -72,8 +82,10 @@ public function execute()
             $model->load($id);
             if (!$model->getId()) {
                 $this->messageManager->addError(__('This page no longer exists.'));
-                $this->_redirect('*/*/');
-                return;
+                /** \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+                $resultRedirect = $this->resultRedirectFactory->create();
+
+                return $resultRedirect->setPath('*/*/');
             }
         }
 
@@ -87,13 +99,16 @@ public function execute()
         $this->_coreRegistry->register('cms_page', $model);
 
         // 5. Build edit form
-        $this->_initAction()->_addBreadcrumb(
+        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        $resultPage = $this->_initAction();
+        $resultPage->addBreadcrumb(
             $id ? __('Edit Page') : __('New Page'),
             $id ? __('Edit Page') : __('New Page')
         );
-        $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Pages'));
-        $this->_view->getPage()->getConfig()->getTitle()
+        $resultPage->getConfig()->getTitle()->prepend(__('Pages'));
+        $resultPage->getConfig()->getTitle()
             ->prepend($model->getId() ? $model->getTitle() : __('New Page'));
-        $this->_view->renderLayout();
+
+        return $resultPage;
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
index f09834b169612..15289145a097c 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
@@ -6,8 +6,30 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
+use Magento\Framework\Registry;
+use Magento\Backend\App\Action\Context;
+use Magento\Framework\View\Result\PageFactory;
+
 class Index extends \Magento\Backend\App\Action
 {
+    /**
+     * @var PageFactory
+     */
+    protected $resultPageFactory;
+
+    /**
+     * @param Context $context
+     * @param Registry $coreRegistry
+     * @param PageFactory $resultPageFactory
+     */
+    public function __construct(
+        Context $context,
+        Registry $coreRegistry,
+        PageFactory $resultPageFactory
+    ) {
+        parent::__construct($context, $coreRegistry);
+        $this->resultPageFactory = $resultPageFactory;
+    }
     /**
      * Check the permission to run it
      *
@@ -21,21 +43,17 @@ protected function _isAllowed()
     /**
      * Index action
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\Page
      */
     public function execute()
     {
-        $this->_view->loadLayout();
-        $this->_setActiveMenu(
-            'Magento_Cms::cms_page'
-        )->_addBreadcrumb(
-            __('CMS'),
-            __('CMS')
-        )->_addBreadcrumb(
-            __('Manage Pages'),
-            __('Manage Pages')
-        );
-        $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Pages'));
-        $this->_view->renderLayout();
+        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        $resultPage = $this->resultPageFactory->create();
+        $resultPage->setActiveMenu('Magento_Cms::cms_page');
+        $resultPage->addBreadcrumb(__('CMS'), __('CMS'));
+        $resultPage->addBreadcrumb(__('Manage Pages'),__('Manage Pages'));
+        $resultPage->getConfig()->getTitle()->prepend(__('Pages'));
+
+        return $resultPage;
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
index 147f11fa3bdb8..7dad58a562c6a 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
@@ -8,6 +8,23 @@
 
 class NewAction extends \Magento\Backend\App\Action
 {
+    /**
+     * @var \Magento\Backend\Model\View\Result\Forward
+     */
+    protected $resultForwardFactory;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+    ) {
+        $this->resultForwardFactory = $resultForwardFactory;
+        parent::__construct($context);
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -19,10 +36,12 @@ protected function _isAllowed()
     /**
      * Forward to edit
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\Forward
      */
     public function execute()
     {
-        $this->_forward('edit');
+        /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */
+        $resultForward = $this->resultForwardFactory->create();
+        $resultForward->forward('edit');
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
index 52c036c763026..ddfba2910aa5d 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
@@ -7,9 +7,15 @@
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
 use Magento\Backend\App\Action;
+use Magento\Backend\Model\View\Result\RedirectFactory;
 
 class Save extends \Magento\Backend\App\Action
 {
+    /**
+     * @var RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
     /**
      * @var PostDataProcessor
      */
@@ -18,10 +24,15 @@ class Save extends \Magento\Backend\App\Action
     /**
      * @param Action\Context $context
      * @param PostDataProcessor $dataProcessor
+     * @param RedirectFactory $resultRedirectFactory
      */
-    public function __construct(Action\Context $context, PostDataProcessor $dataProcessor)
+    public function __construct(
+        Action\Context $context,
+        PostDataProcessor $dataProcessor,
+        RedirectFactory $resultRedirectFactory)
     {
         $this->dataProcessor = $dataProcessor;
+        $this->resultRedirectFactory = $resultRedirectFactory;
         parent::__construct($context);
     }
 
@@ -36,11 +47,13 @@ protected function _isAllowed()
     /**
      * Save action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         $data = $this->getRequest()->getPost();
+        /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
+        $resultRedirect = $this->resultRedirectFactory->create();
         if ($data) {
             $data = $this->dataProcessor->filter($data);
             $model = $this->_objectManager->create('Magento\Cms\Model\Page');
@@ -58,8 +71,7 @@ public function execute()
             );
 
             if (!$this->dataProcessor->validate($data)) {
-                $this->_redirect('*/*/edit', ['page_id' => $model->getId(), '_current' => true]);
-                return;
+                return $resultRedirect->setPath('*/*/edit', ['page_id' => $model->getId(), '_current' => true]);
             }
 
             try {
@@ -67,11 +79,9 @@ public function execute()
                 $this->messageManager->addSuccess(__('The page has been saved.'));
                 $this->_objectManager->get('Magento\Backend\Model\Session')->setFormData(false);
                 if ($this->getRequest()->getParam('back')) {
-                    $this->_redirect('*/*/edit', ['page_id' => $model->getId(), '_current' => true]);
-                    return;
+                    return $resultRedirect->setPath('*/*/edit', ['page_id' => $model->getId(), '_current' => true]);
                 }
-                $this->_redirect('*/*/');
-                return;
+                return $resultRedirect->setPath('*/*/');
             } catch (\Magento\Framework\Model\Exception $e) {
                 $this->messageManager->addError($e->getMessage());
             } catch (\RuntimeException $e) {
@@ -81,9 +91,8 @@ public function execute()
             }
 
             $this->_getSession()->setFormData($data);
-            $this->_redirect('*/*/edit', ['page_id' => $this->getRequest()->getParam('page_id')]);
-            return;
+            return $resultRedirect->setPath('*/*/edit', ['page_id' => $this->getRequest()->getParam('page_id')]);
         }
-        $this->_redirect('*/*/');
+        return $resultRedirect->setPath('*/*/');
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
index 0212c74189317..49e8206f822fa 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Widget/Chooser.php
@@ -6,21 +6,54 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page\Widget;
 
+use Magento\Backend\App\Action;
+
 class Chooser extends \Magento\Backend\App\Action
 {
+    /**
+     * @var \Magento\Framework\View\LayoutFactory
+     */
+    protected $layoutFactory;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\RawFactory
+     */
+    protected $resultRawFactory;
+
+    /**
+     * @param Action\Context $context
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
+     */
+    public function __construct(
+        Action\Context $context,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        \Magento\Framework\View\LayoutFactory $layoutFactory
+    ) {
+        $this->layoutFactory = $layoutFactory;
+        $this->resultRawFactory = $resultRawFactory;
+        parent::__construct($context);
+    }
+
     /**
      * Chooser Source action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Raw
      */
     public function execute()
     {
         $uniqId = $this->getRequest()->getParam('uniq_id');
-        $pagesGrid = $this->_view->getLayout()->createBlock(
+        /** @var \Magento\Framework\View\Layout $layout */
+        $layout = $this->layoutFactory->create();
+        $pagesGrid = $layout->createBlock(
             'Magento\Cms\Block\Adminhtml\Page\Widget\Chooser',
             '',
             ['data' => ['id' => $uniqId]]
         );
-        $this->getResponse()->setBody($pagesGrid->toHtml());
+        $html = $pagesGrid->toHtml();
+        /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+        $resultRaw = $this->resultRawFactory->create();
+
+        return $resultRaw->setContents($html);
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
index 712131099be7f..1ce5c5e49b3b6 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
@@ -15,24 +15,32 @@ class Directive extends \Magento\Backend\App\Action
      */
     protected $urlDecoder;
 
+    /**
+     * @var \Magento\Framework\Controller\Result\RawFactory
+     */
+    protected $resultRawFactory;
+
     /**
      * @param Action\Context $context
      * @param \Magento\Framework\Url\DecoderInterface $urlDecoder
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      */
     public function __construct(
         Action\Context $context,
-        \Magento\Framework\Url\DecoderInterface $urlDecoder
+        \Magento\Framework\Url\DecoderInterface $urlDecoder,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
     ) {
         parent::__construct($context);
         $this->urlDecoder = $urlDecoder;
+        $this->resultRaw = $resultRawFactory;
     }
 
     /**
      * Template directives callback
      *
-     * @todo: move this to some model
+     * todo: move this to some model
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Raw
      */
     public function execute()
     {
@@ -41,15 +49,19 @@ public function execute()
         $imagePath = $this->_objectManager->create('Magento\Cms\Model\Template\Filter')->filter($directive);
         /** @var \Magento\Framework\Image\Adapter\AdapterInterface $image */
         $image = $this->_objectManager->get('Magento\Framework\Image\AdapterFactory')->create();
-        $response = $this->getResponse();
+        /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+        $resultRaw = $this->resultRawFactory->create();
         try {
             $image->open($imagePath);
-            $response->setHeader('Content-Type', $image->getMimeType())->setBody($image->getImage());
+            $resultRaw->setHeader('Content-Type', $image->getMimeType());
+            $resultRaw->setContents($image->getImage());
         } catch (\Exception $e) {
             $imagePath = $this->_objectManager->get('Magento\Cms\Model\Wysiwyg\Config')->getSkinImagePlaceholderPath();
             $image->open($imagePath);
-            $response->setHeader('Content-Type', $image->getMimeType())->setBody($image->getImage());
+            $resultRaw->setHeader('Content-Type', $image->getMimeType());
+            $resultRaw->setContents($image->getImage());
             $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
         }
+        return $resultRaw;
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
index 47c80bb413a22..814b6425c46e9 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
@@ -6,8 +6,30 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Wysiwyg\Images;
 
+use Magento\Backend\App\Action;
+
 class Thumbnail extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
+    /**
+     * @var \Magento\Framework\View\Result\LayoutFactory
+     */
+    protected $resultLayoutFactory;
+
+    /**
+     * @param Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\View\Result\LayoutFactory
+     */
+    public function __construct(
+        Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+    ) {
+        $this->resultLayoutFactory = $resultLayoutFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
+
     /**
      * Generate image thumbnail on the fly
      *
@@ -18,11 +40,12 @@ public function execute()
         $file = $this->getRequest()->getParam('file');
         $file = $this->_objectManager->get('Magento\Cms\Helper\Wysiwyg\Images')->idDecode($file);
         $thumb = $this->getStorage()->resizeOnTheFly($file);
+        $resultLayout = $this->resultLayoutFactory->create();
         if ($thumb !== false) {
             /** @var \Magento\Framework\Image\Adapter\AdapterInterface $image */
             $image = $this->_objectManager->get('Magento\Framework\Image\AdapterFactory')->create();
             $image->open($thumb);
-            $this->getResponse()->setHeader('Content-Type', $image->getMimeType())->setBody($image->getImage());
+            $resultLayout->setHeader('Content-Type', $image->getMimeType())->setBody($image->getImage());
         } else {
             // todo: generate some placeholder
         }
diff --git a/app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php b/app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php
index 2d8f48d54643a..5ca800f626c90 100644
--- a/app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php
+++ b/app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php
@@ -8,15 +8,31 @@
 
 class DefaultNoCookies extends \Magento\Framework\App\Action\Action
 {
+    /**
+     * @var \Magento\Framework\View\Result\LayoutFactory
+     */
+    protected $resultLayoutFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+    ) {
+        $this->resultLayoutFactory = $resultLayoutFactory;
+        parent::__construct($context);
+    }
+
     /**
      * Default no cookies page action
      * Used if no cookies page don't configure or available
      *
-     * @return void
+     * @return \Magento\Framework\View\Result\LayoutFactory
      */
     public function execute()
     {
-        $this->_view->loadLayout();
-        $this->_view->renderLayout();
+        $resultLayout = $this->resultLayoutFactory->create();
+        return $resultLayout;
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
index cd80052706154..e78aa54248da1 100644
--- a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
+++ b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
@@ -11,15 +11,30 @@
 class DefaultNoRoute extends \Magento\Framework\App\Action\Action
 {
     /**
-     *
-     * @return void
+     * @var \Magento\Framework\View\Result\LayoutFactory
+     */
+    protected $resultLayoutFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\View\Result\LayoutFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+    ) {
+        $this->resultLayoutFactory = $resultLayoutFactory;
+        parent::__construct($context);
+    }
+
+    /**
+     * @return \Magento\Framework\View\Result\LayoutFactory
      */
     public function execute()
     {
-        $this->getResponse()->setHeader('HTTP/1.1', '404 Not Found');
-        $this->getResponse()->setHeader('Status', '404 File not found');
-
-        $this->_view->loadLayout();
-        $this->_view->renderLayout();
+        $resultLayout = $this->resultLayoutFactory->create();
+        $resultLayout->setHeader('HTTP/1.1', '404 Not Found');
+        $resultLayout->setHeader('Status', '404 File not found');
+        return $resultLayout;
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php
index a1f99a751d906..24b9d24d87449 100644
--- a/app/code/Magento/Cms/Controller/Index/Index.php
+++ b/app/code/Magento/Cms/Controller/Index/Index.php
@@ -8,14 +8,33 @@
 
 class Index extends \Magento\Framework\App\Action\Action
 {
+    /**
+     * @var \Magento\Framework\Controller\Result\Forward
+     */
+    protected $resultForwardFactory;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Framework\Controller\Result\Forward $resultForwardFactory
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Framework\Controller\Result\Forward $resultForwardFactory
+    ) {
+        $this->resultForwardFactory = $resultForwardFactory;
+        parent::__construct($context);
+    }
+
     /**
      * Renders CMS Home page
      *
      * @param string|null $coreRoute
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Forward
      */
     public function execute($coreRoute = null)
     {
+        /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
+        $resultForward = $this->resultForwardFactory->create();
         $pageId = $this->_objectManager->get(
             'Magento\Framework\App\Config\ScopeConfigInterface'
         )->getValue(
@@ -23,7 +42,8 @@ public function execute($coreRoute = null)
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if (!$this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId)) {
-            $this->_forward('defaultIndex');
+            $resultForward->forward('defaultIndex');
         }
+        return $resultForward;
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Index/NoCookies.php b/app/code/Magento/Cms/Controller/Index/NoCookies.php
index e7908198d9abd..24571aea4be8f 100644
--- a/app/code/Magento/Cms/Controller/Index/NoCookies.php
+++ b/app/code/Magento/Cms/Controller/Index/NoCookies.php
@@ -8,6 +8,23 @@
 
 class NoCookies extends \Magento\Framework\App\Action\Action
 {
+    /**
+     * @var \Magento\Backend\Model\View\Result\ForwardFactory
+     */
+    protected $resultForwardFactory;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+    ) {
+        $this->resultForwardFactory = $resultForwardFactory;
+        parent::__construct($context);
+    }
+
     /**
      * Render Disable cookies page
      *
@@ -15,6 +32,7 @@ class NoCookies extends \Magento\Framework\App\Action\Action
      */
     public function execute()
     {
+        $resultForward = $this->resultForwardFactory->create();
         $pageId = $this->_objectManager->get(
             'Magento\Framework\App\Config\ScopeConfigInterface',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -23,7 +41,7 @@ public function execute()
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if (!$this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId)) {
-            $this->_forward('defaultNoCookies');
+            $resultForward->forward('defaultNoCookies');
         }
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php
index 33107680774ef..d7e3c18e04f68 100644
--- a/app/code/Magento/Cms/Controller/Noroute/Index.php
+++ b/app/code/Magento/Cms/Controller/Noroute/Index.php
@@ -8,6 +8,31 @@
 
 class Index extends \Magento\Framework\App\Action\Action
 {
+    /**
+     * @var \Magento\Framework\View\Result\LayoutFactory
+     */
+    protected $resultLayoutFactory;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\ForwardFactory
+     */
+    protected $resultForwardFactory;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
+        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+    ) {
+        $this->resultLayoutFactory = $resultLayoutFactory;
+        $this->resultForwardFactory = $resultForwardFactory;
+        parent::__construct($context);
+    }
+
     /**
      * Render CMS 404 Not found page
      *
@@ -15,8 +40,11 @@ class Index extends \Magento\Framework\App\Action\Action
      */
     public function execute()
     {
-        $this->getResponse()->setHeader('HTTP/1.1', '404 Not Found');
-        $this->getResponse()->setHeader('Status', '404 File not found');
+        $resultLayout = $this->resultLayoutFactory->create();
+        $resultLayout->setHeader('HTTP/1.1', '404 Not Found');
+        $resultLayout->setHeader('Status', '404 File not found');
+
+        $resultForward = $this->resultForwardFactory->create();
 
         $pageId = $this->_objectManager->get(
             'Magento\Framework\App\Config\ScopeConfigInterface',
@@ -28,7 +56,7 @@ public function execute()
         /** @var \Magento\Cms\Helper\Page $pageHelper */
         $pageHelper = $this->_objectManager->get('Magento\Cms\Helper\Page');
         if (!$pageHelper->renderPage($this, $pageId)) {
-            $this->_forward('defaultNoRoute', 'index');
+            $resultForward->forward('defaultNoRoute', 'index');
         }
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Page/View.php b/app/code/Magento/Cms/Controller/Page/View.php
index 9be7e22f321d7..6bf2d0293af29 100644
--- a/app/code/Magento/Cms/Controller/Page/View.php
+++ b/app/code/Magento/Cms/Controller/Page/View.php
@@ -8,16 +8,34 @@
 
 class View extends \Magento\Framework\App\Action\Action
 {
+    /**
+     * @var \Magento\Backend\Model\View\Result\ForwardFactory
+     */
+    protected $resultForwardFactory;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
+    ) {
+        $this->resultForwardFactory = $resultForwardFactory;
+        parent::__construct($context);
+    }
+
     /**
      * View CMS page action
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\ForwardFactory
      */
     public function execute()
     {
+        $resultForward = $this->resultForwardFactory->create();
         $pageId = $this->getRequest()->getParam('page_id', $this->getRequest()->getParam('id', false));
         if (!$this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId)) {
-            $this->_forward('noroute');
+            return $resultForward->forward('noroute');
         }
     }
 }

From 0dcaaebc41d1343c9d17d044e2876b9ae176c9cb Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Mon, 26 Jan 2015 19:07:28 +0200
Subject: [PATCH 07/94] MAGETWO-31524: Refactor controller actions in the CMS
 module

---
 .../Adminhtml/Wysiwyg/Images/Contents.php     | 41 +++++++++++++++---
 .../Adminhtml/Wysiwyg/Images/DeleteFiles.php  | 38 +++++++++++++++--
 .../Adminhtml/Wysiwyg/Images/DeleteFolder.php | 36 ++++++++++++++--
 .../Adminhtml/Wysiwyg/Images/Index.php        | 29 +++++++++++--
 .../Adminhtml/Wysiwyg/Images/NewFolder.php    | 27 ++++++++++--
 .../Adminhtml/Wysiwyg/Images/OnInsert.php     | 26 +++++++++++-
 .../Adminhtml/Wysiwyg/Images/TreeJson.php     | 42 ++++++++++++++++---
 7 files changed, 209 insertions(+), 30 deletions(-)
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php
old mode 100644
new mode 100755
index 4a3c4daf35fe5..5306fdb26fd41
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Contents.php
@@ -8,6 +8,33 @@
 
 class Contents extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
+    /**
+     * @var \Magento\Framework\View\Result\LayoutFactory
+     */
+    protected $resultLayoutFactory;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\JSONFactory
+     */
+    protected $resultJsonFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
+        \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+    ) {
+        $this->resultLayoutFactory = $resultLayoutFactory;
+        $this->resultJsonFactory = $resultJsonFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
     /**
      * Save current path in session
      *
@@ -24,19 +51,21 @@ protected function _saveSessionCurrentPath()
     /**
      * Contents action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         try {
             $this->_initAction()->_saveSessionCurrentPath();
-            $this->_view->loadLayout('empty');
-            $this->_view->renderLayout();
+            /** @var \Magento\Framework\View\Result\Layout $resultLayout */
+            $resultLayout = $this->resultLayoutFactory->create();
+            return $resultLayout;
         } catch (\Exception $e) {
             $result = ['error' => true, 'message' => $e->getMessage()];
-            $this->getResponse()->representJson(
-                $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
-            );
+            /** @var \Magento\Framework\Controller\Result\JSON $resultJson */
+            $resultJson = $this->resultJsonFactory->create();
+            $resultJson->setData($result);
+            return $resultJson;
         }
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
old mode 100644
new mode 100755
index de1d96c36e98c..e91b82fbd7600
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
@@ -10,10 +10,39 @@
 
 class DeleteFiles extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
+
+    /**
+     * @var \Magento\Framework\Controller\Result\JSONFactory
+     */
+    protected $resultJsonFactory;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\RawFactory
+     */
+    protected $resultRawFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+    ) {
+        $this->resultRawFactory = $resultRawFactory;
+        $this->resultJsonFactory = $resultJsonFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
+
     /**
      * Delete file from media storage
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
@@ -36,11 +65,12 @@ public function execute()
                     $this->getStorage()->deleteFile($filePath);
                 }
             }
+            return $this->resultRawFactory->create();
         } catch (\Exception $e) {
             $result = ['error' => true, 'message' => $e->getMessage()];
-            $this->getResponse()->representJson(
-                $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
-            );
+            /** @var \Magento\Framework\Controller\Result\JSON $resultJson */
+            $resultJson = $this->resultJsonFactory->create();
+            return $resultJson->setData($result);
         }
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
old mode 100644
new mode 100755
index f292568f1d204..a9fde1794b9da
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFolder.php
@@ -8,21 +8,49 @@
 
 class DeleteFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
+    /**
+     * @var \Magento\Framework\Controller\Result\JSONFactory
+     */
+    protected $resultJsonFactory;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\RawFactory
+     */
+    protected $resultRawFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+    ) {
+        $this->resultRawFactory = $resultRawFactory;
+        $this->resultJsonFactory = $resultJsonFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
     /**
      * Delete folder action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         try {
             $path = $this->getStorage()->getCmsWysiwygImages()->getCurrentPath();
             $this->getStorage()->deleteDirectory($path);
+            return $this->resultRawFactory->create();
         } catch (\Exception $e) {
             $result = ['error' => true, 'message' => $e->getMessage()];
-            $this->getResponse()->representJson(
-                $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
-            );
+            /** @var \Magento\Framework\Controller\Result\JSON $resultJson */
+            $resultJson = $this->resultJsonFactory->create();
+            return $resultJson->setData($result);
         }
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
old mode 100644
new mode 100755
index ec69d0799c925..3c22b5fbcb017
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Index.php
@@ -8,10 +8,29 @@
 
 class Index extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
+    /**
+     * @var \Magento\Framework\View\Result\LayoutFactory
+     */
+    protected $resultLayoutFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+    ) {
+        $this->resultLayoutFactory = $resultLayoutFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
     /**
      * Index action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
@@ -23,11 +42,13 @@ public function execute()
             $this->messageManager->addError($e->getMessage());
         }
         $this->_initAction();
-        $this->_view->loadLayout('overlay_popup');
-        $block = $this->_view->getLayout()->getBlock('wysiwyg_images.js');
+        /** @var \Magento\Framework\View\Result\Layout $resultLayout */
+        $resultLayout = $this->resultLayoutFactory->create();
+        $resultLayout->addHandle('overlay_popup');
+        $block = $resultLayout->getLayout()->getBlock('wysiwyg_images.js');
         if ($block) {
             $block->setStoreId($storeId);
         }
-        $this->_view->renderLayout();
+        return $resultLayout;
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
old mode 100644
new mode 100755
index a8aa18318bda3..c270e3463f918
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/NewFolder.php
@@ -8,10 +8,29 @@
 
 class NewFolder extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
+    /**
+     * @var \Magento\Framework\Controller\Result\JSONFactory
+     */
+    protected $resultJsonFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+    ) {
+        $this->resultJsonFactory = $resultJsonFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
     /**
      * New folder action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
@@ -23,8 +42,8 @@ public function execute()
         } catch (\Exception $e) {
             $result = ['error' => true, 'message' => $e->getMessage()];
         }
-        $this->getResponse()->representJson(
-            $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
-        );
+        /** @var \Magento\Framework\Controller\Result\JSON $resultJson */
+        $resultJson = $this->resultJsonFactory->create();
+        return $resultJson->setData($result);
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
old mode 100644
new mode 100755
index 923ecd79b2bf2..738cba1295e40
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/OnInsert.php
@@ -8,10 +8,29 @@
 
 class OnInsert extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
+    /**
+     * @var \Magento\Framework\Controller\Result\RawFactory
+     */
+    protected $resultRawFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+    ) {
+        $this->resultRawFactory = $resultRawFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
     /**
      * Fire when select image
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
@@ -26,6 +45,9 @@ public function execute()
         $helper->setStoreId($storeId);
 
         $image = $helper->getImageHtmlDeclaration($filename, $asIs);
-        $this->getResponse()->setBody($image);
+
+        /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+        $resultRaw = $this->resultRawFactory->create();
+        return $resultRaw->setContents($image);
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php
old mode 100644
new mode 100755
index 03091d8547ce2..00950a5390e6b
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/TreeJson.php
@@ -8,25 +8,55 @@
 
 class TreeJson extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
+    /**
+     * @var \Magento\Framework\Controller\Result\JSONFactory
+     */
+    protected $resultJsonFactory;
+
+    /**
+     * @var \Magento\Framework\View\LayoutFactory
+     */
+    protected $layoutFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+     * @param \Magento\Framework\View\LayoutFactory $layoutFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory,
+        \Magento\Framework\View\LayoutFactory $layoutFactory
+    ) {
+        $this->layoutFactory = $layoutFactory;
+        $this->resultJsonFactory = $resultJsonFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
     /**
      * Tree json action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
+        /** @var \Magento\Framework\Controller\Result\JSON $resultJson */
+        $resultJson = $this->resultJsonFactory->create();
         try {
             $this->_initAction();
-            $this->getResponse()->representJson(
-                $this->_view->getLayout()->createBlock(
+            /** @var \Magento\Framework\View\Layout $layout */
+            $layout = $this->layoutFactory->create();
+            $resultJson->setJsonData(
+                $layout->createBlock(
                     'Magento\Cms\Block\Adminhtml\Wysiwyg\Images\Tree'
                 )->getTreeJson()
             );
         } catch (\Exception $e) {
             $result = ['error' => true, 'message' => $e->getMessage()];
-            $this->getResponse()->representJson(
-                $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
-            );
+            $resultJson->setData($result);
         }
+        return $resultJson;
     }
 }

From 02a87a58311caf6867b8d1416205c4bbd7cf2362 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Mon, 26 Jan 2015 19:27:34 +0200
Subject: [PATCH 08/94] MAGETWO-33063: Replace usage of __() to Phrase object
 in library

---
 .../App/Response/Http/FileFactory.php         |  2 +-
 .../Magento/Framework/DB/AbstractMapper.php   |  4 ++-
 .../Framework/DB/Adapter/Pdo/Mysql.php        |  9 +++++--
 .../Magento/Framework/DB/Ddl/Trigger.php      | 26 ++++++++++++-------
 .../Framework/Data/AbstractCriteria.php       |  9 +++++--
 .../Data/Argument/Interpreter/String.php      |  2 +-
 .../Framework/Data/Form/Element/Editor.php    |  2 +-
 .../Framework/Data/Form/Element/Image.php     |  2 +-
 .../Framework/Encryption/Encryptor.php        |  4 +--
 .../Exception/AbstractAggregateException.php  |  2 +-
 .../Framework/Exception/ErrorMessage.php      |  2 +-
 .../Exception/LocalizedException.php          |  2 +-
 .../Framework/Filesystem/Driver/Http.php      |  4 +--
 lib/internal/Magento/Framework/Flag.php       |  6 +++--
 .../Magento/Framework/Model/AbstractModel.php | 10 ++++---
 .../Model/Resource/Db/AbstractDb.php          |  8 +++---
 .../Framework/Model/Resource/Iterator.php     |  6 +++--
 .../Magento/Framework/Url/Validator.php       |  2 +-
 .../Framework/Validator/Entity/Properties.php |  4 ++-
 .../Magento/Framework/View/BlockPool.php      |  4 ++-
 .../Magento/Framework/View/DataSourcePool.php |  4 ++-
 .../View/Design/Theme/Image/Uploader.php      |  8 +++---
 .../Framework/View/Design/Theme/Label.php     |  2 +-
 .../Framework/View/Design/Theme/Validator.php |  6 ++---
 .../Framework/View/Element/Html/Date.php      |  2 +-
 .../View/Element/Html/Link/Current.php        | 10 ++++---
 .../Framework/View/Element/Redirect.php       |  9 +++++--
 .../Framework/View/Layout/Generator/Block.php |  4 ++-
 .../Framework/View/Layout/PageType/Config.php |  2 +-
 .../Framework/View/PageLayout/Config.php      |  5 +++-
 30 files changed, 106 insertions(+), 56 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
index 4ceab8ac5a1a9..c6877347b4234 100644
--- a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
+++ b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
@@ -101,7 +101,7 @@ public function create(
         if (!is_null($content)) {
             if ($isFile) {
                 if (!$dir->isFile($file)) {
-                    throw new \Exception(__('File not found'));
+                    throw new \Exception((string)new \Magento\Framework\Phrase('File not found'));
                 }
                 $this->_response->sendHeaders();
                 $stream = $dir->openFile($file, 'r');
diff --git a/lib/internal/Magento/Framework/DB/AbstractMapper.php b/lib/internal/Magento/Framework/DB/AbstractMapper.php
index 7a1206c095b87..77c514541ce4c 100644
--- a/lib/internal/Magento/Framework/DB/AbstractMapper.php
+++ b/lib/internal/Magento/Framework/DB/AbstractMapper.php
@@ -290,7 +290,9 @@ protected function setConnection($conn)
     {
         if (!$conn instanceof \Magento\Framework\DB\Adapter\AdapterInterface) {
             throw new \InvalidArgumentException(
-                __('dbModel read resource does not implement \Magento\Framework\DB\Adapter\AdapterInterface')
+                (string)new \Magento\Framework\Phrase(
+                    'dbModel read resource does not implement \Magento\Framework\DB\Adapter\AdapterInterface'
+                )
             );
         }
         $this->conn = $conn;
diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 83467bf6bcc31..440a0dda5181b 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -3720,7 +3720,12 @@ public function decodeVarbinary($value)
     public function createTrigger(\Magento\Framework\DB\Ddl\Trigger $trigger)
     {
         if (!$trigger->getStatements()) {
-            throw new \Zend_Db_Exception(sprintf(__('Trigger %s has not statements available'), $trigger->getName()));
+            throw new \Zend_Db_Exception(
+                sprintf(
+                    (string)new \Magento\Framework\Phrase('Trigger %s has not statements available'),
+                    $trigger->getName()
+                )
+            );
         }
 
         $statements = implode("\n", $trigger->getStatements());
@@ -3748,7 +3753,7 @@ public function createTrigger(\Magento\Framework\DB\Ddl\Trigger $trigger)
     public function dropTrigger($triggerName, $schemaName = null)
     {
         if (empty($triggerName)) {
-            throw new \InvalidArgumentException(__('Trigger name is not defined'));
+            throw new \InvalidArgumentException((string)new \Magento\Framework\Phrase('Trigger name is not defined'));
         }
 
         $triggerName = ($schemaName ? $schemaName . '.' : '') . $triggerName;
diff --git a/lib/internal/Magento/Framework/DB/Ddl/Trigger.php b/lib/internal/Magento/Framework/DB/Ddl/Trigger.php
index 872a57c0a3b4a..4c5b13b2529ac 100644
--- a/lib/internal/Magento/Framework/DB/Ddl/Trigger.php
+++ b/lib/internal/Magento/Framework/DB/Ddl/Trigger.php
@@ -86,7 +86,9 @@ class Trigger
     public function setName($name)
     {
         if (!is_string($name)) {
-            throw new \InvalidArgumentException(__('Trigger name should be a string'));
+            throw new \InvalidArgumentException(
+                (string)new \Magento\Framework\Phrase('Trigger name should be a string')
+            );
         }
 
         $this->name = strtolower($name);
@@ -102,7 +104,7 @@ public function setName($name)
     public function getName()
     {
         if (empty($this->name)) {
-            throw new \Zend_Db_Exception(__('Trigger name is not defined'));
+            throw new \Zend_Db_Exception((string)new \Magento\Framework\Phrase('Trigger name is not defined'));
         }
         return $this->name;
     }
@@ -119,7 +121,7 @@ public function setTime($time)
         if (in_array($time, self::$listOfTimes)) {
             $this->time = strtoupper($time);
         } else {
-            throw new \InvalidArgumentException(__('Trigger unsupported time type'));
+            throw new \InvalidArgumentException((string)new \Magento\Framework\Phrase('Trigger unsupported time type'));
         }
         return $this;
     }
@@ -133,7 +135,7 @@ public function setTime($time)
     public function getTime()
     {
         if (is_null($this->time)) {
-            throw new \Zend_Db_Exception(__('Trigger time is not defined'));
+            throw new \Zend_Db_Exception((string)new \Magento\Framework\Phrase('Trigger time is not defined'));
         }
         return $this->time;
     }
@@ -150,7 +152,9 @@ public function setEvent($event)
         if (in_array($event, self::$listOfEvents)) {
             $this->event = strtoupper($event);
         } else {
-            throw new \InvalidArgumentException(__('Trigger unsupported event type'));
+            throw new \InvalidArgumentException(
+                (string)new \Magento\Framework\Phrase('Trigger unsupported event type')
+            );
         }
         return $this;
     }
@@ -164,7 +168,7 @@ public function setEvent($event)
     public function getEvent()
     {
         if (is_null($this->event)) {
-            throw new \Zend_Db_Exception(__('Trigger event is not defined'));
+            throw new \Zend_Db_Exception((string)new \Magento\Framework\Phrase('Trigger event is not defined'));
         }
         return $this->event;
     }
@@ -179,7 +183,9 @@ public function getEvent()
     public function setTable($name)
     {
         if (!is_string($name)) {
-            throw new \InvalidArgumentException(__('Trigger table name should be a string'));
+            throw new \InvalidArgumentException(
+                (string)new \Magento\Framework\Phrase('Trigger table name should be a string')
+            );
         }
         $this->tableName = strtolower($name);
         return $this;
@@ -194,7 +200,7 @@ public function setTable($name)
     public function getTable()
     {
         if (empty($this->tableName)) {
-            throw new \Zend_Db_Exception(__('Trigger table name is not defined'));
+            throw new \Zend_Db_Exception((string)new \Magento\Framework\Phrase('Trigger table name is not defined'));
         }
         return $this->tableName;
     }
@@ -209,7 +215,9 @@ public function getTable()
     public function addStatement($statement)
     {
         if (!is_string($statement)) {
-            throw new \InvalidArgumentException(__('Trigger statement should be a string'));
+            throw new \InvalidArgumentException(
+                (string)new \Magento\Framework\Phrase('Trigger statement should be a string')
+            );
         }
 
         $statement = trim($statement);
diff --git a/lib/internal/Magento/Framework/Data/AbstractCriteria.php b/lib/internal/Magento/Framework/Data/AbstractCriteria.php
index 32d1a7919ef2c..40738c95da066 100644
--- a/lib/internal/Magento/Framework/Data/AbstractCriteria.php
+++ b/lib/internal/Magento/Framework/Data/AbstractCriteria.php
@@ -36,7 +36,10 @@ abstract class AbstractCriteria implements \Magento\Framework\Api\CriteriaInterf
     public function getMapperInterfaceName()
     {
         if (!$this->mapperInterfaceName) {
-            throw new \Exception(__("Missed Mapper Interface for Criteria Interface: ") . get_class($this));
+            throw new \Exception(
+                (string)new \Magento\Framework\Phrase("Missed Mapper Interface for Criteria Interface: ")
+                . get_class($this)
+            );
         }
         return $this->mapperInterfaceName;
     }
@@ -111,7 +114,9 @@ public function addField($field, $alias = null)
     public function addFilter($name, $field, $condition = null, $type = 'and')
     {
         if (isset($this->data[self::PART_FILTERS]['list'][$name])) {
-            throw new \Exception(__("Filter already exists in Criteria object: ") . $name);
+            throw new \Exception(
+                (string)new \Magento\Framework\Phrase("Filter already exists in Criteria object: ") . $name
+            );
         }
         $filter = new Object();
         // implements ArrayAccess
diff --git a/lib/internal/Magento/Framework/Data/Argument/Interpreter/String.php b/lib/internal/Magento/Framework/Data/Argument/Interpreter/String.php
index d7cc59f4edc0b..e2d1b574e8610 100644
--- a/lib/internal/Magento/Framework/Data/Argument/Interpreter/String.php
+++ b/lib/internal/Magento/Framework/Data/Argument/Interpreter/String.php
@@ -40,7 +40,7 @@ public function evaluate(array $data)
             }
             $needTranslation = isset($data['translate']) ? $this->booleanUtils->toBoolean($data['translate']) : false;
             if ($needTranslation) {
-                $result = __($result);
+                $result = (string)new \Magento\Framework\Phrase($result);
             }
         } else {
             $result = '';
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index c8e58d064926d..97ae44872f6ca 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -404,7 +404,7 @@ public function getConfig($key = null)
      */
     public function translate($string)
     {
-        return __($string);
+        return (string)new \Magento\Framework\Phrase($string);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Image.php b/lib/internal/Magento/Framework/Data/Form/Element/Image.php
index c4d143c05db84..d62ec637baa1b 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Image.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Image.php
@@ -93,7 +93,7 @@ protected function _getDeleteCheckbox()
     {
         $html = '';
         if ($this->getValue()) {
-            $label = __('Delete Image');
+            $label = (string)new \Magento\Framework\Phrase('Delete Image');
             $html .= '<span class="delete-image">';
             $html .= '<input type="checkbox"' .
                 ' name="' .
diff --git a/lib/internal/Magento/Framework/Encryption/Encryptor.php b/lib/internal/Magento/Framework/Encryption/Encryptor.php
index ecc4062c2bbb1..98d20f1c4f027 100644
--- a/lib/internal/Magento/Framework/Encryption/Encryptor.php
+++ b/lib/internal/Magento/Framework/Encryption/Encryptor.php
@@ -95,7 +95,7 @@ public function validateCipher($version)
 
         $version = (int)$version;
         if (!in_array($version, $types, true)) {
-            throw new \Exception(__('Not supported cipher version'));
+            throw new \Exception((string)new \Magento\Framework\Phrase('Not supported cipher version'));
         }
         return $version;
     }
@@ -263,7 +263,7 @@ public function decrypt($data)
     public function validateKey($key)
     {
         if (preg_match('/\s/s', $key)) {
-            throw new \Exception(__('The encryption key format is invalid.'));
+            throw new \Exception((string)new \Magento\Framework\Phrase('The encryption key format is invalid.'));
         }
         return $this->getCrypt($key);
     }
diff --git a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
index 18079823dce97..c63e32c6dd390 100644
--- a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
+++ b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
@@ -74,7 +74,7 @@ public function addError($rawMessage, array $params = [])
                 // First call: simply overwrite the message and params
                 $this->rawMessage = $rawMessage;
                 $this->params = $params;
-                $this->message = __($rawMessage, $params);
+                $this->message = (string)new \Magento\Framework\Phrase($rawMessage, $params);
             } elseif (2 === $this->addErrorCalls) {
                 // Second call: store the error from the first call and the second call in the array
                 // restore the message and params to their original value
diff --git a/lib/internal/Magento/Framework/Exception/ErrorMessage.php b/lib/internal/Magento/Framework/Exception/ErrorMessage.php
index 30308495f6a4d..317db4836bf0a 100644
--- a/lib/internal/Magento/Framework/Exception/ErrorMessage.php
+++ b/lib/internal/Magento/Framework/Exception/ErrorMessage.php
@@ -60,7 +60,7 @@ public function getParameters()
      */
     public function getMessage()
     {
-        return __($this->message, $this->params);
+        return (string)new \Magento\Framework\Phrase($this->message, $this->params);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Exception/LocalizedException.php b/lib/internal/Magento/Framework/Exception/LocalizedException.php
index c868ed9ea470a..3ecc300c5c70a 100644
--- a/lib/internal/Magento/Framework/Exception/LocalizedException.php
+++ b/lib/internal/Magento/Framework/Exception/LocalizedException.php
@@ -31,7 +31,7 @@ public function __construct($message, array $params = [], \Exception $cause = nu
         $this->rawMessage = $message;
         $this->renderer = new Placeholder();
 
-        parent::__construct(__($message, $params), 0, $cause);
+        parent::__construct((string)new \Magento\Framework\Phrase($message, $params), 0, $cause);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
index 09586e4576124..290c7720b3eae 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
@@ -131,7 +131,7 @@ public function fileOpen($path, $mode)
         $urlProp = $this->parseUrl($this->getScheme() . $path);
 
         if (false === $urlProp) {
-            throw new FilesystemException(__('Please correct the download URL.'));
+            throw new FilesystemException((string)new \Magento\Framework\Phrase('Please correct the download URL.'));
         }
 
         $hostname = $urlProp['host'];
@@ -236,7 +236,7 @@ protected function open($hostname, $port)
         $result = @fsockopen($hostname, $port, $errorNumber, $errorMessage);
         if ($result === false) {
             throw new FilesystemException(
-                __('Something went wrong connecting to the host. Error#%1 - %2.', $errorNumber, $errorMessage)
+                (string)new \Magento\Framework\Phrase('Something went wrong connecting to the host. Error#%1 - %2.', $errorNumber, $errorMessage)
             );
         }
         return $result;
diff --git a/lib/internal/Magento/Framework/Flag.php b/lib/internal/Magento/Framework/Flag.php
index a1a1283410060..bcbd36c603bcf 100644
--- a/lib/internal/Magento/Framework/Flag.php
+++ b/lib/internal/Magento/Framework/Flag.php
@@ -49,7 +49,9 @@ protected function _construct()
     public function beforeSave()
     {
         if (is_null($this->_flagCode)) {
-            throw new \Magento\Framework\Model\Exception(__('Please define flag code.'));
+            throw new \Magento\Framework\Model\Exception(
+                (string)new \Magento\Framework\Phrase('Please define flag code.')
+            );
         }
 
         $this->setFlagCode($this->_flagCode);
@@ -94,7 +96,7 @@ public function setFlagData($value)
     public function loadSelf()
     {
         if (is_null($this->_flagCode)) {
-            throw new \Magento\Framework\Model\Exception(__('Please define flag code.'));
+            throw new \Magento\Framework\Model\Exception((string)new \Magento\Framework\Phrase('Please define flag code.'));
         }
 
         return $this->load($this->_flagCode, 'flag_code');
diff --git a/lib/internal/Magento/Framework/Model/AbstractModel.php b/lib/internal/Magento/Framework/Model/AbstractModel.php
index 1701fe5d57f19..d35889b915ce4 100644
--- a/lib/internal/Magento/Framework/Model/AbstractModel.php
+++ b/lib/internal/Magento/Framework/Model/AbstractModel.php
@@ -233,7 +233,7 @@ protected function _setResourceModel($resourceName, $collectionName = null)
     protected function _getResource()
     {
         if (empty($this->_resourceName) && empty($this->_resource)) {
-            throw new \Magento\Framework\Model\Exception(__('Resource is not set.'));
+            throw new \Magento\Framework\Model\Exception((string)new \Magento\Framework\Phrase('Resource is not set.'));
         }
 
         return $this->_resource ?: \Magento\Framework\App\ObjectManager::getInstance()->get($this->_resourceName);
@@ -260,7 +260,9 @@ public function getResourceName()
     public function getResourceCollection()
     {
         if (empty($this->_resourceCollection) && empty($this->_collectionName)) {
-            throw new \Magento\Framework\Model\Exception(__('Model collection resource name is not defined.'));
+            throw new \Magento\Framework\Model\Exception(
+                (string)new \Magento\Framework\Phrase('Model collection resource name is not defined.')
+            );
         }
         return $this->_resourceCollection ? clone $this
             ->_resourceCollection : \Magento\Framework\App\ObjectManager::getInstance()
@@ -582,7 +584,9 @@ public function delete()
     public function beforeDelete()
     {
         if (!$this->_actionValidator->isAllowed($this)) {
-            throw new Exception(__('Delete operation is forbidden for current area'));
+            throw new Exception(
+                (string)new \Magento\Framework\Phrase('Delete operation is forbidden for current area')
+            );
         }
 
         $this->_eventManager->dispatch('model_delete_before', ['object' => $this]);
diff --git a/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php b/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
index e61f60533d5e6..2a0cbe6af9d55 100644
--- a/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
@@ -219,7 +219,7 @@ protected function _setMainTable($mainTable, $idFieldName = null)
     public function getIdFieldName()
     {
         if (empty($this->_idFieldName)) {
-            throw new ModelException(__('Empty identifier field name'));
+            throw new ModelException((string)new \Magento\Framework\Phrase('Empty identifier field name'));
         }
         return $this->_idFieldName;
     }
@@ -234,7 +234,7 @@ public function getIdFieldName()
     public function getMainTable()
     {
         if (empty($this->_mainTable)) {
-            throw new ModelException(__('Empty main table name'));
+            throw new ModelException((string)new \Magento\Framework\Phrase('Empty main table name'));
         }
         return $this->getTable($this->_mainTable);
     }
@@ -635,9 +635,9 @@ protected function _checkUnique(\Magento\Framework\Model\AbstractModel $object)
 
         if (!empty($existent)) {
             if (count($existent) == 1) {
-                $error = __('%1 already exists.', $existent[0]);
+                $error = (string)new \Magento\Framework\Phrase('%1 already exists.', $existent[0]);
             } else {
-                $error = __('%1 already exist.', implode(', ', $existent));
+                $error = (string)new \Magento\Framework\Phrase('%1 already exist.', implode(', ', $existent));
             }
             throw new ModelException($error, ModelException::ERROR_CODE_ENTITY_ALREADY_EXISTS);
         }
diff --git a/lib/internal/Magento/Framework/Model/Resource/Iterator.php b/lib/internal/Magento/Framework/Model/Resource/Iterator.php
index 9e6d0ff4092c6..58a037de443e9 100644
--- a/lib/internal/Magento/Framework/Model/Resource/Iterator.php
+++ b/lib/internal/Magento/Framework/Model/Resource/Iterator.php
@@ -59,11 +59,13 @@ protected function _getStatement($query, $conn = null)
 
         if (is_string($query)) {
             if (!$conn instanceof \Zend_Db_Adapter_Abstract) {
-                throw new \Magento\Framework\Model\Exception(__('Invalid connection'));
+                throw new \Magento\Framework\Model\Exception(
+                    (string)new \Magento\Framework\Phrase('Invalid connection')
+                );
             }
             return $conn->query($query);
         }
 
-        throw new \Magento\Framework\Model\Exception(__('Invalid query'));
+        throw new \Magento\Framework\Model\Exception((string)new \Magento\Framework\Phrase('Invalid query'));
     }
 }
diff --git a/lib/internal/Magento/Framework/Url/Validator.php b/lib/internal/Magento/Framework/Url/Validator.php
index 4c469394159fe..4da759f727f75 100644
--- a/lib/internal/Magento/Framework/Url/Validator.php
+++ b/lib/internal/Magento/Framework/Url/Validator.php
@@ -25,7 +25,7 @@ class Validator extends \Zend_Validate_Abstract
     public function __construct()
     {
         // set translated message template
-        $this->setMessage(__("Invalid URL '%value%'."), self::INVALID_URL);
+        $this->setMessage((string)new \Magento\Framework\Phrase("Invalid URL '%value%'."), self::INVALID_URL);
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Validator/Entity/Properties.php b/lib/internal/Magento/Framework/Validator/Entity/Properties.php
index 44a1dd3fc90e8..6c96fe8bac14a 100644
--- a/lib/internal/Magento/Framework/Validator/Entity/Properties.php
+++ b/lib/internal/Magento/Framework/Validator/Entity/Properties.php
@@ -48,7 +48,9 @@ public function isValid($value)
             }
             foreach ($this->_readOnlyProperties as $property) {
                 if ($this->_hasChanges($value->getData($property), $value->getOrigData($property))) {
-                    $this->_messages[__CLASS__] = [__("Read-only property cannot be changed.")];
+                    $this->_messages[__CLASS__] = [
+                        (string)new \Magento\Framework\Phrase("Read-only property cannot be changed.")
+                    ];
                     break;
                 }
             }
diff --git a/lib/internal/Magento/Framework/View/BlockPool.php b/lib/internal/Magento/Framework/View/BlockPool.php
index e591dca939f06..e1c6b274c9341 100644
--- a/lib/internal/Magento/Framework/View/BlockPool.php
+++ b/lib/internal/Magento/Framework/View/BlockPool.php
@@ -48,7 +48,9 @@ public function __construct(BlockFactory $blockFactory)
     public function add($name, $class, array $arguments = [])
     {
         if (!class_exists($class)) {
-            throw new \InvalidArgumentException(__('Invalid Block class name: ' . $class));
+            throw new \InvalidArgumentException(
+                (string)new \Magento\Framework\Phrase('Invalid Block class name: ' . $class)
+            );
         }
 
         $block = $this->blockFactory->createBlock($class, $arguments);
diff --git a/lib/internal/Magento/Framework/View/DataSourcePool.php b/lib/internal/Magento/Framework/View/DataSourcePool.php
index 6e613c891195b..2ff75cede0513 100644
--- a/lib/internal/Magento/Framework/View/DataSourcePool.php
+++ b/lib/internal/Magento/Framework/View/DataSourcePool.php
@@ -55,7 +55,9 @@ public function add($name, $class)
     {
         if (!isset($this->dataSources[$name])) {
             if (!class_exists($class)) {
-                throw new \InvalidArgumentException(__('Invalid Data Source class name: ' . $class));
+                throw new \InvalidArgumentException(
+                    (string)new \Magento\Framework\Phrase('Invalid Data Source class name: ' . $class)
+                );
             }
 
             $data = $this->blockFactory->createBlock($class);
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Image/Uploader.php b/lib/internal/Magento/Framework/View/Design/Theme/Image/Uploader.php
index 2a2e666e468a7..da5596876a7f1 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Image/Uploader.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Image/Uploader.php
@@ -69,7 +69,9 @@ public function uploadPreviewImage($scope, $destinationPath)
             return false;
         }
         if (!$this->_transferAdapter->isValid($scope)) {
-            throw new \Magento\Framework\Exception(__('Uploaded image is not valid'));
+            throw new \Magento\Framework\Exception(
+                (string)new \Magento\Framework\Phrase('Uploaded image is not valid')
+            );
         }
         $upload = $this->_uploaderFactory->create(['fileId' => $scope]);
         $upload->setAllowCreateFolders(true);
@@ -78,10 +80,10 @@ public function uploadPreviewImage($scope, $destinationPath)
         $upload->setFilesDispersion(false);
 
         if (!$upload->checkAllowedExtension($upload->getFileExtension())) {
-            throw new \Magento\Framework\Exception(__('Invalid image file type.'));
+            throw new \Magento\Framework\Exception((string)new \Magento\Framework\Phrase('Invalid image file type.'));
         }
         if (!$upload->save($destinationPath)) {
-            throw new \Magento\Framework\Exception(__('Image can not be saved.'));
+            throw new \Magento\Framework\Exception((string)new \Magento\Framework\Phrase('Image can not be saved.'));
         }
         return $destinationPath . '/' . $upload->getUploadedFileName();
     }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Label.php b/lib/internal/Magento/Framework/View/Design/Theme/Label.php
index 5d488ffc9dae7..dd9ea1ec76954 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Label.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Label.php
@@ -50,6 +50,6 @@ public function getLabelsCollection($label = false)
      */
     public function getLabelsCollectionForSystemConfiguration()
     {
-        return $this->getLabelsCollection(__('-- No Theme --'));
+        return $this->getLabelsCollection((string)new \Magento\Framework\Phrase('-- No Theme --'));
     }
 }
diff --git a/lib/internal/Magento/Framework/View/Design/Theme/Validator.php b/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
index fc5e10beb7718..14112331a105f 100644
--- a/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
+++ b/lib/internal/Magento/Framework/View/Design/Theme/Validator.php
@@ -48,7 +48,7 @@ protected function _setTitleValidators()
                 'class' => 'Zend_Validate_NotEmpty',
                 'break' => true,
                 'options' => [],
-                'message' => __('Field title can\'t be empty'),
+                'message' => (string)new \Magento\Framework\Phrase('Field title can\'t be empty'),
             ],
         ];
 
@@ -69,7 +69,7 @@ protected function _setTypeValidators()
                 'class' => 'Zend_Validate_NotEmpty',
                 'break' => true,
                 'options' => [],
-                'message' => __('Theme type can\'t be empty'),
+                'message' => (string)new \Magento\Framework\Phrase('Theme type can\'t be empty'),
             ],
             [
                 'name' => 'available',
@@ -82,7 +82,7 @@ protected function _setTypeValidators()
                         \Magento\Framework\View\Design\ThemeInterface::TYPE_STAGING,
                     ],
                 ],
-                'message' => __('Theme type is invalid')
+                'message' => (string)new \Magento\Framework\Phrase('Theme type is invalid')
             ],
         ];
 
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Date.php b/lib/internal/Magento/Framework/View/Element/Html/Date.php
index 9087b8c7fc0e8..ec62f498840fe 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Date.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Date.php
@@ -46,7 +46,7 @@ protected function _toHtml()
             '",' : '') .
             '
                         buttonText: "' .
-            __(
+            (string)new \Magento\Framework\Phrase(
                 'Select Date'
             ) .
             '"
diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
index 990690a26f6f8..726e07681f914 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
@@ -101,12 +101,16 @@ protected function _toHtml()
 
         if ($this->isCurrent()) {
             $html = '<li class="nav item current">';
-            $html .= '<strong>' . $this->escapeHtml(__($this->getLabel())) . '</strong>';
+            $html .= '<strong>'
+                . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getLabel()))
+                . '</strong>';
             $html .= '</li>';
         } else {
             $html = '<li class="nav item' . $highlight . '"><a href="' . $this->escapeHtml($this->getHref()) . '"';
-            $html .= $this->getTitle() ? ' title="' . $this->escapeHtml(__($this->getTitle())) . '"' : '';
-            $html .= '>' . $this->escapeHtml(__($this->getLabel())) . '</a></li>';
+            $html .= $this->getTitle() ?
+                ' title="' . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getTitle())) . '"' :
+                '';
+            $html .= '>' . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getLabel())) . '</a></li>';
         }
 
         return $html;
diff --git a/lib/internal/Magento/Framework/View/Element/Redirect.php b/lib/internal/Magento/Framework/View/Element/Redirect.php
index 7c0a1813e9514..b4a27c759fc28 100644
--- a/lib/internal/Magento/Framework/View/Element/Redirect.php
+++ b/lib/internal/Magento/Framework/View/Element/Redirect.php
@@ -182,14 +182,19 @@ protected function _getDefaultHtml()
         $html = '';
 
         $html .= '<div class="page-title">';
-        $html .= '<h1>' . __('Redirecting...') . '</h1>';
+        $html .= '<h1>' . (string)new \Magento\Framework\Phrase('Redirecting...') . '</h1>';
         $html .= '</div>';
         if ($this->getMessage()) {
             $html .= '<p>' . $this->getMessage() . '</p>';
         }
         $html .= $this->getRedirectOutput();
         if (!$this->isHtmlFormRedirect()) {
-            $html .= '<p>' . __('Click <a href="%1">here</a> if nothing has happened', $this->getTargetURL()) . '</p>';
+            $html .= '<p>'
+                . (string)new \Magento\Framework\Phrase(
+                    'Click <a href="%1">here</a> if nothing has happened',
+                    $this->getTargetURL()
+                )
+                . '</p>';
         }
 
         return $html;
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
index 980c514431620..6d70b9b4ae25c 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
@@ -177,7 +177,9 @@ protected function getBlockInstance($block, array $arguments = [])
             }
         }
         if (!$block instanceof \Magento\Framework\View\Element\AbstractBlock) {
-            throw new \Magento\Framework\Model\Exception(__('Invalid block type: %1', $block));
+            throw new \Magento\Framework\Model\Exception(
+                (string)new \Magento\Framework\Phrase('Invalid block type: %1', $block)
+            );
         }
         return $block;
     }
diff --git a/lib/internal/Magento/Framework/View/Layout/PageType/Config.php b/lib/internal/Magento/Framework/View/Layout/PageType/Config.php
index 31d680f7b7be7..cce01dc8b2707 100644
--- a/lib/internal/Magento/Framework/View/Layout/PageType/Config.php
+++ b/lib/internal/Magento/Framework/View/Layout/PageType/Config.php
@@ -43,7 +43,7 @@ protected function _initPageTypes()
         if ($this->_pageTypes === null) {
             $this->_pageTypes = [];
             foreach ($this->_dataStorage->get(null) as $pageTypeId => $pageTypeConfig) {
-                $pageTypeConfig['label'] = __($pageTypeConfig['label']);
+                $pageTypeConfig['label'] = (string)new \Magento\Framework\Phrase($pageTypeConfig['label']);
                 $this->_pageTypes[$pageTypeId] = new \Magento\Framework\Object($pageTypeConfig);
             }
         }
diff --git a/lib/internal/Magento/Framework/View/PageLayout/Config.php b/lib/internal/Magento/Framework/View/PageLayout/Config.php
index 4386c4286abf9..a6c6d9eb411c1 100644
--- a/lib/internal/Magento/Framework/View/PageLayout/Config.php
+++ b/lib/internal/Magento/Framework/View/PageLayout/Config.php
@@ -64,7 +64,10 @@ public function toOptionArray($withEmpty = false)
         }
 
         if ($withEmpty) {
-            array_unshift($options, ['value' => '', 'label' => __('-- Please Select --')]);
+            array_unshift($options, [
+                'value' => '',
+                'label' => (string)new \Magento\Framework\Phrase('-- Please Select --')
+            ]);
         }
         return $options;
     }

From 8f63a260e1450e1222072727906940a6de24d616 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Mon, 26 Jan 2015 19:43:09 +0200
Subject: [PATCH 09/94] MAGETWO-33063: Replace usage of __() to Phrase object
 in library

---
 lib/internal/Magento/Framework/Filesystem/Driver/Http.php | 5 ++++-
 lib/internal/Magento/Framework/Flag.php                   | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
index 290c7720b3eae..0c760c1daa45b 100644
--- a/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
+++ b/lib/internal/Magento/Framework/Filesystem/Driver/Http.php
@@ -236,7 +236,10 @@ protected function open($hostname, $port)
         $result = @fsockopen($hostname, $port, $errorNumber, $errorMessage);
         if ($result === false) {
             throw new FilesystemException(
-                (string)new \Magento\Framework\Phrase('Something went wrong connecting to the host. Error#%1 - %2.', $errorNumber, $errorMessage)
+                (string)new \Magento\Framework\Phrase(
+                    'Something went wrong connecting to the host. Error#%1 - %2.',
+                    [$errorNumber, $errorMessage]
+                )
             );
         }
         return $result;
diff --git a/lib/internal/Magento/Framework/Flag.php b/lib/internal/Magento/Framework/Flag.php
index bcbd36c603bcf..f6a5d0f0f0f6a 100644
--- a/lib/internal/Magento/Framework/Flag.php
+++ b/lib/internal/Magento/Framework/Flag.php
@@ -96,7 +96,9 @@ public function setFlagData($value)
     public function loadSelf()
     {
         if (is_null($this->_flagCode)) {
-            throw new \Magento\Framework\Model\Exception((string)new \Magento\Framework\Phrase('Please define flag code.'));
+            throw new \Magento\Framework\Model\Exception(
+                (string)new \Magento\Framework\Phrase('Please define flag code.')
+            );
         }
 
         return $this->load($this->_flagCode, 'flag_code');

From a5792afc20b644bdea593d68ad14aa4da520b9c2 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Tue, 27 Jan 2015 10:44:35 +0200
Subject: [PATCH 10/94] MAGETWO-33063: Replace usage of __() to Phrase object
 in library

---
 .../Magento/Framework/View/Layout/Generator/Block.php         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
index 6d70b9b4ae25c..3b044eb613d52 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
@@ -7,6 +7,10 @@
 
 use Magento\Framework\View\Layout;
 
+/**
+ * Class Block
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Block implements Layout\GeneratorInterface
 {
     /**

From aa90e3c622664b3b933b6ddd54616472bbb42cf8 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Tue, 27 Jan 2015 10:49:42 +0200
Subject: [PATCH 11/94] MAGETWO-33063: Replace usage of __() to Phrase object
 in library

---
 .../Exception/InputExceptionTest.php          | 261 ++++++++----------
 1 file changed, 115 insertions(+), 146 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Framework/Exception/InputExceptionTest.php b/dev/tests/unit/testsuite/Magento/Framework/Exception/InputExceptionTest.php
index e2e4b82774183..b5c79b274bada 100644
--- a/dev/tests/unit/testsuite/Magento/Framework/Exception/InputExceptionTest.php
+++ b/dev/tests/unit/testsuite/Magento/Framework/Exception/InputExceptionTest.php
@@ -3,161 +3,130 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-// @codingStandardsIgnoreStart
-namespace {
-    $mockTranslate = false;
-}
+namespace Magento\Framework\Exception;
 
-namespace Magento\Framework\Exception {
-    // @codingStandardsIgnoreEnd
+/**
+ * @covers \Magento\Framework\Exception\InputException
+ */
+class InputExceptionTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * Verify that the constructor creates a single instance of InputException with the proper
+     * message and array of parameters.
+     *
+     * @return void
+     */
+    public function testConstructor()
+    {
+        $params = ['fieldName' => 'quantity', 'value' => -100, 'minValue' => 0];
+        $inputException = new InputException(InputException::INVALID_FIELD_MIN_VALUE, $params);
+
+        $this->assertEquals(InputException::INVALID_FIELD_MIN_VALUE, $inputException->getRawMessage());
+        $this->assertStringMatchesFormat('%s greater than or equal to %s', $inputException->getMessage());
+        $this->assertEquals(
+            'The quantity value of "-100" must be greater than or equal to 0.',
+            $inputException->getLogMessage()
+        );
+    }
 
     /**
-     * @SuppressWarnings(PHPMD.ShortMethodName)
-     * @return string
+     * Verify that adding multiple errors works correctly.
+     *
+     * @return void
      */
-    function __()
+    public function testAddError()
     {
-        global $mockTranslate;
-        $prefix = '';
-        if (isset($mockTranslate) && $mockTranslate === true) {
-            $prefix = 'TRANSLATED: ';
-        }
-        return $prefix . call_user_func_array('\__', func_get_args());
+        $inputException = new InputException();
+
+        $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getRawMessage());
+        $this->assertEquals(
+            InputException::DEFAULT_MESSAGE,
+            $inputException->getMessage()
+        );
+        $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getLogMessage());
+
+        $this->assertFalse($inputException->wasErrorAdded());
+        $this->assertCount(0, $inputException->getErrors());
+
+        $inputException->addError(
+            InputException::INVALID_FIELD_MIN_VALUE,
+            ['fieldName' => 'weight', 'value' => -100, 'minValue' => 1]
+        );
+        $this->assertTrue($inputException->wasErrorAdded());
+        $this->assertCount(0, $inputException->getErrors());
+
+        $this->assertEquals(InputException::INVALID_FIELD_MIN_VALUE, $inputException->getRawMessage());
+        $this->assertEquals(
+            'The weight value of "-100" must be greater than or equal to 1.',
+            $inputException->getMessage()
+        );
+        $this->assertEquals(
+            'The weight value of "-100" must be greater than or equal to 1.',
+            $inputException->getLogMessage()
+        );
+
+        $inputException->addError(InputException::REQUIRED_FIELD, ['fieldName' => 'name']);
+        $this->assertTrue($inputException->wasErrorAdded());
+        $this->assertCount(2, $inputException->getErrors());
+
+        $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getRawMessage());
+        $this->assertEquals(
+            InputException::DEFAULT_MESSAGE,
+            $inputException->getMessage()
+        );
+        $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getLogMessage());
+
+        $errors = $inputException->getErrors();
+        $this->assertCount(2, $errors);
+
+        $this->assertEquals(InputException::INVALID_FIELD_MIN_VALUE, $errors[0]->getRawMessage());
+        $this->assertEquals(
+            'The weight value of "-100" must be greater than or equal to 1.',
+            $errors[0]->getMessage()
+        );
+        $this->assertEquals(
+            'The weight value of "-100" must be greater than or equal to 1.',
+            $errors[0]->getLogMessage()
+        );
+
+        $this->assertEquals(InputException::REQUIRED_FIELD, $errors[1]->getRawMessage());
+        $this->assertEquals('name is a required field.', $errors[1]->getMessage());
+        $this->assertEquals('name is a required field.', $errors[1]->getLogMessage());
     }
 
     /**
-     * Class InputExceptionTest
+     * Verify the message and params are not used to determine the call count
+     *
+     * @return void
      */
-    class InputExceptionTest extends \PHPUnit_Framework_TestCase
+    public function testAddErrorWithSameMessage()
     {
-        const TRANSLATED_PREFIX = 'TRANSLATED: ';
-
-        public function setUp()
-        {
-            global $mockTranslate;
-            $mockTranslate = true;
-        }
-
-        /**
-         * Verify that the constructor creates a single instance of InputException with the proper
-         * message and array of parameters.
-         *
-         * @return void
-         */
-        public function testConstructor()
-        {
-            $params = ['fieldName' => 'quantity', 'value' => -100, 'minValue' => 0];
-            $inputException = new InputException(InputException::INVALID_FIELD_MIN_VALUE, $params);
-
-            $this->assertEquals(InputException::INVALID_FIELD_MIN_VALUE, $inputException->getRawMessage());
-            $this->assertStringMatchesFormat('%s greater than or equal to %s', $inputException->getMessage());
-            $this->assertEquals(
-                'The quantity value of "-100" must be greater than or equal to 0.',
-                $inputException->getLogMessage()
-            );
-        }
-
-        /**
-         * Verify that adding multiple errors works correctly.
-         *
-         * @return void
-         */
-        public function testAddError()
-        {
-            $inputException = new InputException();
-
-            $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getRawMessage());
-            $this->assertEquals(
-                self::TRANSLATED_PREFIX . InputException::DEFAULT_MESSAGE,
-                $inputException->getMessage()
-            );
-            $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getLogMessage());
-
-            $this->assertFalse($inputException->wasErrorAdded());
-            $this->assertCount(0, $inputException->getErrors());
-
-            $inputException->addError(
-                InputException::INVALID_FIELD_MIN_VALUE,
-                ['fieldName' => 'weight', 'value' => -100, 'minValue' => 1]
-            );
-            $this->assertTrue($inputException->wasErrorAdded());
-            $this->assertCount(0, $inputException->getErrors());
-
-            $this->assertEquals(InputException::INVALID_FIELD_MIN_VALUE, $inputException->getRawMessage());
-            $this->assertEquals(
-                self::TRANSLATED_PREFIX .
-                'The weight value of "-100" must be greater than or equal to 1.',
-                $inputException->getMessage()
-            );
-            $this->assertEquals(
-                'The weight value of "-100" must be greater than or equal to 1.',
-                $inputException->getLogMessage()
-            );
-
-            $inputException->addError(InputException::REQUIRED_FIELD, ['fieldName' => 'name']);
-            $this->assertTrue($inputException->wasErrorAdded());
-            $this->assertCount(2, $inputException->getErrors());
-
-            $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getRawMessage());
-            $this->assertEquals(
-                self::TRANSLATED_PREFIX . InputException::DEFAULT_MESSAGE,
-                $inputException->getMessage()
-            );
-            $this->assertEquals(InputException::DEFAULT_MESSAGE, $inputException->getLogMessage());
-
-            $errors = $inputException->getErrors();
-            $this->assertCount(2, $errors);
-
-            $this->assertEquals(InputException::INVALID_FIELD_MIN_VALUE, $errors[0]->getRawMessage());
-            $this->assertEquals(
-                self::TRANSLATED_PREFIX .
-                'The weight value of "-100" must be greater than or equal to 1.',
-                $errors[0]->getMessage()
-            );
-            $this->assertEquals(
-                'The weight value of "-100" must be greater than or equal to 1.',
-                $errors[0]->getLogMessage()
-            );
-
-            $this->assertEquals(InputException::REQUIRED_FIELD, $errors[1]->getRawMessage());
-            $this->assertEquals(self::TRANSLATED_PREFIX . 'name is a required field.', $errors[1]->getMessage());
-            $this->assertEquals('name is a required field.', $errors[1]->getLogMessage());
-        }
-
-        /**
-         * Verify the message and params are not used to determine the call count
-         *
-         * @return void
-         */
-        public function testAddErrorWithSameMessage()
-        {
-            $rawMessage = 'Foo "%var"';
-            $params = ['var' => 'Bar'];
-            $expectedProcessedMessage = 'Foo "Bar"';
-            $inputException = new InputException($rawMessage, $params);
-            $this->assertEquals($rawMessage, $inputException->getRawMessage());
-            $this->assertEquals(self::TRANSLATED_PREFIX . $expectedProcessedMessage, $inputException->getMessage());
-            $this->assertEquals($expectedProcessedMessage, $inputException->getLogMessage());
-            $this->assertFalse($inputException->wasErrorAdded());
-            $this->assertCount(0, $inputException->getErrors());
-
-            $inputException->addError($rawMessage, $params);
-            $this->assertEquals(self::TRANSLATED_PREFIX . $expectedProcessedMessage, $inputException->getMessage());
-            $this->assertEquals($expectedProcessedMessage, $inputException->getLogMessage());
-            $this->assertTrue($inputException->wasErrorAdded());
-            $this->assertCount(0, $inputException->getErrors());
-
-            $inputException->addError($rawMessage, $params);
-            $this->assertEquals(self::TRANSLATED_PREFIX . $expectedProcessedMessage, $inputException->getMessage());
-            $this->assertEquals($expectedProcessedMessage, $inputException->getLogMessage());
-            $this->assertTrue($inputException->wasErrorAdded());
-
-            $errors = $inputException->getErrors();
-            $this->assertCount(2, $errors);
-            $this->assertEquals(self::TRANSLATED_PREFIX . $expectedProcessedMessage, $errors[0]->getMessage());
-            $this->assertEquals($expectedProcessedMessage, $errors[0]->getLogMessage());
-            $this->assertEquals(self::TRANSLATED_PREFIX . $expectedProcessedMessage, $errors[1]->getMessage());
-            $this->assertEquals($expectedProcessedMessage, $errors[1]->getLogMessage());
-        }
+        $rawMessage = 'Foo "%var"';
+        $params = ['var' => 'Bar'];
+        $expectedProcessedMessage = 'Foo "Bar"';
+        $inputException = new InputException($rawMessage, $params);
+        $this->assertEquals($rawMessage, $inputException->getRawMessage());
+        $this->assertEquals($expectedProcessedMessage, $inputException->getMessage());
+        $this->assertEquals($expectedProcessedMessage, $inputException->getLogMessage());
+        $this->assertFalse($inputException->wasErrorAdded());
+        $this->assertCount(0, $inputException->getErrors());
+
+        $inputException->addError($rawMessage, $params);
+        $this->assertEquals($expectedProcessedMessage, $inputException->getMessage());
+        $this->assertEquals($expectedProcessedMessage, $inputException->getLogMessage());
+        $this->assertTrue($inputException->wasErrorAdded());
+        $this->assertCount(0, $inputException->getErrors());
+
+        $inputException->addError($rawMessage, $params);
+        $this->assertEquals($expectedProcessedMessage, $inputException->getMessage());
+        $this->assertEquals($expectedProcessedMessage, $inputException->getLogMessage());
+        $this->assertTrue($inputException->wasErrorAdded());
+
+        $errors = $inputException->getErrors();
+        $this->assertCount(2, $errors);
+        $this->assertEquals($expectedProcessedMessage, $errors[0]->getMessage());
+        $this->assertEquals($expectedProcessedMessage, $errors[0]->getLogMessage());
+        $this->assertEquals($expectedProcessedMessage, $errors[1]->getMessage());
+        $this->assertEquals($expectedProcessedMessage, $errors[1]->getLogMessage());
     }
 }

From 17b0e3678d4c2a52ccc87023e92336e3cf4a84c2 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Tue, 27 Jan 2015 11:59:47 +0200
Subject: [PATCH 12/94] MAGETWO-33063: Replace usage of __() to Phrase object
 in library

---
 lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php       | 2 +-
 .../Magento/Framework/Model/Resource/Db/AbstractDb.php        | 4 ++--
 lib/internal/Magento/Framework/View/BlockPool.php             | 2 +-
 lib/internal/Magento/Framework/View/DataSourcePool.php        | 2 +-
 lib/internal/Magento/Framework/View/Element/Redirect.php      | 2 +-
 .../Magento/Framework/View/Layout/Generator/Block.php         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index 440a0dda5181b..d9303282bcb0e 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -3723,7 +3723,7 @@ public function createTrigger(\Magento\Framework\DB\Ddl\Trigger $trigger)
             throw new \Zend_Db_Exception(
                 sprintf(
                     (string)new \Magento\Framework\Phrase('Trigger %s has not statements available'),
-                    $trigger->getName()
+                    [$trigger->getName()]
                 )
             );
         }
diff --git a/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php b/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
index 2a0cbe6af9d55..cedfa9cc8479e 100644
--- a/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
+++ b/lib/internal/Magento/Framework/Model/Resource/Db/AbstractDb.php
@@ -635,9 +635,9 @@ protected function _checkUnique(\Magento\Framework\Model\AbstractModel $object)
 
         if (!empty($existent)) {
             if (count($existent) == 1) {
-                $error = (string)new \Magento\Framework\Phrase('%1 already exists.', $existent[0]);
+                $error = (string)new \Magento\Framework\Phrase('%1 already exists.', [$existent[0]]);
             } else {
-                $error = (string)new \Magento\Framework\Phrase('%1 already exist.', implode(', ', $existent));
+                $error = (string)new \Magento\Framework\Phrase('%1 already exist.', [implode(', ', $existent)]);
             }
             throw new ModelException($error, ModelException::ERROR_CODE_ENTITY_ALREADY_EXISTS);
         }
diff --git a/lib/internal/Magento/Framework/View/BlockPool.php b/lib/internal/Magento/Framework/View/BlockPool.php
index e1c6b274c9341..6b86bf1c06440 100644
--- a/lib/internal/Magento/Framework/View/BlockPool.php
+++ b/lib/internal/Magento/Framework/View/BlockPool.php
@@ -49,7 +49,7 @@ public function add($name, $class, array $arguments = [])
     {
         if (!class_exists($class)) {
             throw new \InvalidArgumentException(
-                (string)new \Magento\Framework\Phrase('Invalid Block class name: ' . $class)
+                (string)new \Magento\Framework\Phrase('Invalid Block class name: ') . $class
             );
         }
 
diff --git a/lib/internal/Magento/Framework/View/DataSourcePool.php b/lib/internal/Magento/Framework/View/DataSourcePool.php
index 2ff75cede0513..0ed12e61bc6de 100644
--- a/lib/internal/Magento/Framework/View/DataSourcePool.php
+++ b/lib/internal/Magento/Framework/View/DataSourcePool.php
@@ -56,7 +56,7 @@ public function add($name, $class)
         if (!isset($this->dataSources[$name])) {
             if (!class_exists($class)) {
                 throw new \InvalidArgumentException(
-                    (string)new \Magento\Framework\Phrase('Invalid Data Source class name: ' . $class)
+                    (string)new \Magento\Framework\Phrase('Invalid Data Source class name: ') . $class
                 );
             }
 
diff --git a/lib/internal/Magento/Framework/View/Element/Redirect.php b/lib/internal/Magento/Framework/View/Element/Redirect.php
index b4a27c759fc28..6a68b20742c58 100644
--- a/lib/internal/Magento/Framework/View/Element/Redirect.php
+++ b/lib/internal/Magento/Framework/View/Element/Redirect.php
@@ -192,7 +192,7 @@ protected function _getDefaultHtml()
             $html .= '<p>'
                 . (string)new \Magento\Framework\Phrase(
                     'Click <a href="%1">here</a> if nothing has happened',
-                    $this->getTargetURL()
+                    [$this->getTargetURL()]
                 )
                 . '</p>';
         }
diff --git a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
index 3b044eb613d52..90a04041387e5 100644
--- a/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
+++ b/lib/internal/Magento/Framework/View/Layout/Generator/Block.php
@@ -182,7 +182,7 @@ protected function getBlockInstance($block, array $arguments = [])
         }
         if (!$block instanceof \Magento\Framework\View\Element\AbstractBlock) {
             throw new \Magento\Framework\Model\Exception(
-                (string)new \Magento\Framework\Phrase('Invalid block type: %1', $block)
+                (string)new \Magento\Framework\Phrase('Invalid block type: %1', [$block])
             );
         }
         return $block;

From 107fb6a79297a6960d7dc1c2d99fe7ac641b336e Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Tue, 27 Jan 2015 12:04:21 +0200
Subject: [PATCH 13/94] MAGETWO-33063: Replace usage of __() to Phrase object
 in library

---
 lib/internal/Magento/Framework/View/BlockPool.php      | 2 +-
 lib/internal/Magento/Framework/View/DataSourcePool.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/BlockPool.php b/lib/internal/Magento/Framework/View/BlockPool.php
index 6b86bf1c06440..41f51f9d28b35 100644
--- a/lib/internal/Magento/Framework/View/BlockPool.php
+++ b/lib/internal/Magento/Framework/View/BlockPool.php
@@ -49,7 +49,7 @@ public function add($name, $class, array $arguments = [])
     {
         if (!class_exists($class)) {
             throw new \InvalidArgumentException(
-                (string)new \Magento\Framework\Phrase('Invalid Block class name: ') . $class
+                (string)new \Magento\Framework\Phrase('Invalid Block class name: %1', [$class])
             );
         }
 
diff --git a/lib/internal/Magento/Framework/View/DataSourcePool.php b/lib/internal/Magento/Framework/View/DataSourcePool.php
index 0ed12e61bc6de..4d0e9f6f87e5c 100644
--- a/lib/internal/Magento/Framework/View/DataSourcePool.php
+++ b/lib/internal/Magento/Framework/View/DataSourcePool.php
@@ -56,7 +56,7 @@ public function add($name, $class)
         if (!isset($this->dataSources[$name])) {
             if (!class_exists($class)) {
                 throw new \InvalidArgumentException(
-                    (string)new \Magento\Framework\Phrase('Invalid Data Source class name: ') . $class
+                    (string)new \Magento\Framework\Phrase('Invalid Data Source class name: %1', [$class])
                 );
             }
 

From 0934aac86a44b3baa7fa16ab1bb6f7b63dcf6c08 Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Tue, 27 Jan 2015 13:38:18 +0200
Subject: [PATCH 14/94] MAGETWO-31524: Refactor controller actions in the CMS
 module

---
 .../Cms/Controller/Adminhtml/Block/Index.php  |  1 +
 .../Adminhtml/Wysiwyg/Images/Upload.php       | 27 ++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
index e524e9ced8506..fd50ccad4c301 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
@@ -37,5 +37,6 @@ public function execute()
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $this->_initPage($resultPage)->getConfig()->getTitle()->prepend(__('Blocks'));
+        return $resultPage;
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
old mode 100644
new mode 100755
index 4736cc941e136..61b1c8f631b49
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Upload.php
@@ -8,10 +8,29 @@
 
 class Upload extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
+    /**
+     * @var \Magento\Framework\Controller\Result\JSONFactory
+     */
+    protected $resultJsonFactory;
+
+    /**
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+     */
+    public function __construct(
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Registry $coreRegistry,
+        \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
+    ) {
+        $this->resultJsonFactory = $resultJsonFactory;
+        parent::__construct($context, $coreRegistry);
+    }
+
     /**
      * Files upload processing
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
@@ -22,8 +41,8 @@ public function execute()
         } catch (\Exception $e) {
             $result = ['error' => $e->getMessage(), 'errorcode' => $e->getCode()];
         }
-        $this->getResponse()->representJson(
-            $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
-        );
+        /** @var \Magento\Framework\Controller\Result\JSON $resultJson */
+        $resultJson = $this->resultJsonFactory->create();
+        return $resultJson->setData($result);
     }
 }

From c8f5944baf010c1bd605cb019d10b216a9a9102b Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Tue, 27 Jan 2015 14:16:30 +0200
Subject: [PATCH 15/94] MAGETWO-31524: Refactor controller actions in the CMS
 module

---
 .../Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php     | 2 +-
 app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php    | 2 +-
 app/code/Magento/Cms/Controller/Index/NoCookies.php             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Index/NoCookies.php

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php
old mode 100644
new mode 100755
index b6ecd9d8f0ba9..f56e9e2e5efd2
--- a/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php
@@ -82,7 +82,7 @@ public function execute()
             $this->messageManager->addError($e->getMessage());
         }
 
-        $resultRedirect->setPath(static::REDIRECT_URL);
+        return $resultRedirect->setPath(static::REDIRECT_URL);
     }
 
     /**
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
old mode 100644
new mode 100755
index 7dad58a562c6a..09e0f8139b5fe
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
@@ -42,6 +42,6 @@ public function execute()
     {
         /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */
         $resultForward = $this->resultForwardFactory->create();
-        $resultForward->forward('edit');
+        return $resultForward->forward('edit');
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Index/NoCookies.php b/app/code/Magento/Cms/Controller/Index/NoCookies.php
old mode 100644
new mode 100755
index 24571aea4be8f..f7b052e795ee1
--- a/app/code/Magento/Cms/Controller/Index/NoCookies.php
+++ b/app/code/Magento/Cms/Controller/Index/NoCookies.php
@@ -41,7 +41,7 @@ public function execute()
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
         if (!$this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId)) {
-            $resultForward->forward('defaultNoCookies');
+            return $resultForward->forward('defaultNoCookies');
         }
     }
 }

From 1eeee0df9f0f6750269e4c7e9857ce575782bd7e Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Tue, 27 Jan 2015 14:34:51 +0200
Subject: [PATCH 16/94] MAGETWO-31524: Refactor controller actions in the CMS
 module

---
 app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
old mode 100644
new mode 100755
index 1ce5c5e49b3b6..cd4f9817eebee
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
@@ -32,7 +32,7 @@ public function __construct(
     ) {
         parent::__construct($context);
         $this->urlDecoder = $urlDecoder;
-        $this->resultRaw = $resultRawFactory;
+        $this->resultRawFactory = $resultRawFactory;
     }
 
     /**

From f05a57bce4046920de7845d96fc92c00fb9d19eb Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Tue, 27 Jan 2015 15:37:37 +0200
Subject: [PATCH 17/94] MAGETWO-31524: Refactor controller actions in the CMS
 module

---
 .../Adminhtml/Wysiwyg/Images/Thumbnail.php      | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
old mode 100644
new mode 100755
index 814b6425c46e9..211bf035a1ac2
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
@@ -11,21 +11,21 @@
 class Thumbnail extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
     /**
-     * @var \Magento\Framework\View\Result\LayoutFactory
+     * @var \Magento\Framework\Controller\Result\RawFactory
      */
-    protected $resultLayoutFactory;
+    protected $resultRawFactory;
 
     /**
      * @param Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\View\Result\LayoutFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
      */
     public function __construct(
         Action\Context $context,
         \Magento\Framework\Registry $coreRegistry,
-        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
     ) {
-        $this->resultLayoutFactory = $resultLayoutFactory;
+        $this->resultRawFactory = $resultRawFactory;
         parent::__construct($context, $coreRegistry);
     }
 
@@ -40,12 +40,15 @@ public function execute()
         $file = $this->getRequest()->getParam('file');
         $file = $this->_objectManager->get('Magento\Cms\Helper\Wysiwyg\Images')->idDecode($file);
         $thumb = $this->getStorage()->resizeOnTheFly($file);
-        $resultLayout = $this->resultLayoutFactory->create();
+        /** @var \Magento\Framework\Controller\Result\Raw $resultRaw */
+        $resultRaw = $this->resultRawFactory->create();
         if ($thumb !== false) {
             /** @var \Magento\Framework\Image\Adapter\AdapterInterface $image */
             $image = $this->_objectManager->get('Magento\Framework\Image\AdapterFactory')->create();
             $image->open($thumb);
-            $resultLayout->setHeader('Content-Type', $image->getMimeType())->setBody($image->getImage());
+            $resultRaw->setHeader('Content-Type', $image->getMimeType());
+            $resultRaw->setContents($image->getImage());
+            return $resultRaw;
         } else {
             // todo: generate some placeholder
         }

From a262290f688f360ea6ff222e4ffb588b81908615 Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Tue, 27 Jan 2015 16:48:08 +0200
Subject: [PATCH 18/94] MAGETWO-31524: Refactor controller actions in the CMS
 module

---
 .../Magento/Cms/Controller/Adminhtml/Page/Edit.php    |  7 +++++--
 .../Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php |  2 +-
 app/code/Magento/Cms/Controller/Index/Index.php       |  6 +++---
 app/code/Magento/Cms/Controller/Noroute/Index.php     | 11 ++++++-----
 4 files changed, 15 insertions(+), 11 deletions(-)
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Index/Index.php
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Noroute/Index.php

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
old mode 100644
new mode 100755
index ca8bcae134f76..1c06938913ecb
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
@@ -31,14 +31,17 @@ class Edit extends \Magento\Backend\App\Action
      * @param Action\Context $context
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+     * @param \Magento\Framework\Registry $registry
      */
     public function __construct(
         Action\Context $context,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
-        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory)
-    {
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
+        \Magento\Framework\Registry $registry
+    ) {
         $this->resultPageFactory = $resultPageFactory;
         $this->resultRedirectFactory = $resultRedirectFactory;
+        $this->_coreRegistry = $registry;
         parent::__construct($context);
     }
 
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
index 211bf035a1ac2..a5a2d6bbc2a1e 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/Thumbnail.php
@@ -33,7 +33,7 @@ public function __construct(
     /**
      * Generate image thumbnail on the fly
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Raw
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php
old mode 100644
new mode 100755
index 24b9d24d87449..fdbe137192a68
--- a/app/code/Magento/Cms/Controller/Index/Index.php
+++ b/app/code/Magento/Cms/Controller/Index/Index.php
@@ -9,17 +9,17 @@
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @var \Magento\Framework\Controller\Result\Forward
+     * @var \Magento\Framework\Controller\Result\ForwardFactory
      */
     protected $resultForwardFactory;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Framework\Controller\Result\Forward $resultForwardFactory
+     * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
-        \Magento\Framework\Controller\Result\Forward $resultForwardFactory
+        \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
     ) {
         $this->resultForwardFactory = $resultForwardFactory;
         parent::__construct($context);
diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php
old mode 100644
new mode 100755
index d7e3c18e04f68..4f45c61c9676b
--- a/app/code/Magento/Cms/Controller/Noroute/Index.php
+++ b/app/code/Magento/Cms/Controller/Noroute/Index.php
@@ -40,11 +40,10 @@ public function __construct(
      */
     public function execute()
     {
-        $resultLayout = $this->resultLayoutFactory->create();
-        $resultLayout->setHeader('HTTP/1.1', '404 Not Found');
-        $resultLayout->setHeader('Status', '404 File not found');
-
+        /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */
         $resultForward = $this->resultForwardFactory->create();
+        $resultForward->setHeader('HTTP/1.1', '404 Not Found');
+        $resultForward->setHeader('Status', '404 File not found');
 
         $pageId = $this->_objectManager->get(
             'Magento\Framework\App\Config\ScopeConfigInterface',
@@ -56,7 +55,9 @@ public function execute()
         /** @var \Magento\Cms\Helper\Page $pageHelper */
         $pageHelper = $this->_objectManager->get('Magento\Cms\Helper\Page');
         if (!$pageHelper->renderPage($this, $pageId)) {
-            $resultForward->forward('defaultNoRoute', 'index');
+            $resultForward->setController('index');
+            $resultForward->forward('defaultNoRoute');
+            return $resultForward;
         }
     }
 }

From fd339f92e6fcdb9afae8b04f7131acbc5d63bf93 Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Tue, 27 Jan 2015 16:58:13 +0200
Subject: [PATCH 19/94] MAGETWO-33058: Refactor Checkout module

---
 .../Magento/Checkout/Controller/Action.php    |  14 +-
 app/code/Magento/Checkout/Controller/Cart.php |  31 ++--
 .../Magento/Checkout/Controller/Cart/Add.php  |  25 +++-
 .../Checkout/Controller/Cart/Addgroup.php     |  15 +-
 .../Checkout/Controller/Cart/Configure.php    |  20 ++-
 .../Checkout/Controller/Cart/CouponPost.php   |  23 ++-
 .../Checkout/Controller/Cart/Delete.php       |   4 +-
 .../Checkout/Controller/Cart/EstimatePost.php |  29 ++--
 .../Controller/Cart/EstimateUpdatePost.php    |   4 +-
 .../Checkout/Controller/Cart/Index.php        |  70 ++++++---
 .../Controller/Cart/UpdateItemOptions.php     |  12 +-
 .../Checkout/Controller/Cart/UpdatePost.php   |   7 +-
 .../Checkout/Controller/Index/Index.php       |  21 ++-
 .../Magento/Checkout/Controller/Onepage.php   |  75 +++++++---
 .../Checkout/Controller/Onepage/Failure.php   |   8 +-
 .../Checkout/Controller/Onepage/Index.php     |  23 +--
 .../Checkout/Controller/Onepage/Review.php    |   9 +-
 .../Controller/Onepage/SaveBilling.php        |   8 +-
 .../Controller/Onepage/SaveMethod.php         |  17 +--
 .../Checkout/Controller/Onepage/SaveOrder.php |  32 ++--
 .../Controller/Onepage/SavePayment.php        |  16 +-
 .../Controller/Onepage/SaveShipping.php       |   9 +-
 .../Controller/Onepage/SaveShippingMethod.php |  46 +++---
 .../Controller/Onepage/ShippingMethod.php     |   9 +-
 .../Checkout/Controller/Onepage/Success.php   |  11 +-
 .../Multishipping/Controller/Checkout.php     |  28 ++--
 .../Controller/Checkout/OverviewPost.php      |  10 +-
 .../Controller/Cart/ConfigureTest.php         | 138 ++++++------------
 .../Magento/Checkout/Controller/CartTest.php  |  75 ++++------
 .../Checkout/Controller/Onepage/IndexTest.php |  72 +++++----
 .../Controller/Onepage/SaveBillingTest.php    |  76 ++++++----
 .../Controller/Onepage/SaveShippingTest.php   |  75 ++++++----
 32 files changed, 554 insertions(+), 458 deletions(-)

diff --git a/app/code/Magento/Checkout/Controller/Action.php b/app/code/Magento/Checkout/Controller/Action.php
index 6a7bbd4dab6b9..daa22d34d16b5 100644
--- a/app/code/Magento/Checkout/Controller/Action.php
+++ b/app/code/Magento/Checkout/Controller/Action.php
@@ -29,21 +29,29 @@ abstract class Action extends \Magento\Framework\App\Action\Action
      */
     protected $accountManagement;
 
+    /**
+     * @var \Magento\Framework\Controller\Result\RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $accountManagement
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Customer\Model\Session $customerSession,
         CustomerRepositoryInterface $customerRepository,
-        AccountManagementInterface $accountManagement
+        AccountManagementInterface $accountManagement,
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
     ) {
         $this->_customerSession = $customerSession;
         $this->customerRepository = $customerRepository;
         $this->accountManagement = $accountManagement;
+        $this->resultRedirectFactory = $resultRedirectFactory;
         parent::__construct($context);
     }
 
@@ -54,7 +62,7 @@ public function __construct(
      *
      * @param bool $redirect - stop dispatch and redirect?
      * @param bool $addErrors - add error messages?
-     * @return bool
+     * @return bool|\Magento\Framework\Controller\Result\Redirect
      */
     protected function _preDispatchValidateCustomer($redirect = true, $addErrors = true)
     {
@@ -73,8 +81,8 @@ protected function _preDispatchValidateCustomer($redirect = true, $addErrors = t
                     }
                 }
                 if ($redirect) {
-                    $this->_redirect('customer/account/edit');
                     $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
+                    return $this->resultRedirectFactory->create()->setPath('customer/account/edit');
                 }
                 return false;
             }
diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php
index 557e98447c5ef..e2db457c9ee14 100644
--- a/app/code/Magento/Checkout/Controller/Cart.php
+++ b/app/code/Magento/Checkout/Controller/Cart.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Controller\Product\View\ViewInterface;
 use Magento\Checkout\Model\Cart as CustomerCart;
+use Magento\Store\Model\ScopeInterface;
 
 /**
  * Shopping cart controller
@@ -38,6 +39,11 @@ class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
      */
     protected $cart;
 
+    /**
+     * @var \Magento\Framework\Controller\Result\RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
@@ -45,6 +51,7 @@ class Cart extends \Magento\Framework\App\Action\Action implements ViewInterface
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @param CustomerCart $cart
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
@@ -52,42 +59,42 @@ public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
-        CustomerCart $cart
+        CustomerCart $cart,
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
     ) {
         $this->_formKeyValidator = $formKeyValidator;
         $this->_scopeConfig = $scopeConfig;
         $this->_checkoutSession = $checkoutSession;
         $this->_storeManager = $storeManager;
         $this->cart = $cart;
+        $this->resultRedirectFactory = $resultRedirectFactory;
         parent::__construct($context);
     }
 
     /**
      * Set back redirect url to response
      *
-     * @return $this
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     protected function _goBack()
     {
         $returnUrl = $this->getRequest()->getParam('return_url');
+        $resultRedirect = $this->resultRedirectFactory->create();
         if ($returnUrl && $this->_isInternalUrl($returnUrl)) {
             $this->messageManager->getMessages()->clear();
-            $this->getResponse()->setRedirect($returnUrl);
-        } elseif (!$this->_scopeConfig->getValue(
-            'checkout/cart/redirect_to_cart',
-            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-        ) && !$this->getRequest()->getParam(
-            'in_cart'
-        ) && ($backUrl = $this->_redirect->getRefererUrl())
+            $resultRedirect->setUrl($returnUrl);
+        } elseif (!$this->_scopeConfig->getValue('checkout/cart/redirect_to_cart', ScopeInterface::SCOPE_STORE)
+            && !$this->getRequest()->getParam('in_cart')
+            && ($backUrl = $this->_redirect->getRefererUrl())
         ) {
-            $this->getResponse()->setRedirect($backUrl);
+            $resultRedirect->setUrl($backUrl);
         } else {
             if ($this->getRequest()->getActionName() == 'add' && !$this->getRequest()->getParam('in_cart')) {
                 $this->_checkoutSession->setContinueShoppingUrl($this->_redirect->getRefererUrl());
             }
-            $this->_redirect('checkout/cart');
+            $resultRedirect->setPath('checkout/cart');
         }
-        return $this;
+        return $resultRedirect;
     }
 
     /**
diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index dc61e5350b9d5..9cc38384cdfd7 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -27,6 +27,7 @@ class Add extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @param CustomerCart $cart
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param ProductRepositoryInterface $productRepository
      */
     public function __construct(
@@ -36,9 +37,18 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
         CustomerCart $cart,
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         ProductRepositoryInterface $productRepository
     ) {
-        parent::__construct($context, $scopeConfig, $checkoutSession, $storeManager, $formKeyValidator, $cart);
+        parent::__construct(
+            $context,
+            $scopeConfig,
+            $checkoutSession,
+            $storeManager,
+            $formKeyValidator,
+            $cart,
+            $resultRedirectFactory
+        );
         $this->productRepository = $productRepository;
     }
 
@@ -64,7 +74,7 @@ protected function _initProduct()
     /**
      * Add product to shopping cart action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
@@ -85,8 +95,7 @@ public function execute()
              * Check product availability
              */
             if (!$product) {
-                $this->_goBack();
-                return;
+                return $this->_goBack();
             }
 
             $this->cart->addProduct($product, $params);
@@ -114,7 +123,7 @@ public function execute()
                     );
                     $this->messageManager->addSuccess($message);
                 }
-                $this->_goBack();
+                return $this->_goBack();
             }
         } catch (\Magento\Framework\Model\Exception $e) {
             if ($this->_checkoutSession->getUseNotice(true)) {
@@ -132,15 +141,15 @@ public function execute()
 
             $url = $this->_checkoutSession->getRedirectUrl(true);
             if ($url) {
-                $this->getResponse()->setRedirect($url);
+                return $this->resultRedirectFactory->create()->setUrl($url);
             } else {
                 $cartUrl = $this->_objectManager->get('Magento\Checkout\Helper\Cart')->getCartUrl();
-                $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($cartUrl));
+                return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl($cartUrl));
             }
         } catch (\Exception $e) {
             $this->messageManager->addException($e, __('We cannot add this item to your shopping cart'));
             $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
-            $this->_goBack();
+            return $this->_goBack();
         }
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
index fc8ce181e38e8..f32c7a55de177 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
@@ -9,17 +9,16 @@
 class Addgroup extends \Magento\Checkout\Controller\Cart
 {
     /**
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
         $orderItemIds = $this->getRequest()->getParam('order_items', []);
         if (is_array($orderItemIds)) {
-            $itemsCollection = $this->_objectManager->create(
-                'Magento\Sales\Model\Order\Item'
-            )->getCollection()->addIdFilter(
-                $orderItemIds
-            )->load();
+            $itemsCollection = $this->_objectManager->create('Magento\Sales\Model\Order\Item')
+                ->getCollection()
+                ->addIdFilter($orderItemIds)
+                ->load();
             /* @var $itemsCollection \Magento\Sales\Model\Resource\Order\Item\Collection */
             foreach ($itemsCollection as $item) {
                 try {
@@ -33,12 +32,12 @@ public function execute()
                 } catch (\Exception $e) {
                     $this->messageManager->addException($e, __('We cannot add this item to your shopping cart'));
                     $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
-                    $this->_goBack();
+                    return $this->_goBack();
                 }
             }
             $this->cart->save();
             $this->_checkoutSession->setCartWasUpdated(true);
         }
-        $this->_goBack();
+        return $this->_goBack();
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
index 0c09470858bd3..de95bc6d3deca 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -20,6 +20,7 @@ class Configure extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @param \Magento\Checkout\Model\Cart $cart
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      */
     public function __construct(
@@ -29,16 +30,25 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
         \Magento\Checkout\Model\Cart $cart,
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory
     ) {
-        parent::__construct($context, $scopeConfig, $checkoutSession, $storeManager, $formKeyValidator, $cart);
+        parent::__construct(
+            $context,
+            $scopeConfig,
+            $checkoutSession,
+            $storeManager,
+            $formKeyValidator,
+            $cart,
+            $resultRedirectFactory
+        );
         $this->resultPageFactory = $resultPageFactory;
     }
 
     /**
      * Action to reconfigure cart item
      *
-     * @return \Magento\Framework\View\Result\Page
+     * @return \Magento\Framework\View\Result\Page|\Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -53,8 +63,7 @@ public function execute()
         try {
             if (!$quoteItem || $productId != $quoteItem->getProduct()->getId()) {
                 $this->messageManager->addError(__("We can't find the quote item."));
-                $this->_redirect('checkout/cart');
-                return;
+                return $this->resultRedirectFactory->create()->setPath('checkout/cart');
             }
 
             $params = new \Magento\Framework\Object();
@@ -74,8 +83,7 @@ public function execute()
         } catch (\Exception $e) {
             $this->messageManager->addError(__('We cannot configure the product.'));
             $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
-            $this->_goBack();
-            return;
+            return $this->_goBack();
         }
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
index 0cf8613f7b2ea..c1b81b632d332 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -24,6 +24,7 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @param CustomerCart $cart
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
      */
     public function __construct(
@@ -33,6 +34,7 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
         CustomerCart $cart,
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         \Magento\Quote\Model\QuoteRepository $quoteRepository
     ) {
         parent::__construct(
@@ -41,7 +43,8 @@ public function __construct(
             $checkoutSession,
             $storeManager,
             $formKeyValidator,
-            $cart
+            $cart,
+            $resultRedirectFactory
         );
         $this->quoteRepository = $quoteRepository;
     }
@@ -49,7 +52,7 @@ public function __construct(
     /**
      * Initialize coupon
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -59,20 +62,16 @@ public function execute()
          * No reason continue with empty shopping cart
          */
         if (!$this->cart->getQuote()->getItemsCount()) {
-            $this->_goBack();
-            return;
+            return $this->_goBack();
         }
 
-        $couponCode = $this->getRequest()->getParam(
-            'remove'
-        ) == 1 ? '' : trim(
-            $this->getRequest()->getParam('coupon_code')
-        );
+        $couponCode = $this->getRequest()->getParam('remove') == 1
+            ? ''
+            : trim($this->getRequest()->getParam('coupon_code'));
         $oldCouponCode = $this->cart->getQuote()->getCouponCode();
 
         if (!strlen($couponCode) && !strlen($oldCouponCode)) {
-            $this->_goBack();
-            return;
+            return $this->_goBack();
         }
 
         try {
@@ -109,6 +108,6 @@ public function execute()
             $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
         }
 
-        $this->_goBack();
+        return $this->_goBack();
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Cart/Delete.php b/app/code/Magento/Checkout/Controller/Cart/Delete.php
index 4c623b6404a0e..8b5e2da9ce319 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Delete.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Delete.php
@@ -11,7 +11,7 @@ class Delete extends \Magento\Checkout\Controller\Cart
     /**
      * Delete shopping cart item action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -25,6 +25,6 @@ public function execute()
             }
         }
         $defaultUrl = $this->_objectManager->create('Magento\Framework\UrlInterface')->getUrl('*/*');
-        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($defaultUrl));
+        return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl($defaultUrl));
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
index f0b4013f995cb..8300426d4699d 100644
--- a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
@@ -22,6 +22,7 @@ class EstimatePost extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @param CustomerCart $cart
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
      */
     public function __construct(
@@ -31,6 +32,7 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
         CustomerCart $cart,
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         \Magento\Quote\Model\QuoteRepository $quoteRepository
     ) {
         $this->quoteRepository = $quoteRepository;
@@ -40,14 +42,15 @@ public function __construct(
             $checkoutSession,
             $storeManager,
             $formKeyValidator,
-            $cart
+            $cart,
+            $resultRedirectFactory
         );
     }
 
     /**
      * Initialize shipping information
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -57,20 +60,14 @@ public function execute()
         $regionId = (string)$this->getRequest()->getParam('region_id');
         $region = (string)$this->getRequest()->getParam('region');
 
-        $this->cart->getQuote()->getShippingAddress()->setCountryId(
-            $country
-        )->setCity(
-            $city
-        )->setPostcode(
-            $postcode
-        )->setRegionId(
-            $regionId
-        )->setRegion(
-            $region
-        )->setCollectShippingRates(
-            true
-        );
+        $this->cart->getQuote()->getShippingAddress()
+            ->setCountryId($country)
+            ->setCity($city)
+            ->setPostcode($postcode)
+            ->setRegionId($regionId)
+            ->setRegion($region)
+            ->setCollectShippingRates(true);
         $this->quoteRepository->save($this->cart->getQuote());
-        $this->_goBack();
+        return $this->_goBack();
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php
index 0567b1e8bc441..4f873d1e10254 100644
--- a/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/EstimateUpdatePost.php
@@ -9,7 +9,7 @@
 class EstimateUpdatePost extends \Magento\Checkout\Controller\Cart
 {
     /**
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -17,6 +17,6 @@ public function execute()
         if (!empty($code)) {
             $this->cart->getQuote()->getShippingAddress()->setShippingMethod($code)->save();
         }
-        $this->_goBack();
+        return $this->_goBack();
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
index 144ae3fdeaa81..73469d8b3c66d 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Index.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -11,10 +11,47 @@
 
 class Index extends \Magento\Checkout\Controller\Cart
 {
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    protected $resultPageFactory;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param CustomerCart $cart
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Checkout\Model\Cart $cart,
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory
+    ) {
+        parent::__construct(
+            $context,
+            $scopeConfig,
+            $checkoutSession,
+            $storeManager,
+            $formKeyValidator,
+            $cart,
+            $resultRedirectFactory
+        );
+        $this->resultPageFactory = $resultPageFactory;
+    }
+
     /**
      * Shopping cart display action
      *
-     * @return void
+     * @return \Magento\Framework\View\Result\Page
      */
     public function execute()
     {
@@ -24,18 +61,16 @@ public function execute()
             $this->cart->save();
 
             if (!$this->cart->getQuote()->validateMinimumAmount()) {
-                $currencyCode = $this->_objectManager->get(
-                    'Magento\Store\Model\StoreManagerInterface'
-                )->getStore()->getCurrentCurrencyCode();
-                $minimumAmount = $this->_objectManager->get(
-                    'Magento\Framework\Locale\CurrencyInterface'
-                )->getCurrency(
-                    $currencyCode
-                )->toCurrency(
-                    $this->_scopeConfig->getValue(
-                        'sales/minimum_order/amount',
-                        \Magento\Store\Model\ScopeInterface::SCOPE_STORE
-                    )
+                $currencyCode = $this->_objectManager->get('Magento\Store\Model\StoreManagerInterface')
+                    ->getStore()
+                    ->getCurrentCurrencyCode();
+                $minimumAmount = $this->_objectManager->get('Magento\Framework\Locale\CurrencyInterface')
+                    ->getCurrency($currencyCode)
+                    ->toCurrency(
+                        $this->_scopeConfig->getValue(
+                            'sales/minimum_order/amount',
+                            \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                        )
                 );
 
                 $warning = $this->_scopeConfig->getValue(
@@ -73,11 +108,10 @@ public function execute()
 
         \Magento\Framework\Profiler::start(__METHOD__ . 'cart_display');
 
-        $this->_view->loadLayout();
-        $layout = $this->_view->getLayout();
-        $layout->initMessages();
-        $this->_view->getPage()->getConfig()->getTitle()->set(__('Shopping Cart'));
-        $this->_view->renderLayout();
+        $resultPage = $this->resultPageFactory->create();
+        $resultPage->getLayout()->initMessages();
+        $resultPage->getConfig()->getTitle()->set(__('Shopping Cart'));
         \Magento\Framework\Profiler::stop(__METHOD__ . 'cart_display');
+        return $resultPage;
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
index 433300a78fda6..97eb05cf1d7ff 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdateItemOptions.php
@@ -14,7 +14,7 @@ class UpdateItemOptions extends \Magento\Checkout\Controller\Cart
     /**
      * Update product configuration for a cart item
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -68,7 +68,7 @@ public function execute()
                     );
                     $this->messageManager->addSuccess($message);
                 }
-                $this->_goBack();
+                return $this->_goBack();
             }
         } catch (\Magento\Framework\Model\Exception $e) {
             if ($this->_checkoutSession->getUseNotice(true)) {
@@ -82,16 +82,16 @@ public function execute()
 
             $url = $this->_checkoutSession->getRedirectUrl(true);
             if ($url) {
-                $this->getResponse()->setRedirect($url);
+                return $this->resultRedirectFactory->create()->setUrl($url);
             } else {
                 $cartUrl = $this->_objectManager->get('Magento\Checkout\Helper\Cart')->getCartUrl();
-                $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($cartUrl));
+                return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl($cartUrl));
             }
         } catch (\Exception $e) {
             $this->messageManager->addException($e, __('We cannot update the item.'));
             $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
-            $this->_goBack();
+            return $this->_goBack();
         }
-        $this->_redirect('*/*');
+        return $this->resultRedirectFactory->create()->setPath('*/*');
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
index 094541435b0c2..d06986c9b68cd 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
@@ -67,13 +67,12 @@ protected function _updateShoppingCart()
     /**
      * Update shopping cart data action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
         if (!$this->_formKeyValidator->validate($this->getRequest())) {
-            $this->_redirect('*/*/');
-            return;
+            return $this->resultRedirectFactory->create()->setPath('*/*/');
         }
 
         $updateAction = (string)$this->getRequest()->getParam('update_cart_action');
@@ -89,6 +88,6 @@ public function execute()
                 $this->_updateShoppingCart();
         }
 
-        $this->_goBack();
+        return $this->_goBack();
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Index/Index.php b/app/code/Magento/Checkout/Controller/Index/Index.php
index a7d53f46d9df2..7e34b412e3383 100644
--- a/app/code/Magento/Checkout/Controller/Index/Index.php
+++ b/app/code/Magento/Checkout/Controller/Index/Index.php
@@ -9,10 +9,27 @@
 class Index extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @return void
+     * @var \Magento\Framework\Controller\Result\RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+    ) {
+        parent::__construct($context);
+        $this->resultRedirectFactory = $resultRedirectFactory;
+    }
+
+    /**
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
-        $this->_redirect('checkout/onepage', ['_secure' => true]);
+        return $this->resultRedirectFactory->create()->setPath('checkout/onepage', ['_secure' => true]);
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Onepage.php b/app/code/Magento/Checkout/Controller/Onepage.php
index 0cd64fb99023f..a21f340745f2e 100644
--- a/app/code/Magento/Checkout/Controller/Onepage.php
+++ b/app/code/Magento/Checkout/Controller/Onepage.php
@@ -61,17 +61,43 @@ class Onepage extends Action
      */
     protected $quoteRepository;
 
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    protected $resultPageFactory;
+
+    /**
+     * @var \Magento\Framework\View\Result\LayoutFactory
+     */
+    protected $resultLayoutFactory;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\RawFactory
+     */
+    protected $resultRawFactory;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\JsonFactory
+     */
+    protected $resultJsonFactory;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Customer\Model\Session $customerSession
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $accountManagement
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Translate\InlineInterface $translateInline
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\View\LayoutFactory $layoutFactory
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
+     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -79,12 +105,17 @@ public function __construct(
         \Magento\Customer\Model\Session $customerSession,
         CustomerRepositoryInterface $customerRepository,
         AccountManagementInterface $accountManagement,
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         \Magento\Framework\Registry $coreRegistry,
         \Magento\Framework\Translate\InlineInterface $translateInline,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Framework\View\LayoutFactory $layoutFactory,
-        \Magento\Quote\Model\QuoteRepository $quoteRepository
+        \Magento\Quote\Model\QuoteRepository $quoteRepository,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory,
+        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
+        \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
+        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
     ) {
         $this->_coreRegistry = $coreRegistry;
         $this->_translateInline = $translateInline;
@@ -92,7 +123,17 @@ public function __construct(
         $this->scopeConfig = $scopeConfig;
         $this->layoutFactory = $layoutFactory;
         $this->quoteRepository = $quoteRepository;
-        parent::__construct($context, $customerSession, $customerRepository, $accountManagement);
+        $this->resultPageFactory = $resultPageFactory;
+        $this->resultLayoutFactory = $resultLayoutFactory;
+        $this->resultRawFactory = $resultRawFactory;
+        $this->resultJsonFactory = $resultJsonFactory;
+        parent::__construct(
+            $context,
+            $customerSession,
+            $customerRepository,
+            $accountManagement,
+            $resultRedirectFactory
+        );
     }
 
     /**
@@ -105,7 +146,10 @@ public function __construct(
     public function dispatch(RequestInterface $request)
     {
         $this->_request = $request;
-        $this->_preDispatchValidateCustomer();
+        $result = $this->_preDispatchValidateCustomer();
+        if ($result instanceof \Magento\Framework\Controller\ResultInterface) {
+            return $result;
+        }
 
         /** @var \Magento\Quote\Model\Quote $quote */
         $quote = $this->_objectManager->get('Magento\Checkout\Model\Session')->getQuote();
@@ -120,12 +164,14 @@ public function dispatch(RequestInterface $request)
     }
 
     /**
-     * @return $this
+     * @return \Magento\Framework\Controller\Result\Raw
      */
     protected function _ajaxRedirectResponse()
     {
-        $this->getResponse()->setHeader('HTTP/1.1', '403 Session Expired')->setHeader('Login-Required', 'true');
-        return $this;
+        $resultRaw = $this->resultRawFactory->create();
+        $resultRaw->setHeader('HTTP/1.1', '403 Session Expired')
+            ->setHeader('Login-Required', 'true');
+        return $resultRaw;
     }
 
     /**
@@ -137,21 +183,14 @@ protected function _expireAjax()
     {
         $quote = $this->getOnepage()->getQuote();
         if (!$quote->hasItems() || $quote->getHasError() || !$quote->validateMinimumAmount()) {
-            $this->_ajaxRedirectResponse();
-            return true;
+            return false;
         }
         $action = $this->getRequest()->getActionName();
-        if ($this->_objectManager->get(
-            'Magento\Checkout\Model\Session'
-        )->getCartWasUpdated(
-            true
-        ) && !in_array(
-            $action,
-            ['index', 'progress']
-        )
+        if ($this->_objectManager->get('Magento\Checkout\Model\Session')->getCartWasUpdated(true)
+            &&
+            !in_array($action, ['index', 'progress'])
         ) {
-            $this->_ajaxRedirectResponse();
-            return true;
+            return false;
         }
 
         return false;
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Failure.php b/app/code/Magento/Checkout/Controller/Onepage/Failure.php
index a928f7cb7be6d..e6155dbea2981 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Failure.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Failure.php
@@ -9,7 +9,7 @@
 class Failure extends \Magento\Checkout\Controller\Onepage
 {
     /**
-     * @return void
+     * @return \Magento\Framework\View\Result\Page|\Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -17,11 +17,9 @@ public function execute()
         $lastOrderId = $this->getOnepage()->getCheckout()->getLastOrderId();
 
         if (!$lastQuoteId || !$lastOrderId) {
-            $this->_redirect('checkout/cart');
-            return;
+            return $this->resultRedirectFactory->create()->setPath('checkout/cart');
         }
 
-        $this->_view->loadLayout();
-        $this->_view->renderLayout();
+        return $this->resultPageFactory->create();
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Index.php b/app/code/Magento/Checkout/Controller/Onepage/Index.php
index 3da33c0906112..4686ece6b0b82 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Index.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Index.php
@@ -11,34 +11,27 @@ class Index extends \Magento\Checkout\Controller\Onepage
     /**
      * Checkout page
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         if (!$this->_objectManager->get('Magento\Checkout\Helper\Data')->canOnepageCheckout()) {
             $this->messageManager->addError(__('The onepage checkout is disabled.'));
-            $this->_redirect('checkout/cart');
-            return;
+            return $this->resultRedirectFactory->create()->setPath('checkout/cart');
         }
         $quote = $this->getOnepage()->getQuote();
         if (!$quote->hasItems() || $quote->getHasError() || !$quote->validateMinimumAmount()) {
-            $this->_redirect('checkout/cart');
-            return;
+            return $this->resultRedirectFactory->create()->setPath('checkout/cart');
         }
 
         $this->_customerSession->regenerateId();
         $this->_objectManager->get('Magento\Checkout\Model\Session')->setCartWasUpdated(false);
-        $currentUrl = $this->_objectManager->create('Magento\Framework\UrlInterface')
-            ->getUrl(
-                '*/*/*',
-                ['_secure' => true]
-            );
+        $currentUrl = $this->_url->getUrl('*/*/*', ['_secure' => true]);
         $this->_objectManager->get('Magento\Customer\Model\Session')->setBeforeAuthUrl($currentUrl);
         $this->getOnepage()->initCheckout();
-        $this->_view->loadLayout();
-        $layout = $this->_view->getLayout();
-        $layout->initMessages();
-        $this->_view->getPage()->getConfig()->getTitle()->set(__('Checkout'));
-        $this->_view->renderLayout();
+        $resultPage = $this->resultPageFactory->create();
+        $resultPage->getLayout()->initMessages();
+        $resultPage->getConfig()->getTitle()->set(__('Checkout'));
+        return $resultPage;
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Review.php b/app/code/Magento/Checkout/Controller/Onepage/Review.php
index b5dcbb7f6662c..21be8905b2a78 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Review.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Review.php
@@ -12,14 +12,15 @@ class Review extends Onepage
 {
     /**
      * {@inheritdoc}
+     *
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         if ($this->_expireAjax()) {
-            return;
+            return $this->_ajaxRedirectResponse();
         }
-        $this->_view->addPageLayoutHandles();
-        $this->_view->loadLayout(false);
-        $this->_view->renderLayout();
+
+        return $this->resultLayoutFactory->create();
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php b/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php
index f82cbca32e546..c9f0fc3478af5 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveBilling.php
@@ -11,12 +11,12 @@ class SaveBilling extends \Magento\Checkout\Controller\Onepage
     /**
      * Save checkout billing address
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         if (!$this->getRequest()->isPost() || $this->_expireAjax()) {
-            return;
+            return $this->_ajaxRedirectResponse();
         }
         $data = $this->getRequest()->getPost('billing', []);
         $customerAddressId = $this->getRequest()->getPost('billing_address_id', false);
@@ -60,8 +60,6 @@ public function execute()
             }
         }
 
-        $this->getResponse()->representJson(
-            $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
-        );
+        return $this->resultJsonFactory->create()->setData($result);
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveMethod.php b/app/code/Magento/Checkout/Controller/Onepage/SaveMethod.php
index 192d37367d4c9..e9a79177a9149 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveMethod.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveMethod.php
@@ -11,19 +11,16 @@ class SaveMethod extends \Magento\Checkout\Controller\Onepage
     /**
      * Save checkout method
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
-        if ($this->_expireAjax()) {
-            return;
-        }
-        if ($this->getRequest()->isPost()) {
-            $method = $this->getRequest()->getPost('method');
-            $result = $this->getOnepage()->saveCheckoutMethod($method);
-            $this->getResponse()->representJson(
-                $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
-            );
+        if (!$this->getRequest()->isPost() || $this->_expireAjax()) {
+            return $this->_ajaxRedirectResponse();
         }
+        $method = $this->getRequest()->getPost('method');
+        $result = $this->getOnepage()->saveCheckoutMethod($method);
+
+        return $this->resultJsonFactory->create()->setData($result);
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
index 6bb7a5e450882..04b8f03a083e3 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveOrder.php
@@ -11,19 +11,18 @@ class SaveOrder extends \Magento\Checkout\Controller\Onepage
     /**
      * Create order action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function execute()
     {
         if (!$this->_formKeyValidator->validate($this->getRequest())) {
-            $this->_redirect('*/*/');
-            return;
+            return $this->resultRedirectFactory->create()->setPath('*/*/');
         }
 
         if ($this->_expireAjax()) {
-            return;
+            return $this->_ajaxRedirectResponse();
         }
 
         $result = [];
@@ -35,10 +34,7 @@ public function execute()
                 $result['error_messages'] = __(
                     'Please agree to all the terms and conditions before placing the order.'
                 );
-                $this->getResponse()->representJson(
-                    $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
-                );
-                return;
+                return $this->resultJsonFactory->create()->setData($result);
             }
 
             $data = $this->getRequest()->getPost('payment', []);
@@ -68,12 +64,8 @@ public function execute()
             $result['update_section'] = ['name' => 'payment-method', 'html' => $this->_getPaymentMethodsHtml()];
         } catch (\Magento\Framework\Model\Exception $e) {
             $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
-            $this->_objectManager->get(
-                'Magento\Checkout\Helper\Data'
-            )->sendPaymentFailedEmail(
-                $this->getOnepage()->getQuote(),
-                $e->getMessage()
-            );
+            $this->_objectManager->get('Magento\Checkout\Helper\Data')
+                ->sendPaymentFailedEmail($this->getOnepage()->getQuote(), $e->getMessage());
             $result['success'] = false;
             $result['error'] = true;
             $result['error_messages'] = $e->getMessage();
@@ -96,12 +88,8 @@ public function execute()
             }
         } catch (\Exception $e) {
             $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
-            $this->_objectManager->get(
-                'Magento\Checkout\Helper\Data'
-            )->sendPaymentFailedEmail(
-                $this->getOnepage()->getQuote(),
-                $e->getMessage()
-            );
+            $this->_objectManager->get('Magento\Checkout\Helper\Data')
+                ->sendPaymentFailedEmail($this->getOnepage()->getQuote(), $e->getMessage());
             $result['success'] = false;
             $result['error'] = true;
             $result['error_messages'] = __('Something went wrong processing your order. Please try again later.');
@@ -114,8 +102,6 @@ public function execute()
             $result['redirect'] = $redirectUrl;
         }
 
-        $this->getResponse()->representJson(
-            $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
-        );
+        return $this->resultJsonFactory->create()->setData($result);
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php b/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php
index d401a79fb575f..83e3c46621b6d 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SavePayment.php
@@ -23,20 +23,15 @@ protected function _getReviewHtml()
      *
      * Sets either redirect or a JSON response
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function execute()
     {
-        if ($this->_expireAjax()) {
-            return;
+        if (!$this->getRequest()->isPost() || $this->_expireAjax()) {
+            return $this->_ajaxRedirectResponse();
         }
         try {
-            if (!$this->getRequest()->isPost()) {
-                $this->_ajaxRedirectResponse();
-                return;
-            }
-
             $data = $this->getRequest()->getPost('payment', []);
             $result = $this->getOnepage()->savePayment($data);
 
@@ -61,8 +56,7 @@ public function execute()
             $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
             $result['error'] = __('Unable to set Payment Method');
         }
-        $this->getResponse()->representJson(
-            $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
-        );
+
+        return $this->resultJsonFactory->create()->setData($result);
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php b/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php
index deefde7fe9ef5..491a0411bccdd 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveShipping.php
@@ -11,12 +11,12 @@ class SaveShipping extends \Magento\Checkout\Controller\Onepage
     /**
      * Shipping address save action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         if (!$this->getRequest()->isPost() || $this->_expireAjax()) {
-            return;
+            return $this->_ajaxRedirectResponse();
         }
         $data = $this->getRequest()->getPost('shipping', []);
         $customerAddressId = $this->getRequest()->getPost('shipping_address_id', false);
@@ -42,8 +42,7 @@ public function execute()
                 $result['update_progress'] = ['html' => $this->getProgressHtml($result['goto_section'])];
             }
         }
-        $this->getResponse()->representJson(
-            $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
-        );
+
+        return $this->resultJsonFactory->create()->setData($result);
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Onepage/SaveShippingMethod.php b/app/code/Magento/Checkout/Controller/Onepage/SaveShippingMethod.php
index ed67d8e681db0..eccadcd5ab4d8 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/SaveShippingMethod.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/SaveShippingMethod.php
@@ -11,38 +11,32 @@ class SaveShippingMethod extends \Magento\Checkout\Controller\Onepage
     /**
      * Shipping method save action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
-        if ($this->_expireAjax()) {
-            return;
+        if (!$this->getRequest()->isPost() || $this->_expireAjax()) {
+            return $this->_ajaxRedirectResponse();
         }
-        if ($this->getRequest()->isPost()) {
-            $data = $this->getRequest()->getPost('shipping_method', '');
-            $result = $this->getOnepage()->saveShippingMethod($data);
-            // $result will contain error data if shipping method is empty
-            if (!$result) {
-                $this->_eventManager->dispatch(
-                    'checkout_controller_onepage_save_shipping_method',
-                    ['request' => $this->getRequest(), 'quote' => $this->getOnepage()->getQuote()]
-                );
-                $this->getOnepage()->getQuote()->collectTotals();
-                $this->getResponse()->representJson(
-                    $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
-                );
 
-                $result['goto_section'] = 'payment';
-                $result['update_section'] = [
-                    'name' => 'payment-method',
-                    'html' => $this->_getPaymentMethodsHtml(),
-                ];
-                $result['update_progress'] = ['html' => $this->getProgressHtml($result['goto_section'])];
-            }
-            $this->quoteRepository->save($this->getOnepage()->getQuote()->collectTotals());
-            $this->getResponse()->representJson(
-                $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
+        $data = $this->getRequest()->getPost('shipping_method', '');
+        $result = $this->getOnepage()->saveShippingMethod($data);
+        // $result will contain error data if shipping method is empty
+        if (!$result) {
+            $this->_eventManager->dispatch(
+                'checkout_controller_onepage_save_shipping_method',
+                ['request' => $this->getRequest(), 'quote' => $this->getOnepage()->getQuote()]
             );
+            $this->getOnepage()->getQuote()->collectTotals();
+
+            $result['goto_section'] = 'payment';
+            $result['update_section'] = [
+                'name' => 'payment-method',
+                'html' => $this->_getPaymentMethodsHtml(),
+            ];
+            $result['update_progress'] = ['html' => $this->getProgressHtml($result['goto_section'])];
         }
+        $this->quoteRepository->save($this->getOnepage()->getQuote()->collectTotals());
+        return $this->resultJsonFactory->create()->setData($result);
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Onepage/ShippingMethod.php b/app/code/Magento/Checkout/Controller/Onepage/ShippingMethod.php
index 3b4d470fa597b..8653ed870cf0d 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/ShippingMethod.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/ShippingMethod.php
@@ -9,15 +9,14 @@
 class ShippingMethod extends \Magento\Checkout\Controller\Onepage
 {
     /**
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         if ($this->_expireAjax()) {
-            return;
+            return $this->_ajaxRedirectResponse();
         }
-        $this->_view->addPageLayoutHandles();
-        $this->_view->loadLayout(false);
-        $this->_view->renderLayout();
+
+        $this->resultLayoutFactory->create();
     }
 }
diff --git a/app/code/Magento/Checkout/Controller/Onepage/Success.php b/app/code/Magento/Checkout/Controller/Onepage/Success.php
index 53dffbf015217..22df006d4fac2 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/Success.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/Success.php
@@ -11,23 +11,22 @@ class Success extends \Magento\Checkout\Controller\Onepage
     /**
      * Order success action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         $session = $this->getOnepage()->getCheckout();
         if (!$this->_objectManager->get('Magento\Checkout\Model\Session\SuccessValidator')->isValid()) {
-            $this->_redirect('checkout/cart');
-            return;
+            return $this->resultRedirectFactory->create()->setPath('checkout/cart');
         }
         $session->clearQuote();
         //@todo: Refactor it to match CQRS
-        $this->_view->loadLayout();
-        $this->_view->getLayout()->initMessages();
+        $resultPage = $this->resultPageFactory->create();
+        $resultPage->getLayout()->initMessages();
         $this->_eventManager->dispatch(
             'checkout_onepage_controller_success_action',
             ['order_ids' => [$session->getLastOrderId()]]
         );
-        $this->_view->renderLayout();
+        return $resultPage;
     }
 }
diff --git a/app/code/Magento/Multishipping/Controller/Checkout.php b/app/code/Magento/Multishipping/Controller/Checkout.php
index baa5cffd12797..5482e8239be1f 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout.php
@@ -23,14 +23,22 @@ class Checkout extends \Magento\Checkout\Controller\Action implements
      * @param \Magento\Customer\Model\Session $customerSession
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $accountManagement
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Customer\Model\Session $customerSession,
         CustomerRepositoryInterface $customerRepository,
-        AccountManagementInterface $accountManagement
+        AccountManagementInterface $accountManagement,
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
     ) {
-        parent::__construct($context, $customerSession, $customerRepository, $accountManagement);
+        parent::__construct(
+            $context,
+            $customerSession,
+            $customerRepository,
+            $accountManagement,
+            $resultRedirectFactory
+        );
     }
 
     /**
@@ -122,16 +130,18 @@ public function dispatch(RequestInterface $request)
             }
         }
 
-        if (!$this->_preDispatchValidateCustomer()) {
+        $result = $this->_preDispatchValidateCustomer();
+        if ($result instanceof \Magento\Framework\Controller\ResultInterface) {
+            return $result;
+        }
+
+        if (!$result) {
             return $this->getResponse();
         }
 
-        if ($this->_getCheckoutSession()->getCartWasUpdated(
-            true
-        ) && !in_array(
-            $action,
-            ['index', 'login', 'register', 'addresses', 'success']
-        )
+        if ($this->_getCheckoutSession()->getCartWasUpdated(true)
+            &&
+            !in_array($action, ['index', 'login', 'register', 'addresses', 'success'])
         ) {
             $this->getResponse()->setRedirect($this->_getHelper()->getCartUrl());
             $this->_actionFlag->set('', self::FLAG_NO_DISPATCH, true);
diff --git a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
index 4e9fce82bde99..907aaa4d0c121 100644
--- a/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
+++ b/app/code/Magento/Multishipping/Controller/Checkout/OverviewPost.php
@@ -26,6 +26,7 @@ class OverviewPost extends \Magento\Multishipping\Controller\Checkout
      * @param \Magento\Customer\Model\Session $customerSession
      * @param CustomerRepositoryInterface $customerRepository
      * @param AccountManagementInterface $accountManagement
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      */
     public function __construct(
@@ -33,10 +34,17 @@ public function __construct(
         \Magento\Customer\Model\Session $customerSession,
         CustomerRepositoryInterface $customerRepository,
         AccountManagementInterface $accountManagement,
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
     ) {
         $this->formKeyValidator = $formKeyValidator;
-        parent::__construct($context, $customerSession, $customerRepository, $accountManagement);
+        parent::__construct(
+            $context,
+            $customerSession,
+            $customerRepository,
+            $accountManagement,
+            $resultRedirectFactory
+        );
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
index 716661bd022b1..1ed04b8f34b75 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
@@ -10,7 +10,6 @@
  */
 class ConfigureTest extends \PHPUnit_Framework_TestCase
 {
-
     /**
      * @var \Magento\Framework\ObjectManagerInterface | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -21,6 +20,11 @@ class ConfigureTest extends \PHPUnit_Framework_TestCase
      */
     protected $resultPageFactoryMock;
 
+    /**
+     * @var \Magento\Framework\Controller\Result\Redirect | \PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultRedirectMock;
+
     /**
      * @var \Magento\Framework\App\ResponseInterface | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -36,11 +40,6 @@ class ConfigureTest extends \PHPUnit_Framework_TestCase
      */
     protected $messageManagerMock;
 
-    /**
-     * @var \Magento\Framework\App\Response\RedirectInterface | \PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $redirectMock;
-
     /**
      * @var \Magento\Checkout\Controller\Cart\Configure | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -58,91 +57,37 @@ class ConfigureTest extends \PHPUnit_Framework_TestCase
 
     public function setUp()
     {
-        $eventManagerMock = $this->getMockBuilder('Magento\Framework\Event\ManagerInterface')
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMockForAbstractClass();
-        $urlMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMockForAbstractClass();
-        $actionFlagMock = $this->getMockBuilder('Magento\Framework\App\ActionFlag')
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMockForAbstractClass();
-        $viewMock = $this->getMockBuilder('Magento\Framework\App\ViewInterface')
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMockForAbstractClass();
-        $this->objectManagerMock = $this->getMockBuilder('Magento\Framework\ObjectManagerInterface')
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMockForAbstractClass();
-        $this->responseMock = $this->getMockBuilder('Magento\Framework\App\ResponseInterface')
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMockForAbstractClass();
-        $this->requestMock = $this->getMockBuilder('Magento\Framework\App\RequestInterface')
-            ->disableOriginalConstructor()
-            ->setMethods(['getParam'])
-            ->getMockForAbstractClass();
-        $this->messageManagerMock = $this->getMockBuilder('Magento\Framework\Message\ManagerInterface')
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMockForAbstractClass();
-        $this->redirectMock = $this->getMockBuilder('Magento\Framework\App\Response\RedirectInterface')
-            ->disableOriginalConstructor()
-            ->setMethods([])
-            ->getMock();
-
-        $this->contextMock = $this->getMockBuilder('Magento\Framework\App\Action\Context')
-            ->setConstructorArgs(
-                [
-                    $this->requestMock,
-                    $this->responseMock,
-                    $this->objectManagerMock,
-                    $eventManagerMock,
-                    $urlMock,
-                    $this->redirectMock,
-                    $actionFlagMock,
-                    $viewMock,
-                    $this->messageManagerMock
-                ]
-            )
-            ->setMethods([])
-            ->getMock();
-        $this->contextMock->expects($this->any())->method('getObjectManager')->willReturn($this->objectManagerMock);
-        $this->contextMock->expects($this->any())->method('getRequest')->willReturn($this->requestMock);
-        $this->contextMock->expects($this->any())->method('getResponse')->willReturn($this->responseMock);
-        $this->contextMock->expects($this->any())->method('getMessageManager')->willReturn($this->messageManagerMock);
-        $this->contextMock->expects($this->any())->method('getRedirect')->willReturn($this->redirectMock);
-        $scopeConfig = $this->getMockBuilder('Magento\Framework\App\Config\ScopeConfigInterface')
+        $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
+        $this->responseMock = $this->getMock('Magento\Framework\App\ResponseInterface');
+        $this->requestMock = $this->getMock('Magento\Framework\App\RequestInterface');
+        $this->messageManagerMock = $this->getMock('Magento\Framework\Message\ManagerInterface');
+        $this->cartMock = $this->getMockBuilder('Magento\Checkout\Model\Cart')
             ->disableOriginalConstructor()
             ->getMock();
-        $session = $this->getMockBuilder('Magento\Checkout\Model\Session')
+        $this->resultPageFactoryMock = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
             ->disableOriginalConstructor()
             ->getMock();
-        $storeManager = $this->getMockBuilder('Magento\Store\Model\StoreManagerInterface')
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $formKeyValidator = $this->getMockBuilder('Magento\Core\App\Action\FormKeyValidator')
-            ->disableOriginalConstructor()
-            ->getMockForAbstractClass();
-        $this->cartMock = $this->getMockBuilder('Magento\Checkout\Model\Cart')
+        $this->resultRedirectMock = $this->getMockBuilder('Magento\Framework\Controller\Result\Redirect')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->resultPageFactoryMock = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
+        $resultRedirectFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\RedirectFactory')
             ->disableOriginalConstructor()
             ->getMock();
-
-        $this->configureController = new \Magento\Checkout\Controller\Cart\Configure(
-            $this->contextMock,
-            $scopeConfig,
-            $session,
-            $storeManager,
-            $formKeyValidator,
-            $this->cartMock,
-            $this->resultPageFactoryMock
+        $resultRedirectFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->resultRedirectMock);
+
+        $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
+
+        $this->configureController = $objectManagerHelper->getObject('Magento\Checkout\Controller\Cart\Configure', [
+            'request' => $this->requestMock,
+            'response' => $this->responseMock,
+            'objectManager' => $this->objectManagerMock,
+            'messageManager' => $this->messageManagerMock,
+            'cart' => $this->cartMock,
+            'resultPageFactory' => $this->resultPageFactoryMock,
+            'resultRedirectFactory' => $resultRedirectFactoryMock
+            ]
         );
     }
 
@@ -231,20 +176,23 @@ public function testRedirectWithWrongProductId()
         $productMock = $this->getMockBuilder('Magento\Catalog\Model\Product')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->requestMock->expects($this->at(0))
+        $this->requestMock->expects($this->any())
             ->method('getParam')
-            ->with('id')
-            ->willReturn($quotaId);
-        $this->requestMock->expects($this->at(1))
-            ->method('getParam')
-            ->with('product_id')
-            ->willReturn($productIdInRequest);
+            ->willReturnMap([
+                ['id', null, $quotaId],
+                ['product_id', null, $productIdInRequest]
+            ]);
         $this->cartMock->expects($this->any())->method('getQuote')->willReturn($quoteMock);
         $quoteMock->expects($this->once())->method('getItemById')->willReturn($quoteItemMock);
-        $quoteItemMock->expects($this->exactly(1))->method('getProduct')->willReturn($productMock);
-        $productMock->expects($this->exactly(1))->method('getId')->willReturn($productIdInQuota);
-        $this->messageManagerMock->expects($this->once())->method('addError');
-        $this->redirectMock->expects($this->once())->method('redirect')->with($this->responseMock, 'checkout/cart', []);
-        $this->configureController->execute();
+        $quoteItemMock->expects($this->once())->method('getProduct')->willReturn($productMock);
+        $productMock->expects($this->once())->method('getId')->willReturn($productIdInQuota);
+        $this->messageManagerMock->expects($this->once())
+            ->method('addError')
+            ->willReturn('');
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('checkout/cart', [])
+            ->willReturnSelf();
+        $this->assertSame($this->resultRedirectMock, $this->configureController->execute());
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
index fa81eeeeb0128..2078ebe343e77 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
@@ -25,24 +25,15 @@ public function testGoBack()
 
         $requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
         $requestMock->expects($this->any())->method('getActionName')->will($this->returnValue('add'));
-        $requestMock->expects(
-            $this->at(0)
-        )->method(
-            'getParam'
-        )->with(
-            'return_url'
-        )->will(
-            $this->returnValue('http://malicious.com/')
-        );
+        $requestMock->expects($this->at(0))
+            ->method('getParam')
+            ->with('return_url')
+            ->will($this->returnValue('http://malicious.com/'));
         $requestMock->expects($this->any())->method('getParam')->will($this->returnValue(null));
         $redirect = $this->getMock('Magento\Framework\App\Response\RedirectInterface');
-        $redirect->expects(
-            $this->any()
-        )->method(
-            'getRefererUrl'
-        )->will(
-            $this->returnValue('http://some-url/index.php/product.html')
-        );
+        $redirect->expects($this->any())
+            ->method('getRefererUrl')
+            ->will($this->returnValue('http://some-url/index.php/product.html'));
 
         $checkoutSessionMock = $this->getMock(
             'Magento\Checkout\Model\Session',
@@ -51,38 +42,35 @@ public function testGoBack()
             '',
             false
         );
-        $checkoutSessionMock->expects(
-            $this->once()
-        )->method(
-            'setContinueShoppingUrl'
-        )->with(
-            'http://some-url/index.php/product.html'
-        )->will(
-            $this->returnSelf()
-        );
-
-        $redirect->expects(
-            $this->once()
-        )->method(
-            'redirect'
-        )->will(
-            $this->returnValue('http://some-url/index.php/checkout/cart/')
-        );
+        $checkoutSessionMock->expects($this->once())
+            ->method('setContinueShoppingUrl')
+            ->with('http://some-url/index.php/product.html')
+            ->will($this->returnSelf());
 
         $storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
         $storeMock->expects($this->any())->method('getBaseUrl')->will($this->returnValue('http://some-url/'));
 
         $configMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
-        $configMock->expects(
-            $this->once()
-        )->method(
-            'getValue'
-        )->with(
-            'checkout/cart/redirect_to_cart'
-        )->will(
-            $this->returnValue('1')
-        );
+        $configMock->expects($this->once())
+            ->method('getValue')
+            ->with('checkout/cart/redirect_to_cart')
+            ->will($this->returnValue('1'));
         $storeManagerMock->expects($this->any())->method('getStore')->will($this->returnValue($storeMock));
+
+        $resultRedirectMock = $this->getMockBuilder('Magento\Framework\Controller\Result\Redirect')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultRedirectFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\RedirectFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultRedirectFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($resultRedirectMock);
+        $resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with('checkout/cart')
+            ->willReturnSelf();
+
         $arguments = [
             'response' => $responseMock,
             'request' => $requestMock,
@@ -90,6 +78,7 @@ public function testGoBack()
             'scopeConfig' => $configMock,
             'redirect' => $redirect,
             'storeManager' => $storeManagerMock,
+            'resultRedirectFactory' => $resultRedirectFactoryMock
         ];
 
         $controller = $helper->getObject('Magento\Checkout\Controller\Cart', $arguments);
@@ -97,6 +86,6 @@ public function testGoBack()
         $reflectionObject = new \ReflectionObject($controller);
         $reflectionMethod = $reflectionObject->getMethod('_goBack');
         $reflectionMethod->setAccessible(true);
-        $reflectionMethod->invoke($controller);
+        $this->assertSame($resultRedirectMock, $reflectionMethod->invoke($controller));
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php
index 1fd79006a5b22..4afca46f269ae 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php
@@ -45,11 +45,6 @@ class IndexTest extends \PHPUnit_Framework_TestCase
      */
     private $sessionMock;
 
-    /**
-     * @var \PHPUnit_Framework_MockObject_MockObject
-     */
-    private $viewMock;
-
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject
      */
@@ -81,7 +76,7 @@ class IndexTest extends \PHPUnit_Framework_TestCase
     private $model;
 
     /**
-     * @var \Magento\Framework\View\Result\Page
+     * @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $resultPageMock;
 
@@ -95,6 +90,16 @@ class IndexTest extends \PHPUnit_Framework_TestCase
      */
     protected $titleMock;
 
+    /**
+     * @var \Magento\Framework\UrlInterface
+     */
+    protected $url;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultRedirectMock;
+
     public function setUp()
     {
         // mock objects
@@ -105,7 +110,6 @@ public function setUp()
         $this->contextMock = $this->basicMock('\Magento\Framework\App\Action\Context');
         $this->sessionMock = $this->basicMock('\Magento\Customer\Model\Session');
         $this->onepageMock = $this->basicMock('\Magento\Checkout\Model\Type\Onepage');
-        $this->viewMock = $this->basicMock('\Magento\Framework\App\ViewInterface');
         $this->layoutMock = $this->basicMock('\Magento\Framework\View\Layout');
         $this->requestMock = $this->basicMock('\Magento\Framework\App\RequestInterface');
         $this->responseMock = $this->basicMock('\Magento\Framework\App\ResponseInterface');
@@ -113,11 +117,27 @@ public function setUp()
         $this->resultPageMock = $this->basicMock('\Magento\Framework\View\Result\Page');
         $this->pageConfigMock = $this->basicMock('\Magento\Framework\View\Page\Config');
         $this->titleMock = $this->basicMock('\Magento\Framework\View\Page\Title');
+        $this->url = $this->getMock('Magento\Framework\UrlInterface');
+        $this->resultRedirectMock = $this->basicMock('Magento\Framework\Controller\Result\Redirect');
+
+        $resultPageFactoryMock = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultPageFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->resultPageMock);
+
+        $resultRedirectFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\RedirectFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultRedirectFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->resultRedirectMock);
 
         // stubs
         $this->basicStub($this->onepageMock, 'getQuote')->willReturn($this->quoteMock);
-        $this->basicStub($this->viewMock, 'getLayout')->willReturn($this->layoutMock);
-        $this->basicStub($this->viewMock, 'getPage')->willReturn($this->resultPageMock);
+        $this->basicStub($this->resultPageMock, 'getLayout')->willReturn($this->layoutMock);
+
         $this->basicStub($this->layoutMock, 'getBlock')
             ->willReturn($this->basicMock('Magento\Theme\Block\Html\Head'));
         $this->basicStub($this->resultPageMock, 'getConfig')->willReturn($this->pageConfigMock);
@@ -139,12 +159,12 @@ public function setUp()
             ->willReturn($this->basicMock('Magento\Framework\UrlInterface'));
         // context stubs
         $this->basicStub($this->contextMock, 'getObjectManager')->willReturn($this->objectManagerMock);
-        $this->basicStub($this->contextMock, 'getView')->willReturn($this->viewMock);
         $this->basicStub($this->contextMock, 'getRequest')->willReturn($this->requestMock);
         $this->basicStub($this->contextMock, 'getResponse')->willReturn($this->responseMock);
         $this->basicStub($this->contextMock, 'getMessageManager')
             ->willReturn($this->basicMock('\Magento\Framework\Message\ManagerInterface'));
         $this->basicStub($this->contextMock, 'getRedirect')->willReturn($this->redirectMock);
+        $this->basicStub($this->contextMock, 'getUrl')->willReturn($this->url);
 
         // SUT
         $this->model = $this->objectManager->getObject(
@@ -152,6 +172,8 @@ public function setUp()
             [
                 'context' => $this->contextMock,
                 'customerSession' => $this->sessionMock,
+                'resultPageFactory' => $resultPageFactoryMock,
+                'resultRedirectFactory' => $resultRedirectFactoryMock
             ]
         );
     }
@@ -165,24 +187,23 @@ public function testRegenerateSessionIdOnExecute()
         $this->basicStub($this->quoteMock, 'validateMinimumAmount')->willReturn(true);
 
         //Expected outcomes
-        $this->sessionMock->expects($this->once())
-            ->method('regenerateId');
-        $this->viewMock->expects($this->once())
-            ->method('renderLayout');
-
-        $this->model->execute();
+        $this->sessionMock->expects($this->once())->method('regenerateId');
+        $this->layoutMock->expects($this->once())
+            ->method('initMessages');
+        $this->assertSame($this->resultPageMock, $this->model->execute());
     }
 
     public function testOnepageCheckoutNotAvailable()
     {
         $this->basicStub($this->dataMock, 'canOnepageCheckout')->willReturn(false);
-
         $expectedPath = 'checkout/cart';
-        $this->redirectMock->expects($this->once())
-            ->method('redirect')
-            ->with($this->responseMock, $expectedPath, []);
 
-        $this->model->execute();
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with($expectedPath)
+            ->willReturnSelf();
+
+        $this->assertSame($this->resultRedirectMock, $this->model->execute());
     }
 
     public function testInvalidQuote()
@@ -190,11 +211,12 @@ public function testInvalidQuote()
         $this->basicStub($this->quoteMock, 'hasError')->willReturn(true);
 
         $expectedPath = 'checkout/cart';
-        $this->redirectMock->expects($this->once())
-            ->method('redirect')
-            ->with($this->responseMock, $expectedPath, []);
+        $this->resultRedirectMock->expects($this->once())
+            ->method('setPath')
+            ->with($expectedPath)
+            ->willReturnSelf();
 
-        $this->model->execute();
+        $this->assertSame($this->resultRedirectMock, $this->model->execute());
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php
index f94a6f7a71659..b366b616b91a3 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php
@@ -58,34 +58,32 @@ class SaveBillingTest extends \PHPUnit_Framework_TestCase
     protected $objectManagerMock;
 
     /**
-     * @var \Magento\Framework\App\View | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Config | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $view;
+    protected $scopeConfig;
 
     /**
-     * @var \Magento\Framework\App\Config | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\View\LayoutFactory | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $scopeConfig;
+    protected $layoutFactory;
 
     /**
-     * @var \Magento\Core\Helper\Data | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Controller\Result\Raw | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $coreHelper;
+    protected $resultRaw;
 
     /**
-     * @var \Magento\Framework\View\LayoutFactory | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Controller\Result\Json | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $layoutFactory;
+    protected $resultJson;
 
     protected function setUp()
     {
         $objectManager = new \Magento\TestFramework\Helper\ObjectManager($this);
 
-        $this->coreHelper = $this->getMock('Magento\Core\Helper\Data', [], [], '', false);
         $this->scopeConfig = $this->getMock('Magento\Framework\App\Config', [], [], '', false);
         $this->request = $this->getMock('Magento\Framework\App\Request\Http', ['getPost', 'isPost'], [], '', false);
         $this->response = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
-        $this->view = $this->getMock('Magento\Framework\App\View', [], [], '', false);
         $this->quote = $this->getMock(
             'Magento\Quote\Model\Quote',
             ['__wakeup', 'getHasError', 'hasItems', 'validateMinimumAmount', 'isVirtual', 'getStoreId'],
@@ -109,7 +107,6 @@ protected function setUp()
         $valueMap = [
             ['Magento\Checkout\Model\Type\Onepage', $this->onePage],
             ['Magento\Checkout\Model\Session', $this->checkoutSession],
-            ['Magento\Core\Helper\Data', $this->coreHelper],
         ];
         $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManager\ObjectManager', [], [], '', false);
         $this->objectManagerMock->expects($this->any())
@@ -131,16 +128,35 @@ protected function setUp()
         $context->expects($this->once())
             ->method('getEventManager')
             ->will($this->returnValue($this->eventManager));
-        $context->expects($this->once())
-            ->method('getView')
-            ->will($this->returnValue($this->view));
+
+        $this->resultRaw = $this->getMockBuilder('Magento\Framework\Controller\Result\Raw')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultRawFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\RawFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultRawFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($this->resultRaw);
+
+        $this->resultJson = $this->getMockBuilder('Magento\Framework\Controller\Result\Json')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JsonFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultJsonFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($this->resultJson);
 
         $this->controller = $objectManager->getObject(
             'Magento\Checkout\Controller\Onepage\SaveBilling',
             [
                 'context' => $context,
                 'scopeConfig' => $this->scopeConfig,
-                'layoutFactory' => $this->layoutFactory
+                'layoutFactory' => $this->layoutFactory,
+                'resultRawFactory' => $resultRawFactory,
+                'resultJsonFactory' => $resultJsonFactory
             ]
         );
     }
@@ -150,7 +166,13 @@ public function testExecute()
         $this->request->expects($this->once())
             ->method('isPost')
             ->willReturn(false);
-        $this->controller->execute();
+        $this->resultRaw->expects($this->exactly(2))
+            ->method('setHeader')
+            ->willReturnMap([
+                ['HTTP/1.1', '403 Session Expired', false, $this->resultRaw],
+                ['Login-Required', 'true', false, $this->resultRaw]
+            ]);
+        $this->assertSame($this->resultRaw, $this->controller->execute());
     }
 
     public function testValidateMinimumAmount()
@@ -213,17 +235,16 @@ public function testValidateMinimumAmount()
             ->willReturn($update);
         $update->expects($this->any())
             ->method('load');
-        $this->coreHelper->expects($this->once())
-            ->method('jsonEncode')
-            ->with($expectedResult);
-        $this->view->expects($this->any())
-            ->method('getLayout')
-            ->willReturn($layout);
         $layout->expects($this->any())
             ->method('getBlock')
             ->willReturn($block);
 
-        $this->controller->execute();
+        $this->resultJson->expects($this->once())
+            ->method('setData')
+            ->with($expectedResult)
+            ->willReturnSelf();
+
+        $this->assertSame($this->resultJson, $this->controller->execute());
     }
 
     public function testValidateMinimumAmountNegative()
@@ -258,10 +279,11 @@ public function testValidateMinimumAmountNegative()
             ->method('getPost')
             ->willReturn($data);
 
-        $this->coreHelper->expects($this->once())
-            ->method('jsonEncode')
-            ->with($expectedResult);
+        $this->resultJson->expects($this->once())
+            ->method('setData')
+            ->with($expectedResult)
+            ->willReturnSelf();
 
-        $this->controller->execute();
+        $this->assertSame($this->resultJson, $this->controller->execute());
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php
index a7f0903aee63d..888ad8b852e29 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php
@@ -58,24 +58,24 @@ class SaveShippingTest extends \PHPUnit_Framework_TestCase
     protected $objectManagerMock;
 
     /**
-     * @var \Magento\Framework\App\View | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\App\Config | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $view;
+    protected $scopeConfig;
 
     /**
-     * @var \Magento\Framework\App\Config | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\View\LayoutFactory | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $scopeConfig;
+    protected $layoutFactory;
 
     /**
-     * @var \Magento\Core\Helper\Data | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Controller\Result\Raw | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $coreHelper;
+    protected $resultRaw;
 
     /**
-     * @var \Magento\Framework\View\LayoutFactory | \PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Controller\Result\Json | \PHPUnit_Framework_MockObject_MockObject
      */
-    protected $layoutFactory;
+    protected $resultJson;
 
     protected function setUp()
     {
@@ -85,7 +85,6 @@ protected function setUp()
         $this->scopeConfig = $this->getMock('Magento\Framework\App\Config', [], [], '', false);
         $this->request = $this->getMock('Magento\Framework\App\Request\Http', ['getPost', 'isPost'], [], '', false);
         $this->response = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
-        $this->view = $this->getMock('Magento\Framework\App\View', [], [], '', false);
         $this->quote = $this->getMock(
             'Magento\Quote\Model\Quote',
             ['__wakeup', 'getHasError', 'hasItems', 'validateMinimumAmount', 'isVirtual', 'getStoreId'],
@@ -109,7 +108,6 @@ protected function setUp()
         $valueMap = [
             ['Magento\Checkout\Model\Type\Onepage', $this->onePage],
             ['Magento\Checkout\Model\Session', $this->checkoutSession],
-            ['Magento\Core\Helper\Data', $this->coreHelper],
         ];
         $this->objectManagerMock = $this->getMock('Magento\Framework\ObjectManager\ObjectManager', [], [], '', false);
         $this->objectManagerMock->expects($this->any())
@@ -131,16 +129,35 @@ protected function setUp()
         $context->expects($this->once())
             ->method('getEventManager')
             ->will($this->returnValue($this->eventManager));
-        $context->expects($this->once())
-            ->method('getView')
-            ->will($this->returnValue($this->view));
+
+        $this->resultRaw = $this->getMockBuilder('Magento\Framework\Controller\Result\Raw')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultRawFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\RawFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultRawFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($this->resultRaw);
+
+        $this->resultJson = $this->getMockBuilder('Magento\Framework\Controller\Result\Json')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JsonFactory')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $resultJsonFactory->expects($this->any())
+            ->method('create')
+            ->willReturn($this->resultJson);
 
         $this->controller = $objectManager->getObject(
             'Magento\Checkout\Controller\Onepage\SaveShipping',
             [
                 'context' => $context,
                 'scopeConfig' => $this->scopeConfig,
-                'layoutFactory' => $this->layoutFactory
+                'layoutFactory' => $this->layoutFactory,
+                'resultRawFactory' => $resultRawFactory,
+                'resultJsonFactory' => $resultJsonFactory
             ]
         );
     }
@@ -150,7 +167,13 @@ public function testExecute()
         $this->request->expects($this->once())
             ->method('isPost')
             ->willReturn(false);
-        $this->controller->execute();
+        $this->resultRaw->expects($this->exactly(2))
+            ->method('setHeader')
+            ->willReturnMap([
+                ['HTTP/1.1', '403 Session Expired', false, $this->resultRaw],
+                ['Login-Required', 'true', false, $this->resultRaw]
+            ]);
+        $this->assertSame($this->resultRaw, $this->controller->execute());
     }
 
     public function testValidateMinimumAmount()
@@ -183,9 +206,6 @@ public function testValidateMinimumAmount()
             ->method('getPost')
             ->willReturn($data);
 
-        $this->coreHelper->expects($this->once())
-            ->method('jsonEncode')
-            ->with($expectedResult);
         $layout = $this->getMock(
             'Magento\Framework\View\Layout',
             ['getUpdate', 'generateXml', 'generateElements', 'getOutput', 'getBlock'],
@@ -214,14 +234,16 @@ public function testValidateMinimumAmount()
             ->willReturn($update);
         $update->expects($this->any())
             ->method('load');
-        $this->view->expects($this->any())
-            ->method('getLayout')
-            ->willReturn($layout);
         $layout->expects($this->any())
             ->method('getBlock')
             ->willReturn($block);
 
-        $this->controller->execute();
+        $this->resultJson->expects($this->once())
+            ->method('setData')
+            ->with($expectedResult)
+            ->willReturnSelf();
+
+        $this->assertSame($this->resultJson, $this->controller->execute());
     }
 
     public function testValidateMinimumAmountNegative()
@@ -256,10 +278,11 @@ public function testValidateMinimumAmountNegative()
             ->method('getPost')
             ->willReturn($data);
 
-        $this->coreHelper->expects($this->once())
-            ->method('jsonEncode')
-            ->with($expectedResult);
+        $this->resultJson->expects($this->once())
+            ->method('setData')
+            ->with($expectedResult)
+            ->willReturnSelf();
 
-        $this->controller->execute();
+        $this->assertSame($this->resultJson, $this->controller->execute());
     }
 }

From 1e2f5ea020bf0f337ca403d4c94da2a91c6d7957 Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Tue, 27 Jan 2015 17:29:40 +0200
Subject: [PATCH 20/94] MAGETWO-33058: Refactor Checkout module

---
 .../Magento/Checkout/Controller/Cart/ConfigureTest.php          | 1 +
 .../unit/testsuite/Magento/Checkout/Controller/CartTest.php     | 1 +
 .../testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php | 2 ++
 .../Magento/Checkout/Controller/Onepage/SaveBillingTest.php     | 2 ++
 .../Magento/Checkout/Controller/Onepage/SaveShippingTest.php    | 2 ++
 5 files changed, 8 insertions(+)

diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
index 1ed04b8f34b75..864a7a7871de4 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
@@ -72,6 +72,7 @@ public function setUp()
             ->getMock();
         $resultRedirectFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\RedirectFactory')
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
         $resultRedirectFactoryMock->expects($this->any())
             ->method('create')
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
index 2078ebe343e77..aa6eaad579e31 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/CartTest.php
@@ -62,6 +62,7 @@ public function testGoBack()
             ->getMock();
         $resultRedirectFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\RedirectFactory')
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
         $resultRedirectFactoryMock->expects($this->any())
             ->method('create')
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php
index 4afca46f269ae..2cc5744a793b4 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/IndexTest.php
@@ -122,6 +122,7 @@ public function setUp()
 
         $resultPageFactoryMock = $this->getMockBuilder('Magento\Framework\View\Result\PageFactory')
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
         $resultPageFactoryMock->expects($this->any())
             ->method('create')
@@ -129,6 +130,7 @@ public function setUp()
 
         $resultRedirectFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\RedirectFactory')
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
         $resultRedirectFactoryMock->expects($this->any())
             ->method('create')
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php
index b366b616b91a3..e2eaa99645d40 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveBillingTest.php
@@ -134,6 +134,7 @@ protected function setUp()
             ->getMock();
         $resultRawFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\RawFactory')
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
         $resultRawFactory->expects($this->any())
             ->method('create')
@@ -144,6 +145,7 @@ protected function setUp()
             ->getMock();
         $resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JsonFactory')
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
         $resultJsonFactory->expects($this->any())
             ->method('create')
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php
index 888ad8b852e29..b1068f2f43d1f 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Onepage/SaveShippingTest.php
@@ -135,6 +135,7 @@ protected function setUp()
             ->getMock();
         $resultRawFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\RawFactory')
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
         $resultRawFactory->expects($this->any())
             ->method('create')
@@ -145,6 +146,7 @@ protected function setUp()
             ->getMock();
         $resultJsonFactory = $this->getMockBuilder('Magento\Framework\Controller\Result\JsonFactory')
             ->disableOriginalConstructor()
+            ->setMethods(['create'])
             ->getMock();
         $resultJsonFactory->expects($this->any())
             ->method('create')

From 4a70e04546e0daa4cc507d3025f16198adb2d416 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Tue, 27 Jan 2015 17:36:08 +0200
Subject: [PATCH 21/94] MAGETWO-33060: Refactor __() to return Phrase object

---
 app/code/Magento/Payment/Block/Info/Cc.php         |  8 ++++----
 app/code/Magento/Store/Ui/DataProvider/Options.php |  2 +-
 app/functions.php                                  | 10 ++--------
 lib/internal/Magento/Framework/Phrase.php          | 13 ++++++++++++-
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Payment/Block/Info/Cc.php b/app/code/Magento/Payment/Block/Info/Cc.php
index 9f68446b4babb..0cb99fe22f0d8 100644
--- a/app/code/Magento/Payment/Block/Info/Cc.php
+++ b/app/code/Magento/Payment/Block/Info/Cc.php
@@ -97,19 +97,19 @@ protected function _prepareSpecificInformation($transport = null)
         $transport = parent::_prepareSpecificInformation($transport);
         $data = [];
         if ($ccType = $this->getCcTypeName()) {
-            $data[__('Credit Card Type')] = $ccType;
+            $data[(string)__('Credit Card Type')] = $ccType;
         }
         if ($this->getInfo()->getCcLast4()) {
-            $data[__('Credit Card Number')] = sprintf('xxxx-%s', $this->getInfo()->getCcLast4());
+            $data[(string)__('Credit Card Number')] = sprintf('xxxx-%s', $this->getInfo()->getCcLast4());
         }
         if (!$this->getIsSecureMode()) {
             if ($ccSsIssue = $this->getInfo()->getCcSsIssue()) {
-                $data[__('Switch/Solo/Maestro Issue Number')] = $ccSsIssue;
+                $data[(string)__('Switch/Solo/Maestro Issue Number')] = $ccSsIssue;
             }
             $year = $this->getInfo()->getCcSsStartYear();
             $month = $this->getInfo()->getCcSsStartMonth();
             if ($year && $month) {
-                $data[__('Switch/Solo/Maestro Start Date')] = $this->_formatCardDate($year, $month);
+                $data[(string)__('Switch/Solo/Maestro Start Date')] = $this->_formatCardDate($year, $month);
             }
         }
         return $transport->setData(array_merge($data, $transport->getData()));
diff --git a/app/code/Magento/Store/Ui/DataProvider/Options.php b/app/code/Magento/Store/Ui/DataProvider/Options.php
index 25f61ba769812..950f5bbb60693 100644
--- a/app/code/Magento/Store/Ui/DataProvider/Options.php
+++ b/app/code/Magento/Store/Ui/DataProvider/Options.php
@@ -53,7 +53,7 @@ public function getOptions(array $options = [])
         $storeCollection = $this->systemStore->getStoreCollection();
 
         $currentOptions = [
-            __('All Store Views') => [
+            (string)__('All Store Views') => [
                 'label' => __('All Store Views'),
                 'value' => 0,
             ],
diff --git a/app/functions.php b/app/functions.php
index 03a3b3cab885d..fd363310d8e85 100644
--- a/app/functions.php
+++ b/app/functions.php
@@ -7,7 +7,7 @@
 /**
  * Create value-object \Magento\Framework\Phrase
  *
- * @return string
+ * @return \Magento\Framework\Phrase
  */
 function __()
 {
@@ -18,11 +18,5 @@ function __()
         $argc = $argc[0];
     }
 
-    /**
-     * Type casting to string is a workaround.
-     * Many places in client code at the moment are unable to handle the \Magento\Framework\Phrase object properly.
-     * The intended behavior is to use __toString(),
-     * so that rendering of the phrase happens only at the last moment when needed
-     */
-    return (string)new \Magento\Framework\Phrase($text, $argc);
+    return new \Magento\Framework\Phrase($text, $argc);
 }
diff --git a/lib/internal/Magento/Framework/Phrase.php b/lib/internal/Magento/Framework/Phrase.php
index b952f8bb5b3cc..80dc48cac2165 100644
--- a/lib/internal/Magento/Framework/Phrase.php
+++ b/lib/internal/Magento/Framework/Phrase.php
@@ -7,9 +7,10 @@
  */
 namespace Magento\Framework;
 
+use Zend\Stdlib\JsonSerializable;
 use Magento\Framework\Phrase\RendererInterface;
 
-class Phrase
+class Phrase implements JsonSerializable
 {
     /**
      * Default phrase renderer. Allows stacking renderers that "don't know about each other"
@@ -84,4 +85,14 @@ public function __toString()
     {
         return $this->render();
     }
+
+    /**
+     * Specify data which should be serialized to JSON
+     *
+     * @return string
+     */
+    public function jsonSerialize()
+    {
+        return $this->render();
+    }
 }

From 084fc7a46cd7111ca3a8d751e1713f3afa5c354c Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Tue, 27 Jan 2015 18:01:23 +0200
Subject: [PATCH 22/94] MAGETWO-33059: Refactor CMS module

---
 .../Magento/Cms/Controller/Noroute/Index.php  | 10 +---
 .../Adminhtml/Wysiwyg/DirectiveTest.php       | 46 ++++++++++++++-----
 .../IndexTest.php}                            | 38 +++++++++++----
 3 files changed, 66 insertions(+), 28 deletions(-)
 rename dev/tests/unit/testsuite/Magento/Cms/Controller/{NorouteTest.php => Noroute/IndexTest.php} (68%)

diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php
index 4f45c61c9676b..7a56b79b17d12 100755
--- a/app/code/Magento/Cms/Controller/Noroute/Index.php
+++ b/app/code/Magento/Cms/Controller/Noroute/Index.php
@@ -8,11 +8,6 @@
 
 class Index extends \Magento\Framework\App\Action\Action
 {
-    /**
-     * @var \Magento\Framework\View\Result\LayoutFactory
-     */
-    protected $resultLayoutFactory;
-
     /**
      * @var \Magento\Backend\Model\View\Result\ForwardFactory
      */
@@ -20,15 +15,12 @@ class Index extends \Magento\Framework\App\Action\Action
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
-        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
         \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
     ) {
-        $this->resultLayoutFactory = $resultLayoutFactory;
         $this->resultForwardFactory = $resultForwardFactory;
         parent::__construct($context);
     }
@@ -36,7 +28,7 @@ public function __construct(
     /**
      * Render CMS 404 Not found page
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\Forward
      */
     public function execute()
     {
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
index ffd990dfc3bfb..9fd60466969ed 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
@@ -68,6 +68,16 @@ class DirectiveTest extends \PHPUnit_Framework_TestCase
      */
     protected $loggerMock;
 
+    /**
+     * @var \Magento\Framework\Controller\Result\RawFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $rawFactoryMock;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\Raw|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $rawMock;
+
     protected function setUp()
     {
         $this->actionContextMock = $this->getMockBuilder('Magento\Backend\App\Action\Context')
@@ -117,6 +127,13 @@ protected function setUp()
         $this->loggerMock = $this->getMockBuilder('Psr\Log\LoggerInterface')
             ->disableOriginalConstructor()
             ->getMock();
+        $this->rawFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\Result\RawFactory')
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->rawMock = $this->getMockBuilder('Magento\Framework\Controller\Result\Raw')
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->actionContextMock->expects($this->any())
             ->method('getRequest')
@@ -133,7 +150,8 @@ protected function setUp()
             'Magento\Cms\Controller\Adminhtml\Wysiwyg\Directive',
             [
                 'context' => $this->actionContextMock,
-                'urlDecoder' => $this->urlDecoderMock
+                'urlDecoder' => $this->urlDecoderMock,
+                'resultRawFactory' => $this->rawFactoryMock
             ]
         );
     }
@@ -153,17 +171,20 @@ public function testExecute()
         $this->imageAdapterMock->expects($this->once())
             ->method('getMimeType')
             ->willReturn($mimeType);
-        $this->responseMock->expects($this->once())
+        $this->rawMock->expects($this->once())
             ->method('setHeader')
             ->with('Content-Type', $mimeType)
             ->willReturnSelf();
+        $this->rawMock->expects($this->once())
+            ->method('setContents')
+            ->with($imageBody)
+            ->willReturnSelf();
         $this->imageAdapterMock->expects($this->once())
             ->method('getImage')
             ->willReturn($imageBody);
-        $this->responseMock->expects($this->once())
-            ->method('setBody')
-            ->with($imageBody)
-            ->willReturnSelf();
+        $this->rawFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->rawMock);
 
         $this->wysiwygDirective->execute();
     }
@@ -192,20 +213,23 @@ public function testExecuteException()
         $this->imageAdapterMock->expects($this->once())
             ->method('getMimeType')
             ->willReturn($mimeType);
-        $this->responseMock->expects($this->once())
+        $this->rawMock->expects($this->once())
             ->method('setHeader')
             ->with('Content-Type', $mimeType)
             ->willReturnSelf();
+        $this->rawMock->expects($this->once())
+            ->method('setContents')
+            ->with($imageBody)
+            ->willReturnSelf();
         $this->imageAdapterMock->expects($this->once())
             ->method('getImage')
             ->willReturn($imageBody);
-        $this->responseMock->expects($this->once())
-            ->method('setBody')
-            ->with($imageBody)
-            ->willReturnSelf();
         $this->loggerMock->expects($this->once())
             ->method('critical')
             ->with($exception);
+        $this->rawFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->rawMock);
 
         $this->wysiwygDirective->execute();
     }
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/NorouteTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
similarity index 68%
rename from dev/tests/unit/testsuite/Magento/Cms/Controller/NorouteTest.php
rename to dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
index 68d0d721d1a60..167cbb34125a4 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/NorouteTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
@@ -3,12 +3,12 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Cms\Controller;
+namespace Magento\Cms\Controller\Noroute;
 
-class NorouteTest extends \PHPUnit_Framework_TestCase
+class IndexTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Cms\Controller\Noroute
+     * @var \Magento\Cms\Controller\Noroute\Index
      */
     protected $_controller;
 
@@ -22,12 +22,32 @@ class NorouteTest extends \PHPUnit_Framework_TestCase
      */
     protected $_requestMock;
 
+    /**
+     * @var \Magento\Backend\Model\View\Result\ForwardFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $forwardFactoryMock;
+
+    /**
+     * @var \Magento\Backend\Model\View\Result\Forward|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $forwardMock;
+
     protected function setUp()
     {
         $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
         $objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
         $responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
-        $responseMock->expects(
+        $this->forwardFactoryMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\ForwardFactory')
+            ->setMethods(['create'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->forwardMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\Forward')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->forwardFactoryMock->expects($this->any())
+            ->method('create')
+            ->willReturn($this->forwardMock);
+        $this->forwardMock->expects(
             $this->at(0)
         )->method(
             'setHeader'
@@ -35,9 +55,9 @@ protected function setUp()
             'HTTP/1.1',
             '404 Not Found'
         )->will(
-            $this->returnValue($responseMock)
+            $this->returnSelf()
         );
-        $responseMock->expects(
+        $this->forwardMock->expects(
             $this->at(1)
         )->method(
             'setHeader'
@@ -45,7 +65,7 @@ protected function setUp()
             'Status',
             '404 File not found'
         )->will(
-            $this->returnValue($responseMock)
+            $this->returnSelf()
         );
 
         $scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
@@ -71,7 +91,9 @@ protected function setUp()
         );
         $this->_controller = $helper->getObject(
             'Magento\Cms\Controller\Noroute\Index',
-            ['response' => $responseMock, 'objectManager' => $objectManagerMock, 'request' => $this->_requestMock]
+            ['response' => $responseMock, 'objectManager' => $objectManagerMock, 'request' => $this->_requestMock,
+            'resultForwardFactory' => $this->forwardFactoryMock
+            ]
         );
     }
 

From bce58ca7bd44ad8baa1456bddc4b8a8e4813cdcd Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Tue, 27 Jan 2015 18:10:55 +0200
Subject: [PATCH 23/94] MAGETWO-31524: Refactor controller actions in the CMS
 module

---
 .../Cms/Controller/Adminhtml/Block/Index.php  |  2 +-
 .../Controller/Adminhtml/Block/NewAction.php  |  2 +-
 .../Cms/Controller/Adminhtml/Block/Save.php   |  2 +-
 .../Magento/Cms/Controller/Index/Index.php    | 10 ++++---
 .../Cms/Controller/Index/NoCookies.php        |  8 +++---
 app/code/Magento/Cms/Controller/Page/View.php |  8 +++---
 app/code/Magento/Cms/Helper/Page.php          | 27 ++++++++++++-------
 7 files changed, 37 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Page/View.php
 mode change 100644 => 100755 app/code/Magento/Cms/Helper/Page.php

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
index fd50ccad4c301..9a68f03df08b3 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
@@ -30,7 +30,7 @@ public function __construct(
     /**
      * Index action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
index e4355e91af57e..bc87b5cb8089f 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php
@@ -30,7 +30,7 @@ public function __construct(
     /**
      * Create new CMS block
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
index 48d7dc97c19dd..b1006419ecbee 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php
@@ -30,7 +30,7 @@ public function __construct(
     /**
      * Save action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php
index c028d11c53c02..0200f0fe868d6 100755
--- a/app/code/Magento/Cms/Controller/Index/Index.php
+++ b/app/code/Magento/Cms/Controller/Index/Index.php
@@ -34,17 +34,19 @@ public function __construct(
      */
     public function execute($coreRoute = null)
     {
-        /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
-        $resultForward = $this->resultForwardFactory->create();
         $pageId = $this->_objectManager->get(
             'Magento\Framework\App\Config\ScopeConfigInterface'
         )->getValue(
             \Magento\Cms\Helper\Page::XML_PATH_HOME_PAGE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
-        if (!$this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId)) {
+        $resultPage = $this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId);
+        if (!$resultPage) {
+            /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
+            $resultForward = $this->resultForwardFactory->create();
             $resultForward->forward('defaultIndex');
+            return $resultForward;
         }
-        return $resultForward;
+        return $resultPage;
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Index/NoCookies.php b/app/code/Magento/Cms/Controller/Index/NoCookies.php
index f7b052e795ee1..525811c57bea1 100755
--- a/app/code/Magento/Cms/Controller/Index/NoCookies.php
+++ b/app/code/Magento/Cms/Controller/Index/NoCookies.php
@@ -28,11 +28,10 @@ public function __construct(
     /**
      * Render Disable cookies page
      *
-     * @return void
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
-        $resultForward = $this->resultForwardFactory->create();
         $pageId = $this->_objectManager->get(
             'Magento\Framework\App\Config\ScopeConfigInterface',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -40,8 +39,11 @@ public function execute()
             \Magento\Cms\Helper\Page::XML_PATH_NO_COOKIES_PAGE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
-        if (!$this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId)) {
+        $resultPage = $this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId);
+        if (!$resultPage) {
+            $resultForward = $this->resultForwardFactory->create();
             return $resultForward->forward('defaultNoCookies');
         }
+        return $resultPage;
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Page/View.php b/app/code/Magento/Cms/Controller/Page/View.php
old mode 100644
new mode 100755
index 6bf2d0293af29..a7e92fda6ec51
--- a/app/code/Magento/Cms/Controller/Page/View.php
+++ b/app/code/Magento/Cms/Controller/Page/View.php
@@ -28,14 +28,16 @@ public function __construct(
     /**
      * View CMS page action
      *
-     * @return \Magento\Backend\Model\View\Result\ForwardFactory
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
-        $resultForward = $this->resultForwardFactory->create();
         $pageId = $this->getRequest()->getParam('page_id', $this->getRequest()->getParam('id', false));
-        if (!$this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId)) {
+        $resultPage = $this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId);
+        if (!$resultPage) {
+            $resultForward = $this->resultForwardFactory->create();
             return $resultForward->forward('noroute');
         }
+        return $resultPage;
     }
 }
diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
old mode 100644
new mode 100755
index b6ce2979c70d2..5b87e413df975
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -80,6 +80,11 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $pageConfig;
 
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    protected $resultPageFactory;
+
     /**
      * Constructor
      *
@@ -93,6 +98,7 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
      * @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)
      */
     public function __construct(
@@ -105,7 +111,8 @@ 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\Page\Config $pageConfig,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory
     ) {
         $this->messageManager = $messageManager;
         $this->_view = $view;
@@ -117,6 +124,7 @@ public function __construct(
         $this->_localeDate = $localeDate;
         $this->_escaper = $escaper;
         $this->pageConfig = $pageConfig;
+        $this->resultPageFactory = $resultPageFactory;
         parent::__construct($context);
     }
 
@@ -127,7 +135,7 @@ public function __construct(
      *
      * @param Action $action
      * @param int $pageId
-     * @return bool
+     * @return bool|\Magento\Framework\View\Result\Page
      */
     public function renderPage(Action $action, $pageId = null)
     {
@@ -139,12 +147,12 @@ public function renderPage(Action $action, $pageId = null)
      *
      * @param Action $action
      * @param int $pageId
-     * @param bool $renderLayout
-     * @return bool
+     * @param bool $returnPage
+     * @return bool|\Magento\Framework\View\Result\Page
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    protected function _renderPage(Action $action, $pageId = null, $renderLayout = true)
+    protected function _renderPage(Action $action, $pageId = null, $returnPage = true)
     {
         if (!is_null($pageId) && $pageId !== $this->_page->getId()) {
             $delimiterPosition = strrpos($pageId, '|');
@@ -173,7 +181,8 @@ protected function _renderPage(Action $action, $pageId = null, $renderLayout = t
                 $this->_design->setDesignTheme($this->_page->getCustomTheme());
             }
         }
-        $resultPage = $this->_view->getPage();
+        /** @var \Magento\Framework\View\Result\Page $resultPage */
+        $resultPage = $this->resultPageFactory->create();
         if ($this->_page->getPageLayout()) {
             if ($this->_page->getCustomPageLayout()
                 && $this->_page->getCustomPageLayout() != 'empty'
@@ -214,8 +223,8 @@ protected function _renderPage(Action $action, $pageId = null, $renderLayout = t
         $messageBlock->addStorageType($this->messageManager->getDefaultGroup());
         $messageBlock->addMessages($this->messageManager->getMessages(true));
 
-        if ($renderLayout) {
-            $this->_view->renderLayout();
+        if ($returnPage) {
+            return $resultPage;
         }
 
         return true;
@@ -229,7 +238,7 @@ protected function _renderPage(Action $action, $pageId = null, $renderLayout = t
      * @param Action $action
      * @param int $pageId
      * @param bool $renderLayout
-     * @return bool
+     * @return bool|\Magento\Framework\View\Result\Page
      */
     public function renderPageExtended(Action $action, $pageId = null, $renderLayout = true)
     {

From bc1c40be205f96013158451cf29e0dc00e7aeaa7 Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Wed, 28 Jan 2015 12:10:19 +0200
Subject: [PATCH 24/94] MAGETWO-33061: Fix annotations of the methods that
 return __()

---
 .../Block/System/Messages/UnreadMessagePopup.php          | 2 +-
 .../AdminNotification/Model/System/Message/Baseurl.php    | 2 +-
 .../Model/System/Message/Media/Synchronization/Error.php  | 2 +-
 .../System/Message/Media/Synchronization/Success.php      | 2 +-
 .../AdminNotification/Model/System/Message/Security.php   | 2 +-
 app/code/Magento/Backend/Block/System/Account/Edit.php    | 2 +-
 app/code/Magento/Backend/Block/System/Store/Delete.php    | 2 +-
 app/code/Magento/Backend/Block/System/Variable/Edit.php   | 2 +-
 .../Backend/Block/Widget/Grid/Column/Renderer/Store.php   | 4 ++--
 .../Backend/Model/Config/Structure/AbstractElement.php    | 2 +-
 .../Backend/Model/Config/Structure/Element/Field.php      | 2 +-
 .../Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php   | 4 ++--
 .../Bundle/Block/Catalog/Product/View/Type/Bundle.php     | 2 +-
 app/code/Magento/Bundle/Model/Product/Type.php            | 4 ++--
 .../Catalog/Block/Adminhtml/Category/Edit/Form.php        | 2 +-
 .../Block/Adminhtml/Form/Renderer/Config/YearRange.php    | 2 +-
 .../Catalog/Block/Adminhtml/Product/Attribute/Edit.php    | 2 +-
 .../Block/Adminhtml/Product/Attribute/Set/Main.php        | 2 +-
 .../Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php | 2 +-
 .../Adminhtml/Product/Attribute/Set/Toolbar/Main.php      | 2 +-
 .../Product/Edit/Action/Attribute/Tab/Attributes.php      | 4 ++--
 .../Product/Edit/Action/Attribute/Tab/Inventory.php       | 4 ++--
 .../Product/Edit/Action/Attribute/Tab/Websites.php        | 4 ++--
 .../Block/Adminhtml/Product/Helper/Form/BaseImage.php     | 2 +-
 .../Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php     | 2 +-
 app/code/Magento/Catalog/Block/Category/Rss/Link.php      | 2 +-
 .../Magento/Catalog/Block/Product/Compare/ListCompare.php | 2 +-
 app/code/Magento/Catalog/Helper/Product.php               | 2 +-
 app/code/Magento/Catalog/Model/Layer/Filter/Category.php  | 2 +-
 app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php   | 2 +-
 app/code/Magento/Catalog/Model/Layer/Filter/Price.php     | 4 ++--
 .../Magento/Catalog/Model/Layer/Filter/Price/Render.php   | 2 +-
 .../Model/Product/Attribute/Backend/GroupPrice.php        | 2 +-
 .../Attribute/Backend/GroupPrice/AbstractGroupPrice.php   | 2 +-
 .../Catalog/Model/Product/Attribute/Backend/Tierprice.php | 2 +-
 .../Magento/Catalog/Model/Product/Option/Type/Select.php  | 2 +-
 .../Magento/Catalog/Model/Product/Type/AbstractType.php   | 2 +-
 .../CatalogRule/Block/Adminhtml/Promo/Catalog/Edit.php    | 2 +-
 .../Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php    | 4 ++--
 .../Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php | 4 ++--
 .../Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php       | 4 ++--
 app/code/Magento/CatalogSearch/Block/Result.php           | 4 ++--
 .../Magento/CatalogSearch/Model/Layer/Filter/Category.php | 2 +-
 .../Magento/CatalogSearch/Model/Layer/Filter/Decimal.php  | 2 +-
 .../Magento/CatalogSearch/Model/Layer/Filter/Price.php    | 2 +-
 app/code/Magento/Centinel/Block/Adminhtml/Validation.php  | 2 +-
 app/code/Magento/Centinel/Helper/Data.php                 | 8 ++++----
 app/code/Magento/Checkout/Block/Adminhtml/CartTab.php     | 2 +-
 app/code/Magento/Checkout/Block/Cart/Link.php             | 2 +-
 .../CheckoutAgreements/Block/Adminhtml/Agreement/Edit.php | 2 +-
 app/code/Magento/Cms/Block/Adminhtml/Block/Edit.php       | 2 +-
 app/code/Magento/Cms/Block/Adminhtml/Page/Edit.php        | 2 +-
 .../Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Content.php | 4 ++--
 .../Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php  | 4 ++--
 .../Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Main.php    | 4 ++--
 .../Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Meta.php    | 4 ++--
 .../Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php   | 2 +-
 .../Block/Adminhtml/Product/Edit/Tab/Super/Config.php     | 4 ++--
 .../Model/Product/Type/Configurable.php                   | 4 ++--
 app/code/Magento/Core/Model/File/Storage/Database.php     | 2 +-
 app/code/Magento/Core/Model/File/Storage/File.php         | 2 +-
 app/code/Magento/Core/Model/Layout/Translator.php         | 2 +-
 app/code/Magento/Core/Model/Variable.php                  | 2 +-
 .../CurrencySymbol/Block/Adminhtml/System/Currency.php    | 2 +-
 .../Block/Adminhtml/System/Currencysymbol.php             | 4 ++--
 app/code/Magento/Customer/Block/Account/Dashboard.php     | 2 +-
 .../Magento/Customer/Block/Account/Dashboard/Address.php  | 4 ++--
 app/code/Magento/Customer/Block/Adminhtml/Edit.php        | 2 +-
 .../Block/Adminhtml/Edit/Renderer/Attribute/Group.php     | 2 +-
 .../Customer/Block/Adminhtml/Edit/Tab/Newsletter.php      | 4 ++--
 .../Edit/Tab/Newsletter/Grid/Renderer/Status.php          | 4 ++--
 .../Magento/Customer/Block/Adminhtml/Edit/Tab/View.php    | 4 ++--
 .../Block/Adminhtml/Edit/Tab/View/PersonalInfo.php        | 4 ++--
 .../Customer/Block/Adminhtml/Form/Element/File.php        | 2 +-
 .../Customer/Block/Adminhtml/Form/Element/Image.php       | 2 +-
 app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php  | 2 +-
 app/code/Magento/Customer/Block/Widget/Dob.php            | 2 +-
 .../DesignEditor/Block/Adminhtml/Editor/Container.php     | 2 +-
 .../DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php | 4 ++--
 .../Block/Adminhtml/Editor/Tools/Files/Content.php        | 2 +-
 .../Block/Adminhtml/Editor/Tools/Files/Content/Files.php  | 2 +-
 .../Block/Adminhtml/Editor/Tools/Files/Tree.php           | 2 +-
 .../Block/Adminhtml/Editor/Tools/Tabs/AbstractTabs.php    | 2 +-
 .../Adminhtml/Theme/Selector/SelectorList/Assigned.php    | 2 +-
 .../Adminhtml/Theme/Selector/SelectorList/Available.php   | 2 +-
 .../Adminhtml/Theme/Selector/SelectorList/Unassigned.php  | 2 +-
 .../Block/Adminhtml/Theme/Selector/Tab/Available.php      | 2 +-
 .../Block/Adminhtml/Theme/Selector/Tab/Customizations.php | 2 +-
 .../Magento/Directory/Model/Currency/Import/Config.php    | 2 +-
 .../Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php   | 4 ++--
 .../Downloadable/Block/Customer/Products/ListProducts.php | 2 +-
 app/code/Magento/Downloadable/Model/Product/Type.php      | 2 +-
 app/code/Magento/Email/Block/Adminhtml/Template.php       | 2 +-
 app/code/Magento/Email/Block/Adminhtml/Template/Edit.php  | 2 +-
 .../Email/Block/Adminhtml/Template/Grid/Renderer/Type.php | 2 +-
 app/code/Magento/Email/Model/Template/Config.php          | 2 +-
 .../Catalog/Product/Edit/Tab/Googleoptimizer.php          | 4 ++--
 .../Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php | 4 ++--
 .../Magento/GoogleShopping/Block/Adminhtml/Types/Edit.php | 2 +-
 .../Block/Product/Grouped/AssociatedProducts.php          | 2 +-
 .../Magento/GroupedProduct/Model/Product/Type/Grouped.php | 2 +-
 .../Magento/ImportExport/Block/Adminhtml/Export/Edit.php  | 2 +-
 .../ImportExport/Block/Adminhtml/Export/Filter.php        | 4 ++--
 .../Magento/ImportExport/Block/Adminhtml/Import/Edit.php  | 2 +-
 .../Block/Backend/Grid/Column/Renderer/Updated.php        | 2 +-
 .../Integration/Block/Adminhtml/Integration/Edit.php      | 2 +-
 .../Block/Adminhtml/Integration/Edit/Tab/Info.php         | 2 +-
 .../Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php | 6 +++---
 app/code/Magento/Newsletter/Block/Adminhtml/Template.php  | 2 +-
 .../Magento/Newsletter/Block/Adminhtml/Template/Edit.php  | 2 +-
 .../Magento/Quote/Model/Quote/Address/Total/Shipping.php  | 2 +-
 .../Magento/Quote/Model/Quote/Address/Total/Subtotal.php  | 2 +-
 .../Block/Adminhtml/Grid/Column/Renderer/Customer.php     | 2 +-
 .../Adminhtml/Product/Downloads/Renderer/Purchases.php    | 2 +-
 app/code/Magento/Review/Block/Adminhtml/Add.php           | 2 +-
 app/code/Magento/Review/Block/Adminhtml/Edit.php          | 2 +-
 .../Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php | 2 +-
 app/code/Magento/Review/Block/Adminhtml/Rating/Edit.php   | 2 +-
 app/code/Magento/Review/Block/Adminhtml/ReviewTab.php     | 2 +-
 app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php | 2 +-
 .../Magento/Sales/Block/Adminhtml/CustomerOrdersTab.php   | 2 +-
 app/code/Magento/Sales/Block/Adminhtml/Order/Address.php  | 2 +-
 .../Magento/Sales/Block/Adminhtml/Order/Address/Form.php  | 2 +-
 .../Block/Adminhtml/Order/Create/Billing/Address.php      | 2 +-
 .../Sales/Block/Adminhtml/Order/Create/Billing/Method.php | 2 +-
 .../Sales/Block/Adminhtml/Order/Create/Comment.php        | 2 +-
 .../Sales/Block/Adminhtml/Order/Create/Coupons.php        | 2 +-
 .../Sales/Block/Adminhtml/Order/Create/Customer.php       | 2 +-
 .../Sales/Block/Adminhtml/Order/Create/Form/Account.php   | 2 +-
 .../Magento/Sales/Block/Adminhtml/Order/Create/Items.php  | 2 +-
 .../Sales/Block/Adminhtml/Order/Create/Items/Grid.php     | 4 ++--
 .../Sales/Block/Adminhtml/Order/Create/Newsletter.php     | 2 +-
 .../Magento/Sales/Block/Adminhtml/Order/Create/Search.php | 2 +-
 .../Block/Adminhtml/Order/Create/Shipping/Address.php     | 2 +-
 .../Block/Adminhtml/Order/Create/Shipping/Method.php      | 2 +-
 .../Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php   | 2 +-
 .../Block/Adminhtml/Order/Create/Sidebar/Compared.php     | 2 +-
 .../Block/Adminhtml/Order/Create/Sidebar/Pcompared.php    | 2 +-
 .../Block/Adminhtml/Order/Create/Sidebar/Pviewed.php      | 2 +-
 .../Block/Adminhtml/Order/Create/Sidebar/Reorder.php      | 2 +-
 .../Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php | 2 +-
 .../Block/Adminhtml/Order/Create/Sidebar/Wishlist.php     | 2 +-
 .../Magento/Sales/Block/Adminhtml/Order/Create/Store.php  | 2 +-
 .../Magento/Sales/Block/Adminhtml/Order/Create/Totals.php | 2 +-
 .../Block/Adminhtml/Order/Create/Totals/Shipping.php      | 4 ++--
 .../Sales/Block/Adminhtml/Order/Creditmemo/View.php       | 2 +-
 .../Magento/Sales/Block/Adminhtml/Order/Invoice/View.php  | 2 +-
 .../Magento/Sales/Block/Adminhtml/Order/Status/Assign.php | 2 +-
 .../Magento/Sales/Block/Adminhtml/Order/Status/Edit.php   | 2 +-
 .../Sales/Block/Adminhtml/Order/Status/NewStatus.php      | 2 +-
 app/code/Magento/Sales/Block/Adminhtml/Order/View.php     | 4 ++--
 .../Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php | 2 +-
 .../Magento/Sales/Block/Adminhtml/Transactions/Detail.php | 2 +-
 app/code/Magento/Sales/Block/Order/Creditmemo.php         | 2 +-
 app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php   | 2 +-
 app/code/Magento/Sales/Block/Order/Invoice.php            | 2 +-
 app/code/Magento/Sales/Block/Order/View.php               | 2 +-
 app/code/Magento/Sales/Model/Order/Config.php             | 2 +-
 app/code/Magento/Sales/Model/Order/Creditmemo.php         | 2 +-
 app/code/Magento/Sales/Model/Order/Invoice.php            | 2 +-
 app/code/Magento/Sales/Model/Order/Item.php               | 2 +-
 app/code/Magento/Sales/Model/Order/Status.php             | 2 +-
 .../SalesRule/Block/Adminhtml/Promo/Quote/Edit.php        | 2 +-
 app/code/Magento/Search/Block/Adminhtml/Term/Edit.php     | 2 +-
 .../Shipping/Block/Adminhtml/Order/Tracking/View.php      | 2 +-
 app/code/Magento/Shipping/Block/Adminhtml/View.php        | 2 +-
 app/code/Magento/Shipping/Block/Order/Shipment.php        | 2 +-
 app/code/Magento/Shipping/Model/Order/Track.php           | 2 +-
 app/code/Magento/Shipping/Model/Tracking/Result/Error.php | 2 +-
 app/code/Magento/Sitemap/Block/Adminhtml/Edit.php         | 2 +-
 app/code/Magento/Tax/Block/Checkout/Shipping.php          | 4 ++--
 app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php      | 2 +-
 app/code/Magento/Tax/Model/TaxClass/Type/Customer.php     | 2 +-
 app/code/Magento/Tax/Model/TaxClass/Type/Product.php      | 2 +-
 .../Magento/Theme/Block/Adminhtml/System/Design/Theme.php | 2 +-
 .../Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php  | 2 +-
 .../Adminhtml/System/Design/Theme/Edit/Tab/General.php    | 4 ++--
 .../Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php   | 4 ++--
 .../Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php  | 2 +-
 app/code/Magento/UrlRewrite/Block/Selector.php            | 2 +-
 app/code/Magento/User/Block/Role/Tab/Edit.php             | 2 +-
 app/code/Magento/User/Block/Role/Tab/Info.php             | 2 +-
 app/code/Magento/User/Block/User/Edit.php                 | 2 +-
 .../Block/Adminhtml/Integration/Edit/Tab/Webapi.php       | 2 +-
 .../Widget/Block/Adminhtml/Widget/Instance/Edit.php       | 2 +-
 .../Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php     | 4 ++--
 .../Adminhtml/Widget/Instance/Edit/Tab/Properties.php     | 4 ++--
 .../Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php | 4 ++--
 app/code/Magento/Widget/Model/Widget/Instance.php         | 2 +-
 app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php | 2 +-
 app/code/Magento/Wishlist/Block/Customer/Sidebar.php      | 2 +-
 app/code/Magento/Wishlist/Block/Link.php                  | 4 ++--
 app/code/Magento/Wishlist/Block/Share/Wishlist.php        | 2 +-
 app/code/Magento/Wishlist/Helper/Data.php                 | 4 ++--
 .../Magento/Framework/Data/Form/Element/Editor.php        | 2 +-
 lib/internal/Magento/Framework/Exception/ErrorMessage.php | 2 +-
 196 files changed, 240 insertions(+), 240 deletions(-)

diff --git a/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php b/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
index 24564a4eee578..825ad2ec74196 100644
--- a/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
+++ b/app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php
@@ -66,7 +66,7 @@ public function getUnreadMessages()
     /**
      * Retrieve popup title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getPopupTitle()
     {
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
index ddab16bc6d71b..e9e00749a4fb2 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php
@@ -114,7 +114,7 @@ public function isDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
index f14413eb82833..748ec28eddf7b 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php
@@ -31,7 +31,7 @@ protected function _shouldBeDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
index 74a8288f7a3b6..24f7637c83975 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php
@@ -30,7 +30,7 @@ protected function _shouldBeDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {
diff --git a/app/code/Magento/AdminNotification/Model/System/Message/Security.php b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
index 72465b8fdfc3f..3a966391c75cb 100644
--- a/app/code/Magento/AdminNotification/Model/System/Message/Security.php
+++ b/app/code/Magento/AdminNotification/Model/System/Message/Security.php
@@ -129,7 +129,7 @@ public function isDisplayed()
     /**
      * Retrieve message text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getText()
     {
diff --git a/app/code/Magento/Backend/Block/System/Account/Edit.php b/app/code/Magento/Backend/Block/System/Account/Edit.php
index dd93eaf5fd5ec..dd376795810d3 100644
--- a/app/code/Magento/Backend/Block/System/Account/Edit.php
+++ b/app/code/Magento/Backend/Block/System/Account/Edit.php
@@ -27,7 +27,7 @@ protected function _construct()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Backend/Block/System/Store/Delete.php b/app/code/Magento/Backend/Block/System/Store/Delete.php
index 0dd9534c42a47..6b93acaba9b5e 100644
--- a/app/code/Magento/Backend/Block/System/Store/Delete.php
+++ b/app/code/Magento/Backend/Block/System/Store/Delete.php
@@ -49,7 +49,7 @@ protected function _construct()
     /**
      * Get edit form container header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Backend/Block/System/Variable/Edit.php b/app/code/Magento/Backend/Block/System/Variable/Edit.php
index f73eb2b96f6b1..ea134a26e84c1 100644
--- a/app/code/Magento/Backend/Block/System/Variable/Edit.php
+++ b/app/code/Magento/Backend/Block/System/Variable/Edit.php
@@ -97,7 +97,7 @@ public function getFormHtml()
     /**
      * Return translated header text depending on creating/editing action
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php
index 628d68b0fbccd..a80409810e7b3 100644
--- a/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php
+++ b/app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Store.php
@@ -83,7 +83,7 @@ protected function _getShowEmptyStoresLabelFlag()
      * Render row store views
      *
      * @param \Magento\Framework\Object $row
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -135,7 +135,7 @@ public function render(\Magento\Framework\Object $row)
      * Render row store views for export
      *
      * @param \Magento\Framework\Object $row
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function renderExport(\Magento\Framework\Object $row)
diff --git a/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php b/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php
index 711ac4da6e270..4020737bac5a7 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/AbstractElement.php
@@ -42,7 +42,7 @@ public function __construct(StoreManagerInterface $storeManager)
      * Translate element attribute
      *
      * @param string $code
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     protected function _getTranslatedAttribute($code)
     {
diff --git a/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php b/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php
index 3263d3dc619ea..fd94275687ead 100644
--- a/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php
+++ b/app/code/Magento/Backend/Model/Config/Structure/Element/Field.php
@@ -385,7 +385,7 @@ protected function _getStaticOptions(array $options)
      * Translate a label
      *
      * @param string $label an option label that should be translated
-     * @return string the translated version of the input label
+     * @return \Magento\Framework\Phrase
      */
     private function _translateLabel($label)
     {
diff --git a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
index 69c605c8bf9e6..1f97b56488bcd 100644
--- a/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle.php
@@ -131,7 +131,7 @@ public function getProduct()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -139,7 +139,7 @@ public function getTabLabel()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
index e27843f8f4ce1..5a6e07df257a1 100644
--- a/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
+++ b/app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php
@@ -267,7 +267,7 @@ public function getJsonConfig()
      * Get html for option
      *
      * @param \Magento\Bundle\Model\Option $option
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getOptionHtml($option)
     {
diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 1ad99a7575279..ae3599165890c 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -658,7 +658,7 @@ public function isSalable($product)
      * @param \Magento\Framework\Object $buyRequest
      * @param \Magento\Catalog\Model\Product $product
      * @param string $processMode
-     * @return array|string
+     * @return \Magento\Framework\Phrase|array|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
@@ -837,7 +837,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
     /**
      * Retrieve message for specify option(s)
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getSpecifyOptionMessage()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
index 783a3bf00587e..d9d163fd0c386 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
@@ -237,7 +237,7 @@ public function getTabsHtml()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeader()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
index daa75bc93c75c..5d1cae2870c63 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
@@ -18,7 +18,7 @@ class YearRange extends Field
 {
     /**
      * @param AbstractElement $element
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getElementHtml(AbstractElement $element)
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
index a073b268fe9d4..29f7d7227a290 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit.php
@@ -106,7 +106,7 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
     /**
      * Retrieve header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
index 2f184f4bc916a..d7922efb53e5e 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Main.php
@@ -183,7 +183,7 @@ public function getSetFormHtml()
     /**
      * Retrieve Block Header Text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getHeader()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
index 8050a1c294e9e..41b5a6dbdd890 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Add.php
@@ -53,7 +53,7 @@ protected function _prepareLayout()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getHeader()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
index 21e896072717c..c98a4c62ab517 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Set/Toolbar/Main.php
@@ -44,7 +44,7 @@ public function getNewButtonHtml()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getHeader()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
index 00fa783867378..3c38b075a9cbe 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Attributes.php
@@ -154,7 +154,7 @@ protected function _getAdditionalElementHtml($element)
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -162,7 +162,7 @@ public function getTabLabel()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
index 39c307ffb0dc0..07a86a028ed44 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Inventory.php
@@ -82,7 +82,7 @@ public function getDefaultConfigValue($field)
     /**
      * Tab settings
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -90,7 +90,7 @@ public function getTabLabel()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php
index 2d391fedb039e..80a2d20ac048d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Action/Attribute/Tab/Websites.php
@@ -45,7 +45,7 @@ public function getStoreCollection(Group $group)
     /**
      * Tab settings
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -53,7 +53,7 @@ public function getTabLabel()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php
index 906575c83dd03..7a0dcd8e5548d 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Product/Helper/Form/BaseImage.php
@@ -72,7 +72,7 @@ public function __construct(
     /**
      * Get label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
index 3b50f3b6daffe..c630e455bd4c3 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php
@@ -52,7 +52,7 @@ public function getLink()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Catalog/Block/Category/Rss/Link.php b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
index 5db6d06d81b93..fd1559f508724 100644
--- a/app/code/Magento/Catalog/Block/Category/Rss/Link.php
+++ b/app/code/Magento/Catalog/Block/Category/Rss/Link.php
@@ -49,7 +49,7 @@ public function isRssAllowed()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
index 861a0cbfffa6b..b958562f969b1 100644
--- a/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
+++ b/app/code/Magento/Catalog/Block/Product/Compare/ListCompare.php
@@ -192,7 +192,7 @@ public function getAttributes()
      *
      * @param Product $product
      * @param \Magento\Catalog\Model\Resource\Eav\Attribute $attribute
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getProductAttributeValue($product, $attribute)
     {
diff --git a/app/code/Magento/Catalog/Helper/Product.php b/app/code/Magento/Catalog/Helper/Product.php
index 5adf09c4ce778..600ff2992988c 100644
--- a/app/code/Magento/Catalog/Helper/Product.php
+++ b/app/code/Magento/Catalog/Helper/Product.php
@@ -574,7 +574,7 @@ public function getAttributesAllowedForAutogeneration()
     /**
      * Get label for virtual control
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTypeSwitcherControlLabel()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Category.php b/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
index 6c03530f09d80..b582dd8fdfd82 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Category.php
@@ -112,7 +112,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
     /**
      * Get filter name
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getName()
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
index f51521e4772ce..2aff097b02334 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Decimal.php
@@ -97,7 +97,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
      *
      * @param   int $range
      * @param   float $value
-     * @return  string
+     * @return \Magento\Framework\Phrase
      */
     protected function _renderItemLabel($range, $value)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
index 8db29096c2852..64be1378d0dc8 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
@@ -210,7 +210,7 @@ public function getResetValue()
     /**
      * Get 'clear price' link text
      *
-     * @return false|string
+     * @return \Magento\Framework\Phrase
      */
     public function getClearLinkText()
     {
@@ -227,7 +227,7 @@ public function getClearLinkText()
      *
      * @param float|string $fromPrice
      * @param float|string $toPrice
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _renderRangeLabel($fromPrice, $toPrice)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
index ecd5e62378872..628625320f93f 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
@@ -49,7 +49,7 @@ public function __construct(
      *
      * @param float|string $fromPrice
      * @param float|string $toPrice
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function renderRangeLabel($fromPrice, $toPrice)
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
index 455ada210a9a8..82377067645a4 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice.php
@@ -61,7 +61,7 @@ protected function _getResource()
     /**
      * Error message when duplicates
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getDuplicateErrorMessage()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
index 6aeacc7c2cd91..c743b671c4bdb 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/GroupPrice/AbstractGroupPrice.php
@@ -135,7 +135,7 @@ protected function _isPriceFixed($priceObject)
      *
      * @param \Magento\Catalog\Model\Product $object
      * @throws \Magento\Framework\Model\Exception
-     * @return bool
+     * @return \Magento\Framework\Phrase|bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
index 91da3fa75adb2..7142957657abc 100644
--- a/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
+++ b/app/code/Magento/Catalog/Model/Product/Attribute/Backend/Tierprice.php
@@ -75,7 +75,7 @@ protected function _getAdditionalUniqueFields($objectArray)
     /**
      * Error message when duplicates
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getDuplicateErrorMessage()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
index a62e5eec4865c..f6f81d4173c1d 100644
--- a/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
+++ b/app/code/Magento/Catalog/Model/Product/Option/Type/Select.php
@@ -118,7 +118,7 @@ public function getPrintableOptionValue($optionValue)
     /**
      * Return currently unavailable product configuration message
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getWrongConfigurationMessage()
     {
diff --git a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
index a3e7fcfc6c642..2ec3557b2a79f 100644
--- a/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
+++ b/app/code/Magento/Catalog/Model/Product/Type/AbstractType.php
@@ -552,7 +552,7 @@ protected function _isStrictProcessMode($processMode)
     /**
      * Retrieve message for specify option(s)
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getSpecifyOptionMessage()
     {
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit.php
index 0c9a9a9b513e7..7fa26b258728c 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit.php
@@ -81,7 +81,7 @@ protected function _construct()
     /**
      * Getter for form header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php
index b29dffb9b1779..a1c7136d74c9f 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Actions.php
@@ -14,7 +14,7 @@ class Actions extends Generic implements TabInterface
     /**
      * Prepare content for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -24,7 +24,7 @@ public function getTabLabel()
     /**
      * Prepare title for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
index 88dd5e76a5329..b51ba93f76373 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Conditions.php
@@ -45,7 +45,7 @@ public function __construct(
     /**
      * Prepare content for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -55,7 +55,7 @@ public function getTabLabel()
     /**
      * Prepare title for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php
index b22840b7f547f..b05ff70a9c5f8 100644
--- a/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php
+++ b/app/code/Magento/CatalogRule/Block/Adminhtml/Promo/Catalog/Edit/Tab/Main.php
@@ -67,7 +67,7 @@ public function __construct(
     /**
      * Prepare content for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -77,7 +77,7 @@ public function getTabLabel()
     /**
      * Prepare title for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/CatalogSearch/Block/Result.php b/app/code/Magento/CatalogSearch/Block/Result.php
index 3d227ea5835f3..072b76a797339 100644
--- a/app/code/Magento/CatalogSearch/Block/Result.php
+++ b/app/code/Magento/CatalogSearch/Block/Result.php
@@ -184,7 +184,7 @@ protected function _getProductCollection()
     /**
      * Get search query text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getSearchQueryText()
     {
@@ -209,7 +209,7 @@ public function getResultCount()
     /**
      * Retrieve No Result or Minimum query length Text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getNoResultText()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
index 677abd9b5db63..3c29805598700 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Category.php
@@ -92,7 +92,7 @@ public function getResetValue()
     /**
      * Get filter name
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getName()
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
index 9061a5755b2df..e00a0a138e704 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Decimal.php
@@ -136,7 +136,7 @@ protected function _getItemsData()
      *
      * @param float|string $fromPrice
      * @param float|string $toPrice
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function renderRangeLabel($fromPrice, $toPrice)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
index e3a419bbe47de..7c84be8b78757 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -171,7 +171,7 @@ public function getCurrencyRate()
      *
      * @param float|string $fromPrice
      * @param float|string $toPrice
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     protected function _renderRangeLabel($fromPrice, $toPrice)
     {
diff --git a/app/code/Magento/Centinel/Block/Adminhtml/Validation.php b/app/code/Magento/Centinel/Block/Adminhtml/Validation.php
index 6c0d66aeb735b..cd3ee0a70796a 100644
--- a/app/code/Magento/Centinel/Block/Adminhtml/Validation.php
+++ b/app/code/Magento/Centinel/Block/Adminhtml/Validation.php
@@ -25,7 +25,7 @@ protected function _construct()
     /**
      * Return text for block`s header
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Centinel/Helper/Data.php b/app/code/Magento/Centinel/Helper/Data.php
index 7d9481b96a677..00880ca0290a3 100644
--- a/app/code/Magento/Centinel/Helper/Data.php
+++ b/app/code/Magento/Centinel/Helper/Data.php
@@ -17,7 +17,7 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
      * Return label for cmpi field
      *
      * @param string $fieldName
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getCmpiLabel($fieldName)
     {
@@ -64,7 +64,7 @@ public function getCmpiValue($fieldName, $value)
      * Return text value for cmpi eci flag field
      *
      * @param string $value
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     private function _getCmpiEciValue($value)
     {
@@ -85,7 +85,7 @@ private function _getCmpiEciValue($value)
      * Return text value for cmpi enrolled field
      *
      * @param string $value
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     private function _getCmpiEnrolledValue($value)
     {
@@ -105,7 +105,7 @@ private function _getCmpiEnrolledValue($value)
      * Return text value for cmpi pares field
      *
      * @param string $value
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     private function _getCmpiParesValue($value)
     {
diff --git a/app/code/Magento/Checkout/Block/Adminhtml/CartTab.php b/app/code/Magento/Checkout/Block/Adminhtml/CartTab.php
index 2cad44671ef6a..38abcd03b81c4 100644
--- a/app/code/Magento/Checkout/Block/Adminhtml/CartTab.php
+++ b/app/code/Magento/Checkout/Block/Adminhtml/CartTab.php
@@ -53,7 +53,7 @@ public function canShowTab()
     /**
      * Return Tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
diff --git a/app/code/Magento/Checkout/Block/Cart/Link.php b/app/code/Magento/Checkout/Block/Cart/Link.php
index f913bf1b81921..1abffad414609 100644
--- a/app/code/Magento/Checkout/Block/Cart/Link.php
+++ b/app/code/Magento/Checkout/Block/Cart/Link.php
@@ -83,7 +83,7 @@ protected function _getItemCount()
      * Create link label based on cart item quantity
      *
      * @param int $count
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _createLabel($count)
     {
diff --git a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit.php b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit.php
index 110cbd76d57c7..fe29bddc7a711 100644
--- a/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit.php
+++ b/app/code/Magento/CheckoutAgreements/Block/Adminhtml/Agreement/Edit.php
@@ -48,7 +48,7 @@ protected function _construct()
     /**
      * Get Header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit.php
index c118bf1eb9bff..10cc1d2fc62d3 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Block/Edit.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Block/Edit.php
@@ -71,7 +71,7 @@ function toggleEditor() {
     /**
      * Get edit form container header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit.php
index 8d363e9942a52..0c4320b00dd85 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit.php
@@ -75,7 +75,7 @@ protected function _construct()
     /**
      * Retrieve text for header element depending on loaded page
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Content.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Content.php
index cf4e4cfccb4b9..0933a7a260440 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Content.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Content.php
@@ -106,7 +106,7 @@ protected function _prepareForm()
     /**
      * Prepare label for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -116,7 +116,7 @@ public function getTabLabel()
     /**
      * Prepare title for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php
index bd6dcaccd6970..26a331d55cb67 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Design.php
@@ -191,7 +191,7 @@ protected function _prepareForm()
     /**
      * Prepare label for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -201,7 +201,7 @@ public function getTabLabel()
     /**
      * Prepare title for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Main.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Main.php
index 7bf1236e1ee13..2426eca3134e1 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Main.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Main.php
@@ -145,7 +145,7 @@ protected function _prepareForm()
     /**
      * Prepare label for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -155,7 +155,7 @@ public function getTabLabel()
     /**
      * Prepare title for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Meta.php b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Meta.php
index 7a38b4e499058..5b0bda2853ff7 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Meta.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Page/Edit/Tab/Meta.php
@@ -74,7 +74,7 @@ protected function _prepareForm()
     /**
      * Prepare label for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -84,7 +84,7 @@ public function getTabLabel()
     /**
      * Prepare title for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
index 0cd2db75c4fe0..adc6a0ee5169e 100644
--- a/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
+++ b/app/code/Magento/Cms/Block/Adminhtml/Wysiwyg/Images/Tree.php
@@ -81,7 +81,7 @@ public function getTreeLoaderUrl()
     /**
      * Root node name of tree
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getRootNodeName()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Super/Config.php b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
index 354220b75f2e9..4582042eb5011 100644
--- a/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
+++ b/app/code/Magento/ConfigurableProduct/Block/Adminhtml/Product/Edit/Tab/Super/Config.php
@@ -331,7 +331,7 @@ public function getGridJsObject()
     /**
      * Retrieve Tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -341,7 +341,7 @@ public function getTabLabel()
     /**
      * Retrieve Tab title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 2cecd673d759e..bb1b8756eb000 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -720,7 +720,7 @@ public function getSelectedAttributesInfo($product)
      * @param \Magento\Framework\Object $buyRequest
      * @param \Magento\Catalog\Model\Product $product
      * @param string $processMode
-     * @return array|string
+     * @return \Magento\Framework\Phrase|array|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
@@ -844,7 +844,7 @@ public function checkProductBuyState($product)
     /**
      * Retrieve message for specify option(s)
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getSpecifyOptionMessage()
     {
diff --git a/app/code/Magento/Core/Model/File/Storage/Database.php b/app/code/Magento/Core/Model/File/Storage/Database.php
index 8770fcf34b688..1b4060f7e211b 100644
--- a/app/code/Magento/Core/Model/File/Storage/Database.php
+++ b/app/code/Magento/Core/Model/File/Storage/Database.php
@@ -116,7 +116,7 @@ public function init()
     /**
      * Return storage name
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getStorageName()
     {
diff --git a/app/code/Magento/Core/Model/File/Storage/File.php b/app/code/Magento/Core/Model/File/Storage/File.php
index 0ae3a40daf700..189f47f6b31a7 100644
--- a/app/code/Magento/Core/Model/File/Storage/File.php
+++ b/app/code/Magento/Core/Model/File/Storage/File.php
@@ -86,7 +86,7 @@ public function init()
     /**
      * Return storage name
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getStorageName()
     {
diff --git a/app/code/Magento/Core/Model/Layout/Translator.php b/app/code/Magento/Core/Model/Layout/Translator.php
index 53399f1d34e93..26fa3a64f8a34 100644
--- a/app/code/Magento/Core/Model/Layout/Translator.php
+++ b/app/code/Magento/Core/Model/Layout/Translator.php
@@ -122,7 +122,7 @@ protected function _getNodeValue(Element $node)
      * Translate node value
      *
      * @param string $value
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _translateValue($value)
     {
diff --git a/app/code/Magento/Core/Model/Variable.php b/app/code/Magento/Core/Model/Variable.php
index 18ead04b6ecc0..91b5462ca847e 100644
--- a/app/code/Magento/Core/Model/Variable.php
+++ b/app/code/Magento/Core/Model/Variable.php
@@ -123,7 +123,7 @@ public function getValue($type = null)
     /**
      * Validation of object data. Checking for unique variable code
      *
-     * @return bool|string
+     * @return \Magento\Framework\Phrase|bool
      */
     public function validate()
     {
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
index bd0c8013a6c7f..00e289b937267 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
@@ -59,7 +59,7 @@ protected function _prepareLayout()
     /**
      * Get header
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeader()
     {
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
index 0d7a22af869f3..cced163b12413 100644
--- a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
+++ b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currencysymbol.php
@@ -76,7 +76,7 @@ protected function _prepareLayout()
     /**
      * Returns page header
      *
-     * @return bool|string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeader()
     {
@@ -129,7 +129,7 @@ public function getCurrencySymbolsData()
     /**
      * Returns inheritance text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getInheritText()
     {
diff --git a/app/code/Magento/Customer/Block/Account/Dashboard.php b/app/code/Magento/Customer/Block/Account/Dashboard.php
index 423b14871749e..8340a1b9b2a31 100644
--- a/app/code/Magento/Customer/Block/Account/Dashboard.php
+++ b/app/code/Magento/Customer/Block/Account/Dashboard.php
@@ -166,7 +166,7 @@ public function getManageNewsletterUrl()
     /**
      * Retrieve subscription text, either subscribed or not.
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getSubscriptionText()
     {
diff --git a/app/code/Magento/Customer/Block/Account/Dashboard/Address.php b/app/code/Magento/Customer/Block/Account/Dashboard/Address.php
index 0c4840c22aa29..e1cfca8d61250 100644
--- a/app/code/Magento/Customer/Block/Account/Dashboard/Address.php
+++ b/app/code/Magento/Customer/Block/Account/Dashboard/Address.php
@@ -75,7 +75,7 @@ public function getCustomer()
     /**
      * HTML for Shipping Address
      *
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getPrimaryShippingAddressHtml()
     {
@@ -95,7 +95,7 @@ public function getPrimaryShippingAddressHtml()
     /**
      * HTML for Billing Address
      *
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getPrimaryBillingAddressHtml()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit.php b/app/code/Magento/Customer/Block/Adminhtml/Edit.php
index c7eb9602bf5b7..3cace28fc3ee4 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit.php
@@ -152,7 +152,7 @@ public function getCustomerId()
     /**
      * Retrieve the header text, either the name of an existing customer or 'New Customer'.
      *
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Group.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Group.php
index 42b87ff19d187..c4a30f1c6e921 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Group.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Renderer/Attribute/Group.php
@@ -65,7 +65,7 @@ protected function _getDisableAutoGroupChangeElementHtmlId()
     /**
      * Retrieve disable auto group change checkbox label text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getDisableAutoGroupChangeCheckboxLabel()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
index a481a5ae8327f..6467fe865e6db 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter.php
@@ -62,7 +62,7 @@ public function __construct(
     /**
      * Return Tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -72,7 +72,7 @@ public function getTabLabel()
     /**
      * Return Tab title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Status.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Status.php
index 9938665fe2af6..eb8e8dba07b38 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Status.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Newsletter/Grid/Renderer/Status.php
@@ -34,7 +34,7 @@ protected function _construct()
 
     /**
      * @param \Magento\Framework\Object $row
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function render(\Magento\Framework\Object $row)
     {
@@ -43,7 +43,7 @@ public function render(\Magento\Framework\Object $row)
 
     /**
      * @param string $status
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public static function getStatus($status)
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
index 34cb2231c8ba8..1dbf9f7a2209f 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View.php
@@ -43,7 +43,7 @@ public function getCustomerId()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -51,7 +51,7 @@ public function getTabLabel()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
index 5c25e31a2667c..b23b7128eb163 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/PersonalInfo.php
@@ -161,7 +161,7 @@ public function getCreateDate()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getIsConfirmedStatus()
     {
@@ -188,7 +188,7 @@ public function getCreatedInStore()
     }
 
     /**
-     * @return string|null
+     * @return \Magento\Framework\Phrase|string
      */
     public function getBillingAddressHtml()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php
index a974ec152d397..67f34e93282c0 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/File.php
@@ -123,7 +123,7 @@ protected function _getDeleteCheckboxSpanClass()
     /**
      * Return Delete CheckBox Label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getDeleteCheckboxLabel()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
index 325ad4e6201eb..b9d4ed6cc59c8 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Form/Element/Image.php
@@ -17,7 +17,7 @@ class Image extends \Magento\Customer\Block\Adminhtml\Form\Element\File
     /**
      * Return Delete CheckBox Label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getDeleteCheckboxLabel()
     {
diff --git a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php
index a53dd3e812c45..8d7f5e3fd2138 100644
--- a/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php
+++ b/app/code/Magento/Customer/Block/Adminhtml/Group/Edit.php
@@ -78,7 +78,7 @@ protected function _construct()
     /**
      * Retrieve the header text, either editing an existing group or creating a new one.
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Customer/Block/Widget/Dob.php b/app/code/Magento/Customer/Block/Widget/Dob.php
index 212bb69fa6914..6f212bac97a67 100644
--- a/app/code/Magento/Customer/Block/Widget/Dob.php
+++ b/app/code/Magento/Customer/Block/Widget/Dob.php
@@ -118,7 +118,7 @@ public function getYear()
     /**
      * Return label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php
index 9d4a2c9dcab25..207446ba1db7c 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Container.php
@@ -44,7 +44,7 @@ protected function _prepareLayout()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php
index b7ec1a4a70966..3479cc848d87d 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Code/Js.php
@@ -87,7 +87,7 @@ protected function _prepareForm()
     /**
      * Return confirmation message for delete action
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getConfirmMessageDelete()
     {
@@ -151,7 +151,7 @@ public function getFiles()
     /**
      * Get js tab title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTitle()
     {
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content.php
index 1278c2bfacd96..9b85f19773dea 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content.php
@@ -15,7 +15,7 @@ class Content extends \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content/Files.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content/Files.php
index f153b9e2e7000..5758957680fce 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content/Files.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content/Files.php
@@ -34,7 +34,7 @@ public function __construct(
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getStorageType()
     {
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Tree.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Tree.php
index 962bb3c0badf2..879cf435ecb97 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Tree.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Tree.php
@@ -14,7 +14,7 @@ class Tree extends \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Tree
     /**
      * Override root node name of tree specific to design editor.
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getRootNodeName()
     {
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Tabs/AbstractTabs.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Tabs/AbstractTabs.php
index 8d639c54d2d48..c23777ec5fe43 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Tabs/AbstractTabs.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Tabs/AbstractTabs.php
@@ -45,7 +45,7 @@ public function getHtmlId()
     /**
      * Get translated title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTitle()
     {
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Assigned.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Assigned.php
index 74a90bd7a63c8..b926866874722 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Assigned.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Assigned.php
@@ -14,7 +14,7 @@ class Assigned extends \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\Sele
     /**
      * Get list title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Available.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Available.php
index 750d52bfc623d..9dec8955ed766 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Available.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Available.php
@@ -16,7 +16,7 @@ class Available extends \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\Sel
     /**
      * Get tab title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Unassigned.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Unassigned.php
index 2fb94c167f3ea..4b3d386a4e721 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Unassigned.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/SelectorList/Unassigned.php
@@ -14,7 +14,7 @@ class Unassigned extends \Magento\DesignEditor\Block\Adminhtml\Theme\Selector\Se
     /**
      * Get list title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Available.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Available.php
index bf538e4e9cb69..3003018208d2f 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Available.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Available.php
@@ -25,7 +25,7 @@ protected function _toHtml()
     /**
      * Return Tab title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Customizations.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Customizations.php
index 67dd0193e1b16..743076bc1970f 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Customizations.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Theme/Selector/Tab/Customizations.php
@@ -24,7 +24,7 @@ protected function _construct()
     /**
      * Return Tab title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Directory/Model/Currency/Import/Config.php b/app/code/Magento/Directory/Model/Currency/Import/Config.php
index 153bc7e4273ac..2af251f98275c 100644
--- a/app/code/Magento/Directory/Model/Currency/Import/Config.php
+++ b/app/code/Magento/Directory/Model/Currency/Import/Config.php
@@ -62,7 +62,7 @@ public function getServiceClass($serviceName)
      * Retrieve already translated label that corresponds to service name
      *
      * @param string $serviceName
-     * @return string|null
+     * @return \Magento\Framework\Phrase|null
      */
     public function getServiceLabel($serviceName)
     {
diff --git a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
index eef105a8bfb24..1d2de7b95f92b 100644
--- a/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
+++ b/app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php
@@ -80,7 +80,7 @@ public function getProduct()
     /**
      * Get tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -90,7 +90,7 @@ public function getTabLabel()
     /**
      * Get tab title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
index 66356a4b33bdc..533fec01f9b8e 100644
--- a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
+++ b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
@@ -136,7 +136,7 @@ public function getBackUrl()
      * Return number of left downloads or unlimited
      *
      * @param Item $item
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getRemainingDownloads($item)
     {
diff --git a/app/code/Magento/Downloadable/Model/Product/Type.php b/app/code/Magento/Downloadable/Model/Product/Type.php
index 7fcce95622ed0..b2ef7f3c8ef37 100644
--- a/app/code/Magento/Downloadable/Model/Product/Type.php
+++ b/app/code/Magento/Downloadable/Model/Product/Type.php
@@ -567,7 +567,7 @@ public function deleteTypeSpecificData(\Magento\Catalog\Model\Product $product)
      * @param \Magento\Framework\Object $buyRequest
      * @param \Magento\Catalog\Model\Product $product
      * @param string $processMode
-     * @return array|string
+     * @return \Magento\Framework\Phrase|array|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template.php b/app/code/Magento/Email/Block/Adminhtml/Template.php
index b5b8bcded15e1..d320ead156940 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template.php
@@ -97,7 +97,7 @@ public function addButton($buttonId, $data, $level = 0, $sortOrder = 0, $region
     /**
      * Get transactional emails page header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
index 55e9f016f7f9e..20cc24446adb8 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Edit.php
@@ -290,7 +290,7 @@ public function getEditMode()
     /**
      * Return header text for form
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php
index 18458ab616f22..1578c2db4ee99 100644
--- a/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php
+++ b/app/code/Magento/Email/Block/Adminhtml/Template/Grid/Renderer/Type.php
@@ -26,7 +26,7 @@ class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      * Render grid column
      *
      * @param \Magento\Framework\Object $row
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function render(\Magento\Framework\Object $row)
     {
diff --git a/app/code/Magento/Email/Model/Template/Config.php b/app/code/Magento/Email/Model/Template/Config.php
index 672c5be0a72ff..0fdd709d51490 100644
--- a/app/code/Magento/Email/Model/Template/Config.php
+++ b/app/code/Magento/Email/Model/Template/Config.php
@@ -45,7 +45,7 @@ public function getAvailableTemplates()
      * Retrieve translated label of an email template
      *
      * @param string $templateId
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTemplateLabel($templateId)
     {
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php
index 949e0665e5f8a..e94e53e04e148 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Catalog/Product/Edit/Tab/Googleoptimizer.php
@@ -27,7 +27,7 @@ protected function _getEntity()
     /**
      * Return Tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -37,7 +37,7 @@ public function getTabLabel()
     /**
      * Return Tab title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
index 78a07ea5486be..f2c88705e3018 100644
--- a/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
+++ b/app/code/Magento/GoogleOptimizer/Block/Adminhtml/Cms/Page/Edit/Tab/Googleoptimizer.php
@@ -27,7 +27,7 @@ protected function _getEntity()
     /**
      * Return Tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -37,7 +37,7 @@ public function getTabLabel()
     /**
      * Return Tab title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit.php b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit.php
index 8324b0fc83f7e..90e9c6b5ad701 100644
--- a/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit.php
+++ b/app/code/Magento/GoogleShopping/Block/Adminhtml/Types/Edit.php
@@ -67,7 +67,7 @@ public function getFormInitScripts()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts.php b/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts.php
index 058d809207b43..2f1dbf803cce8 100644
--- a/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts.php
+++ b/app/code/Magento/GroupedProduct/Block/Product/Grouped/AssociatedProducts.php
@@ -19,7 +19,7 @@ protected function _construct()
     /**
      * Return Tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
diff --git a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
index f22940e785bd2..8801faf0fcec5 100644
--- a/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
+++ b/app/code/Magento/GroupedProduct/Model/Product/Type/Grouped.php
@@ -336,7 +336,7 @@ public function save($product)
      * @param \Magento\Framework\Object $buyRequest
      * @param \Magento\Catalog\Model\Product $product
      * @param string $processMode
-     * @return array|string
+     * @return \Magento\Framework\Phrase|array|string
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $product, $processMode)
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php
index 49768bac039b5..f4231fa5f361d 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Edit.php
@@ -31,7 +31,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
index c4f2d1ab861a7..25bd192960167 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Export/Filter.php
@@ -131,7 +131,7 @@ protected function _getInputHtmlWithValue(Attribute $attribute, $value)
      *
      * @param Attribute $attribute
      * @param mixed $value
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     protected function _getMultiSelectHtmlWithValue(Attribute $attribute, $value)
     {
@@ -209,7 +209,7 @@ protected function _getNumberFromToHtmlWithValue(Attribute $attribute, $value)
      *
      * @param Attribute $attribute
      * @param mixed $value
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     protected function _getSelectHtmlWithValue(Attribute $attribute, $value)
diff --git a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php
index bfa8777077193..bf9d5038128dc 100644
--- a/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php
+++ b/app/code/Magento/ImportExport/Block/Adminhtml/Import/Edit.php
@@ -37,7 +37,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php
index 11e383f853380..0730d06eeee32 100644
--- a/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php
+++ b/app/code/Magento/Indexer/Block/Backend/Grid/Column/Renderer/Updated.php
@@ -11,7 +11,7 @@ class Updated extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Datetim
      * Render indexer updated time
      *
      * @param \Magento\Framework\Object $row
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function render(\Magento\Framework\Object $row)
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit.php
index 43697870a0a5f..2c2df7dd5c64a 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit.php
@@ -94,7 +94,7 @@ protected function _construct()
     /**
      * Get header text for edit page.
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
index e5a8193adcb9f..9ecc712c50aff 100644
--- a/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
+++ b/app/code/Magento/Integration/Block/Adminhtml/Integration/Edit/Tab/Info.php
@@ -56,7 +56,7 @@ protected function _prepareForm()
     /**
      * Prepare label for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
diff --git a/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php b/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php
index a22e398d75abf..6857fa000779d 100644
--- a/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php
+++ b/app/code/Magento/Log/Block/Adminhtml/Customer/Edit/Tab/View/Status.php
@@ -89,7 +89,7 @@ public function getCustomer()
     /**
      * Get customer's current status
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getCurrentStatus()
     {
@@ -106,7 +106,7 @@ public function getCurrentStatus()
     /**
      * Get customer last login date
      *
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getLastLoginDate()
     {
@@ -118,7 +118,7 @@ public function getLastLoginDate()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getStoreLastLoginDate()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
index 4f9490d028c3e..ea00f911c8d58 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template.php
@@ -56,7 +56,7 @@ public function getCreateUrl()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
index 52641dcdc49fd..11eafbcac0890 100644
--- a/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
+++ b/app/code/Magento/Newsletter/Block/Adminhtml/Template/Edit.php
@@ -187,7 +187,7 @@ public function getEditMode()
     /**
      * Return header text for form
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
index 50627185999fd..2ec8148ba2bd1 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php
@@ -188,7 +188,7 @@ public function fetch(\Magento\Quote\Model\Quote\Address $address)
     /**
      * Get Shipping label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php b/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php
index 50cd9fc25275c..447ab43fa78b8 100644
--- a/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php
+++ b/app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php
@@ -177,7 +177,7 @@ public function fetch(Address $address)
     /**
      * Get Subtotal label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
index 523db6f6008be..4aabda290f681 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Grid/Column/Renderer/Customer.php
@@ -16,7 +16,7 @@ class Customer extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstra
      * Renders grid column
      *
      * @param \Magento\Framework\Object $row
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function render(\Magento\Framework\Object $row)
     {
diff --git a/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
index 0bf95fefe265a..bc16b2edc87bf 100644
--- a/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
+++ b/app/code/Magento/Reports/Block/Adminhtml/Product/Downloads/Renderer/Purchases.php
@@ -16,7 +16,7 @@ class Purchases extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\Abstr
      * Renders Purchases value
      *
      * @param \Magento\Framework\Object $row
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function render(\Magento\Framework\Object $row)
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Add.php b/app/code/Magento/Review/Block/Adminhtml/Add.php
index d2eae2be459bf..921dc41c0720a 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Add.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Add.php
@@ -123,7 +123,7 @@ protected function _construct()
     /**
      * Get add new review header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Edit.php
index 90b62eca191fc..6f2e129b0b626 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Edit.php
@@ -211,7 +211,7 @@ protected function _construct()
     /**
      * Get edit review header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php b/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
index ed58843a1aef8..9f0f240b0ece9 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Grid/Renderer/Type.php
@@ -16,7 +16,7 @@ class Type extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRe
      * Render review type
      *
      * @param \Magento\Framework\Object $row
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function render(\Magento\Framework\Object $row)
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit.php b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit.php
index 53f6266f21eee..76b0b4c8d3ff2 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rating/Edit.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rating/Edit.php
@@ -67,7 +67,7 @@ protected function _construct()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/ReviewTab.php b/app/code/Magento/Review/Block/Adminhtml/ReviewTab.php
index e346487443554..19a1f39858924 100644
--- a/app/code/Magento/Review/Block/Adminhtml/ReviewTab.php
+++ b/app/code/Magento/Review/Block/Adminhtml/ReviewTab.php
@@ -53,7 +53,7 @@ public function canShowTab()
     /**
      * Return Tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
diff --git a/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php b/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
index 793875f2625e6..ff35713def431 100644
--- a/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
+++ b/app/code/Magento/Review/Block/Adminhtml/Rss/Grid/Link.php
@@ -53,7 +53,7 @@ public function getLink()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/CustomerOrdersTab.php b/app/code/Magento/Sales/Block/Adminhtml/CustomerOrdersTab.php
index 55572c8ac896a..622a547e3d825 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/CustomerOrdersTab.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/CustomerOrdersTab.php
@@ -53,7 +53,7 @@ public function canShowTab()
     /**
      * Return Tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php
index bb857a0b812a2..a3be8dcd152f6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address.php
@@ -49,7 +49,7 @@ protected function _construct()
     /**
      * Retrieve text for header element depending on loaded page
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
index c2b04646e891d..ca5f98286d6b9 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Address/Form.php
@@ -119,7 +119,7 @@ protected function _prepareForm()
     /**
      * Form header text getter
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
index a72cf38445f4c..0ed970dd74cd4 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Address.php
@@ -16,7 +16,7 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
     /**
      * Return header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php
index b638bdfff23b4..31bbb781d6a98 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Billing/Method.php
@@ -26,7 +26,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
index 854cc5e519b40..729ad53647ed2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Comment.php
@@ -32,7 +32,7 @@ public function getHeaderCssClass()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php
index a22f8aee07f2c..2a2b62e896d85 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Coupons.php
@@ -36,7 +36,7 @@ public function getCouponCode()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
index fbfe0c0fca60d..15f41844176a8 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Customer.php
@@ -26,7 +26,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
index 08137358bf707..480d8900659d6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Form/Account.php
@@ -90,7 +90,7 @@ public function getHeaderCssClass()
     /**
      * Return header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php
index 0dcf68c9a6437..295226fcf0a18 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items.php
@@ -35,7 +35,7 @@ protected function _construct()
     /**
      * Accordion header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
index 6d53e62c71ab3..9feb4b05070fa 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Items/Grid.php
@@ -342,7 +342,7 @@ public function canApplyCustomPrice($item)
      * Get qty title
      *
      * @param Item $item
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getQtyTitle($item)
     {
@@ -502,7 +502,7 @@ public function displayRowTotalWithDiscountInclTax($item)
     /**
      * Get including/excluding tax message
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getInclExclTaxMessage()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php
index fecb73b90642b..add96720785be 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Newsletter.php
@@ -26,7 +26,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
index 7721c66f8938e..cf3225dcb8eec 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Search.php
@@ -26,7 +26,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
index e6c03f666a8e8..01084b387a680 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Address.php
@@ -16,7 +16,7 @@ class Address extends \Magento\Sales\Block\Adminhtml\Order\Create\Form\Address
     /**
      * Return header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php
index 347885d75331d..569ef920e8ab1 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Shipping/Method.php
@@ -26,7 +26,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
index c943808fb716e..b9ec00f5c015f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php
@@ -34,7 +34,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php
index 941c14498bb52..a81eaea0a337f 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Compared.php
@@ -27,7 +27,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php
index bb3b26ae14b2e..1daef9546a181 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pcompared.php
@@ -68,7 +68,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php
index b38deb232eab0..635c5e7ee4f64 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Pviewed.php
@@ -68,7 +68,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php
index bdb949f46fe83..b58e7e482c5cc 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Reorder.php
@@ -65,7 +65,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php
index 6353e12817e5c..bde3e5ce218c2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Viewed.php
@@ -47,7 +47,7 @@ public function canRemoveItems()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php
index f1883402416c6..9a4fe79415a78 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Wishlist.php
@@ -34,7 +34,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
index 781b39dcc0dcb..908dabf48c15c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Store.php
@@ -26,7 +26,7 @@ protected function _construct()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
index 66dc3274dd4de..99753aeafa16b 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php
@@ -89,7 +89,7 @@ public function getTotals()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
index 1d00dad06c8c5..476a33c185b0c 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals/Shipping.php
@@ -97,7 +97,7 @@ public function getShippingExcludeTax()
     /**
      * Get label for shipping include tax
      *
-     * @return float
+     * @return \Magento\Framework\Phrase
      */
     public function getIncludeTaxLabel()
     {
@@ -110,7 +110,7 @@ public function getIncludeTaxLabel()
     /**
      * Get label for shipping exclude tax
      *
-     * @return float
+     * @return \Magento\Framework\Phrase
      */
     public function getExcludeTaxLabel()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php
index 62be3871c7767..ae12ef9bb44de 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Creditmemo/View.php
@@ -125,7 +125,7 @@ public function getCreditmemo()
     /**
      * Retrieve text for header
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
index 598eed53a15d6..10732ed47b941 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Invoice/View.php
@@ -184,7 +184,7 @@ public function getInvoice()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
index 1b5ac5fa8485e..c0e17475e76b6 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Assign.php
@@ -25,7 +25,7 @@ protected function _construct()
     /**
      * Retrieve text for header element depending on loaded page
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
index 5d1057467227c..932092f310ea2 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/Edit.php
@@ -22,7 +22,7 @@ protected function _construct()
     /**
      * Retrieve text for header element depending on loaded page
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php
index c56dfd0815a1f..e951943f72ef5 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/Status/NewStatus.php
@@ -27,7 +27,7 @@ protected function _construct()
     /**
      * Retrieve text for header element depending on loaded page
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
index 79020e2a0c590..b295e9a275f21 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Order/View.php
@@ -273,7 +273,7 @@ public function getOrderId()
     /**
      * Get header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
@@ -452,7 +452,7 @@ public function getReviewPaymentUrl($action)
 
     /**
      * @param \Magento\Sales\Model\Order $order
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function getEditMessage($order)
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
index 3619d8fc8c15e..99a9ac9af5877 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Rss/Order/Grid/Link.php
@@ -44,7 +44,7 @@ public function getLink()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
index 85df1fdba8565..04882426490e8 100644
--- a/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
+++ b/app/code/Magento/Sales/Block/Adminhtml/Transactions/Detail.php
@@ -75,7 +75,7 @@ protected function _construct()
     /**
      * Retrieve header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Sales/Block/Order/Creditmemo.php b/app/code/Magento/Sales/Block/Order/Creditmemo.php
index a40ee9a1471fb..e0bc7646fd75a 100644
--- a/app/code/Magento/Sales/Block/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Block/Order/Creditmemo.php
@@ -93,7 +93,7 @@ public function getBackUrl()
     /**
      * Return back title for logged in and guest users
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getBackTitle()
     {
diff --git a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
index be7427e45e143..935f3f37a3e23 100644
--- a/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
+++ b/app/code/Magento/Sales/Block/Order/Info/Buttons/Rss.php
@@ -51,7 +51,7 @@ public function getLink()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Sales/Block/Order/Invoice.php b/app/code/Magento/Sales/Block/Order/Invoice.php
index 134a8df7c507f..fd4b1a0c9e6a1 100644
--- a/app/code/Magento/Sales/Block/Order/Invoice.php
+++ b/app/code/Magento/Sales/Block/Order/Invoice.php
@@ -91,7 +91,7 @@ public function getBackUrl()
     /**
      * Return back title for logged in and guest users
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getBackTitle()
     {
diff --git a/app/code/Magento/Sales/Block/Order/View.php b/app/code/Magento/Sales/Block/Order/View.php
index d026152cccb8d..28c6ed8bbc733 100644
--- a/app/code/Magento/Sales/Block/Order/View.php
+++ b/app/code/Magento/Sales/Block/Order/View.php
@@ -99,7 +99,7 @@ public function getBackUrl()
     /**
      * Return back title for logged in and guest users
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getBackTitle()
     {
diff --git a/app/code/Magento/Sales/Model/Order/Config.php b/app/code/Magento/Sales/Model/Order/Config.php
index 861fc76ef3446..aa34d1b3d2f80 100644
--- a/app/code/Magento/Sales/Model/Order/Config.php
+++ b/app/code/Magento/Sales/Model/Order/Config.php
@@ -109,7 +109,7 @@ public function getStatusLabel($code)
      * State label getter
      *
      * @param   string $state
-     * @return  string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getStateLabel($state)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Creditmemo.php b/app/code/Magento/Sales/Model/Order/Creditmemo.php
index b9a2aea4780d6..5f896bd6fc5b1 100644
--- a/app/code/Magento/Sales/Model/Order/Creditmemo.php
+++ b/app/code/Magento/Sales/Model/Order/Creditmemo.php
@@ -643,7 +643,7 @@ public static function getStates()
      * Retrieve Creditmemo state name by state identifier
      *
      * @param   int $stateId
-     * @return  string
+     * @return \Magento\Framework\Phrase
      */
     public function getStateName($stateId = null)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Invoice.php b/app/code/Magento/Sales/Model/Order/Invoice.php
index b494782a7dfab..42914cbf3930f 100644
--- a/app/code/Magento/Sales/Model/Order/Invoice.php
+++ b/app/code/Magento/Sales/Model/Order/Invoice.php
@@ -597,7 +597,7 @@ public static function getStates()
      * Retrieve invoice state name by state identifier
      *
      * @param   int|null $stateId
-     * @return  string
+     * @return \Magento\Framework\Phrase
      */
     public function getStateName($stateId = null)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Item.php b/app/code/Magento/Sales/Model/Order/Item.php
index fcc9aa7959fb3..e87e1709f1bb2 100644
--- a/app/code/Magento/Sales/Model/Order/Item.php
+++ b/app/code/Magento/Sales/Model/Order/Item.php
@@ -451,7 +451,7 @@ public function getStatus()
      * Retrieve status name
      *
      * @param string $statusId
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public static function getStatusName($statusId)
     {
diff --git a/app/code/Magento/Sales/Model/Order/Status.php b/app/code/Magento/Sales/Model/Order/Status.php
index ccd42956507f4..66397c68af520 100644
--- a/app/code/Magento/Sales/Model/Order/Status.php
+++ b/app/code/Magento/Sales/Model/Order/Status.php
@@ -127,7 +127,7 @@ public function getStoreLabels()
      * Get status label by store
      *
      * @param null|string|bool|int|\Magento\Store\Model\Store $store
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getStoreLabel($store = null)
     {
diff --git a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit.php b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit.php
index 54c95c52558fc..b1da3755b33d7 100644
--- a/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit.php
+++ b/app/code/Magento/SalesRule/Block/Adminhtml/Promo/Quote/Edit.php
@@ -62,7 +62,7 @@ protected function _construct()
     /**
      * Getter for form header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php b/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php
index b222ecb88e7e3..60c101114dd17 100644
--- a/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php
+++ b/app/code/Magento/Search/Block/Adminhtml/Term/Edit.php
@@ -47,7 +47,7 @@ protected function _construct()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
index 21322f5bc89ca..5fef943a12800 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
@@ -85,7 +85,7 @@ public function getRemoveUrl($track)
 
     /**
      * @param string $code
-     * @return false|string
+     * @return \Magento\Framework\Phrase|bool
      */
     public function getCarrierTitle($code)
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/View.php b/app/code/Magento/Shipping/Block/Adminhtml/View.php
index d2ad4c75d78c7..70885bfe1de7e 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/View.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/View.php
@@ -83,7 +83,7 @@ public function getShipment()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Shipping/Block/Order/Shipment.php b/app/code/Magento/Shipping/Block/Order/Shipment.php
index 1dbeae6472e27..d8ab31cad1220 100644
--- a/app/code/Magento/Shipping/Block/Order/Shipment.php
+++ b/app/code/Magento/Shipping/Block/Order/Shipment.php
@@ -99,7 +99,7 @@ public function getBackUrl()
     /**
      * Return back title for logged in and guest users
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getBackTitle()
     {
diff --git a/app/code/Magento/Shipping/Model/Order/Track.php b/app/code/Magento/Shipping/Model/Order/Track.php
index ad9b5d7383834..57dc752687593 100644
--- a/app/code/Magento/Shipping/Model/Order/Track.php
+++ b/app/code/Magento/Shipping/Model/Order/Track.php
@@ -87,7 +87,7 @@ public function __construct(
     /**
      * Retrieve detail for shipment track
      *
-     * @return string
+     * @return \Magento\Framework\Phrase|string
      */
     public function getNumberDetail()
     {
diff --git a/app/code/Magento/Shipping/Model/Tracking/Result/Error.php b/app/code/Magento/Shipping/Model/Tracking/Result/Error.php
index a13d075b52896..e358d27e262b1 100644
--- a/app/code/Magento/Shipping/Model/Tracking/Result/Error.php
+++ b/app/code/Magento/Shipping/Model/Tracking/Result/Error.php
@@ -16,7 +16,7 @@ public function getAllData()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getErrorMessage()
     {
diff --git a/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php b/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
index 7ff6832630672..12dd3a36b8de3 100644
--- a/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
+++ b/app/code/Magento/Sitemap/Block/Adminhtml/Edit.php
@@ -67,7 +67,7 @@ protected function _construct()
     /**
      * Get edit form container header text
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Tax/Block/Checkout/Shipping.php b/app/code/Magento/Tax/Block/Checkout/Shipping.php
index d2da39ae3a85d..8813b2a552563 100644
--- a/app/code/Magento/Tax/Block/Checkout/Shipping.php
+++ b/app/code/Magento/Tax/Block/Checkout/Shipping.php
@@ -86,7 +86,7 @@ public function getShippingExcludeTax()
     /**
      * Get label for shipping include tax
      *
-     * @return float
+     * @return \Magento\Framework\Phrase
      */
     public function getIncludeTaxLabel()
     {
@@ -99,7 +99,7 @@ public function getIncludeTaxLabel()
     /**
      * Get label for shipping exclude tax
      *
-     * @return float
+     * @return \Magento\Framework\Phrase
      */
     public function getExcludeTaxLabel()
     {
diff --git a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
index cfccee02b695f..d34dc2f0032a5 100644
--- a/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
+++ b/app/code/Magento/Tax/Model/Sales/Total/Quote/Tax.php
@@ -365,7 +365,7 @@ public function processConfigArray($config, $store)
     /**
      * Get Tax label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {
diff --git a/app/code/Magento/Tax/Model/TaxClass/Type/Customer.php b/app/code/Magento/Tax/Model/TaxClass/Type/Customer.php
index 771ba0af3cc8e..a46d45fc4a0e3 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Type/Customer.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Type/Customer.php
@@ -75,7 +75,7 @@ public function isAssignedToObjects()
     /**
      * Get Name of Objects that use this Tax Class Type
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getObjectTypeName()
     {
diff --git a/app/code/Magento/Tax/Model/TaxClass/Type/Product.php b/app/code/Magento/Tax/Model/TaxClass/Type/Product.php
index aab30c5a14932..bbd1696b78cd4 100644
--- a/app/code/Magento/Tax/Model/TaxClass/Type/Product.php
+++ b/app/code/Magento/Tax/Model/TaxClass/Type/Product.php
@@ -49,7 +49,7 @@ public function isAssignedToObjects()
     /**
      * Get Name of Objects that use this Tax Class Type
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getObjectTypeName()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php
index 98fc687b13418..9528fcb4220f1 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme.php
@@ -30,7 +30,7 @@ public function _construct()
     /**
      * Prepare header for container
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
index 9d584eb8a1d0f..3735dc31f4267 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Css.php
@@ -277,7 +277,7 @@ protected function _getAdditionalElementTypes()
     /**
      * Return Tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php
index cf8ff3cb90a26..d0ce6dfc81fcd 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/General.php
@@ -245,7 +245,7 @@ protected function _getAdditionalElementTypes()
     /**
      * Prepare label for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -300,7 +300,7 @@ protected function _getDefaultsInherited($themesCollections)
     /**
      * Get note string for theme's preview image
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getPreviewImageNote()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
index 2154fe1fe66d5..d2f2a3c811dbe 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/System/Design/Theme/Edit/Tab/Js.php
@@ -86,7 +86,7 @@ protected function _getAdditionalElementTypes()
     /**
      * Return Tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -109,7 +109,7 @@ public function getJsUploadUrl()
     /**
      * Get note string for js file to Upload
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     protected function _getUploadJsFileNote()
     {
diff --git a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php
index 21d0f4e1958bf..28f8272443f22 100644
--- a/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php
+++ b/app/code/Magento/Theme/Block/Adminhtml/Wysiwyg/Files/Tree.php
@@ -63,7 +63,7 @@ public function getTreeJson($data)
     /**
      * Get root node name of tree
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getRootNodeName()
     {
diff --git a/app/code/Magento/UrlRewrite/Block/Selector.php b/app/code/Magento/UrlRewrite/Block/Selector.php
index 179225d1b20d9..5ad0d7239fc05 100644
--- a/app/code/Magento/UrlRewrite/Block/Selector.php
+++ b/app/code/Magento/UrlRewrite/Block/Selector.php
@@ -48,7 +48,7 @@ public function getModes()
     /**
      * Label getter
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getSelectorLabel()
     {
diff --git a/app/code/Magento/User/Block/Role/Tab/Edit.php b/app/code/Magento/User/Block/Role/Tab/Edit.php
index 9939d364cc018..e78fb534fe299 100644
--- a/app/code/Magento/User/Block/Role/Tab/Edit.php
+++ b/app/code/Magento/User/Block/Role/Tab/Edit.php
@@ -78,7 +78,7 @@ public function __construct(
     /**
      * Get tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
diff --git a/app/code/Magento/User/Block/Role/Tab/Info.php b/app/code/Magento/User/Block/Role/Tab/Info.php
index a9f9b8659f4d8..f820aedbfc3ed 100644
--- a/app/code/Magento/User/Block/Role/Tab/Info.php
+++ b/app/code/Magento/User/Block/Role/Tab/Info.php
@@ -13,7 +13,7 @@
 class Info extends \Magento\Backend\Block\Widget\Form\Generic implements \Magento\Backend\Block\Widget\Tab\TabInterface
 {
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
diff --git a/app/code/Magento/User/Block/User/Edit.php b/app/code/Magento/User/Block/User/Edit.php
index 57d1b0670443e..e514b5c3e0c3d 100644
--- a/app/code/Magento/User/Block/User/Edit.php
+++ b/app/code/Magento/User/Block/User/Edit.php
@@ -66,7 +66,7 @@ protected function _construct()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Webapi/Block/Adminhtml/Integration/Edit/Tab/Webapi.php b/app/code/Magento/Webapi/Block/Adminhtml/Integration/Edit/Tab/Webapi.php
index 7fc4eeff960b2..4fd7cef33f190 100644
--- a/app/code/Magento/Webapi/Block/Adminhtml/Integration/Edit/Tab/Webapi.php
+++ b/app/code/Magento/Webapi/Block/Adminhtml/Integration/Edit/Tab/Webapi.php
@@ -80,7 +80,7 @@ public function __construct(
     /**
      * Get tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php
index ead0009cb3d3e..17d92e42cdd4f 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit.php
@@ -88,7 +88,7 @@ protected function _preparelayout()
     /**
      * Return translated header text depending on creating/editing action
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
index 409741cec2280..23b609a0e5b35 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main.php
@@ -58,7 +58,7 @@ protected function _construct()
     /**
      * Prepare label for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -68,7 +68,7 @@ public function getTabLabel()
     /**
      * Prepare title for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
index 665a0dcda7163..0e8bf775c48a1 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Properties.php
@@ -29,7 +29,7 @@ class Properties extends \Magento\Widget\Block\Adminhtml\Widget\Options implemen
     /**
      * Prepare label for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -39,7 +39,7 @@ public function getTabLabel()
     /**
      * Prepare title for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
index 8a0e920f9b4b5..e09cf07bcbc12 100644
--- a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
+++ b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Settings.php
@@ -56,7 +56,7 @@ protected function _construct()
     /**
      * Prepare label for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
@@ -66,7 +66,7 @@ public function getTabLabel()
     /**
      * Prepare title for tab
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabTitle()
     {
diff --git a/app/code/Magento/Widget/Model/Widget/Instance.php b/app/code/Magento/Widget/Model/Widget/Instance.php
index f0344e35cc13a..8d0d1590e99ea 100644
--- a/app/code/Magento/Widget/Model/Widget/Instance.php
+++ b/app/code/Magento/Widget/Model/Widget/Instance.php
@@ -253,7 +253,7 @@ public function beforeSave()
     /**
      * Validate widget instance data
      *
-     * @return string|boolean
+     * @return \Magento\Framework\Phrase|bool
      */
     public function validate()
     {
diff --git a/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php b/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php
index e091f7eea83ae..2f393bf6d2c40 100644
--- a/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php
+++ b/app/code/Magento/Wishlist/Block/Adminhtml/WishlistTab.php
@@ -53,7 +53,7 @@ public function canShowTab()
     /**
      * Return Tab label
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTabLabel()
     {
diff --git a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
index 1898c981c239b..0489106ea8e5c 100644
--- a/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
+++ b/app/code/Magento/Wishlist/Block/Customer/Sidebar.php
@@ -18,7 +18,7 @@ class Sidebar extends \Magento\Wishlist\Block\AbstractBlock implements \Magento\
     /**
      * Retrieve block title
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getTitle()
     {
diff --git a/app/code/Magento/Wishlist/Block/Link.php b/app/code/Magento/Wishlist/Block/Link.php
index d7642bc5c86cd..a058f729d14c5 100644
--- a/app/code/Magento/Wishlist/Block/Link.php
+++ b/app/code/Magento/Wishlist/Block/Link.php
@@ -62,7 +62,7 @@ public function getHref()
     }
 
     /**
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getLabel()
     {
@@ -99,7 +99,7 @@ protected function _getItemCount()
      * Create button label based on wishlist item quantity
      *
      * @param int $count
-     * @return string|void
+     * @return \Magento\Framework\Phrase|void
      */
     protected function _createCounter($count)
     {
diff --git a/app/code/Magento/Wishlist/Block/Share/Wishlist.php b/app/code/Magento/Wishlist/Block/Share/Wishlist.php
index be45d44da4aa4..a53c422bb7ac5 100644
--- a/app/code/Magento/Wishlist/Block/Share/Wishlist.php
+++ b/app/code/Magento/Wishlist/Block/Share/Wishlist.php
@@ -78,7 +78,7 @@ public function getWishlistCustomer()
     /**
      * Retrieve Page Header
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getHeader()
     {
diff --git a/app/code/Magento/Wishlist/Helper/Data.php b/app/code/Magento/Wishlist/Helper/Data.php
index 2eed816763a18..f78cc12771acf 100644
--- a/app/code/Magento/Wishlist/Helper/Data.php
+++ b/app/code/Magento/Wishlist/Helper/Data.php
@@ -476,7 +476,7 @@ public function getRssUrl($wishlistId = null)
     /**
      * Retrieve default empty comment message
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function defaultCommentString()
     {
@@ -486,7 +486,7 @@ public function defaultCommentString()
     /**
      * Retrieve default empty comment message
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getDefaultWishlistName()
     {
diff --git a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
index 2afcaf9f3f01d..18830770789d6 100644
--- a/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
+++ b/lib/internal/Magento/Framework/Data/Form/Element/Editor.php
@@ -400,7 +400,7 @@ public function getConfig($key = null)
      * Translate string using defined helper
      *
      * @param string $string String to be translated
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function translate($string)
     {
diff --git a/lib/internal/Magento/Framework/Exception/ErrorMessage.php b/lib/internal/Magento/Framework/Exception/ErrorMessage.php
index 30308495f6a4d..10cfaf2c8b37b 100644
--- a/lib/internal/Magento/Framework/Exception/ErrorMessage.php
+++ b/lib/internal/Magento/Framework/Exception/ErrorMessage.php
@@ -56,7 +56,7 @@ public function getParameters()
     /**
      * Return the message localized to based on the locale of the current request.
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getMessage()
     {

From e5b09a9f8a9798332125c8b293d5d0a4af9cc890 Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Wed, 28 Jan 2015 12:47:42 +0200
Subject: [PATCH 25/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php   | 2 ++
 app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php  | 4 ++--
 app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php   | 2 +-
 app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php    | 4 ++--
 app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php | 1 +
 app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php   | 2 +-
 app/code/Magento/Cms/Helper/Page.php                       | 3 +++
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
index c39e76094f796..e198db27e1700 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
@@ -21,6 +21,8 @@ class Edit extends \Magento\Cms\Controller\Adminhtml\Block
     /**
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Registry $coreRegistry
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
index cd471a88ba149..306668ffe6ac4 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php
@@ -21,8 +21,8 @@ class Delete extends \Magento\Backend\App\Action
      */
     public function __construct(
         Action\Context $context,
-        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory)
-    {
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+    ) {
         $this->resultRedirectFactory = $resultRedirectFactory;
         parent::__construct($context);
     }
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
index 15289145a097c..8c46f49a67646 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
@@ -51,7 +51,7 @@ public function execute()
         $resultPage = $this->resultPageFactory->create();
         $resultPage->setActiveMenu('Magento_Cms::cms_page');
         $resultPage->addBreadcrumb(__('CMS'), __('CMS'));
-        $resultPage->addBreadcrumb(__('Manage Pages'),__('Manage Pages'));
+        $resultPage->addBreadcrumb(__('Manage Pages'), __('Manage Pages'));
         $resultPage->getConfig()->getTitle()->prepend(__('Pages'));
 
         return $resultPage;
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
index ddfba2910aa5d..fcfe1823ca400 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Save.php
@@ -29,8 +29,8 @@ class Save extends \Magento\Backend\App\Action
     public function __construct(
         Action\Context $context,
         PostDataProcessor $dataProcessor,
-        RedirectFactory $resultRedirectFactory)
-    {
+        RedirectFactory $resultRedirectFactory
+    ) {
         $this->dataProcessor = $dataProcessor;
         $this->resultRedirectFactory = $resultRedirectFactory;
         parent::__construct($context);
diff --git a/app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php b/app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php
index 5ca800f626c90..87212dd161690 100644
--- a/app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php
+++ b/app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php
@@ -15,6 +15,7 @@ class DefaultNoCookies extends \Magento\Framework\App\Action\Action
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
index e78aa54248da1..2e97a33acafa6 100644
--- a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
+++ b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
@@ -17,7 +17,7 @@ class DefaultNoRoute extends \Magento\Framework\App\Action\Action
 
     /**
      * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\View\Result\LayoutFactory
+     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
      */
     public function __construct(
         \Magento\Backend\App\Action\Context $context,
diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index 5b87e413df975..5f1f4adb3b741 100755
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\App\Action\Action;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 /**
  * CMS Page Helper
  */

From b638f76beed2907bf277845a724cf5d05382bfca Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Wed, 28 Jan 2015 13:13:54 +0200
Subject: [PATCH 26/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Helper/Page.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index 5f1f4adb3b741..6ca8fc63703d9 100755
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -6,12 +6,9 @@
 namespace Magento\Cms\Helper;
 
 use Magento\Framework\App\Action\Action;
-
-/**
- * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
- */
 /**
  * CMS Page Helper
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Page extends \Magento\Framework\App\Helper\AbstractHelper
 {

From 3f6742835136ef4d3890b8f75247840fc7c86d2a Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Wed, 28 Jan 2015 13:23:03 +0200
Subject: [PATCH 27/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Helper/Page.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index 6ca8fc63703d9..70d127c9f9b74 100755
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -6,6 +6,7 @@
 namespace Magento\Cms\Helper;
 
 use Magento\Framework\App\Action\Action;
+
 /**
  * CMS Page Helper
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)

From 99f5d141f82e4fec21c4e6e1f7f7ab8c11abac07 Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Wed, 28 Jan 2015 13:47:05 +0200
Subject: [PATCH 28/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
index 8c46f49a67646..62013bc6fee6e 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
@@ -19,15 +19,13 @@ class Index extends \Magento\Backend\App\Action
 
     /**
      * @param Context $context
-     * @param Registry $coreRegistry
      * @param PageFactory $resultPageFactory
      */
     public function __construct(
         Context $context,
-        Registry $coreRegistry,
         PageFactory $resultPageFactory
     ) {
-        parent::__construct($context, $coreRegistry);
+        parent::__construct($context);
         $this->resultPageFactory = $resultPageFactory;
     }
     /**

From 6798898232864ed569647d7123c1613712403305 Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Wed, 28 Jan 2015 14:47:03 +0200
Subject: [PATCH 29/94] MAGETWO-31524: Refactor controller actions in the CMS
 module

---
 .../Magento/Cms/Controller/Index/Index.php    |  2 +-
 .../Cms/Controller/Index/NoCookies.php        |  2 +-
 .../Magento/Cms/Controller/Noroute/Index.php  |  6 +-
 app/code/Magento/Cms/Controller/Page/View.php |  2 +-
 app/code/Magento/Cms/Helper/Page.php          | 98 +++++++++++++++++--
 5 files changed, 96 insertions(+), 14 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Index/Index.php b/app/code/Magento/Cms/Controller/Index/Index.php
index 0200f0fe868d6..fe007e0d5173d 100755
--- a/app/code/Magento/Cms/Controller/Index/Index.php
+++ b/app/code/Magento/Cms/Controller/Index/Index.php
@@ -40,7 +40,7 @@ public function execute($coreRoute = null)
             \Magento\Cms\Helper\Page::XML_PATH_HOME_PAGE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
-        $resultPage = $this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId);
+        $resultPage = $this->_objectManager->get('Magento\Cms\Helper\Page')->prepareResultPage($this, $pageId);
         if (!$resultPage) {
             /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
             $resultForward = $this->resultForwardFactory->create();
diff --git a/app/code/Magento/Cms/Controller/Index/NoCookies.php b/app/code/Magento/Cms/Controller/Index/NoCookies.php
index 525811c57bea1..2dc5168487b0e 100755
--- a/app/code/Magento/Cms/Controller/Index/NoCookies.php
+++ b/app/code/Magento/Cms/Controller/Index/NoCookies.php
@@ -39,7 +39,7 @@ public function execute()
             \Magento\Cms\Helper\Page::XML_PATH_NO_COOKIES_PAGE,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
-        $resultPage = $this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId);
+        $resultPage = $this->_objectManager->get('Magento\Cms\Helper\Page')->prepareResultPage($this, $pageId);
         if (!$resultPage) {
             $resultForward = $this->resultForwardFactory->create();
             return $resultForward->forward('defaultNoCookies');
diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php
index 7a56b79b17d12..1eeb70b5010e8 100755
--- a/app/code/Magento/Cms/Controller/Noroute/Index.php
+++ b/app/code/Magento/Cms/Controller/Noroute/Index.php
@@ -28,7 +28,7 @@ public function __construct(
     /**
      * Render CMS 404 Not found page
      *
-     * @return \Magento\Backend\Model\View\Result\Forward
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
@@ -46,10 +46,12 @@ public function execute()
         );
         /** @var \Magento\Cms\Helper\Page $pageHelper */
         $pageHelper = $this->_objectManager->get('Magento\Cms\Helper\Page');
-        if (!$pageHelper->renderPage($this, $pageId)) {
+        $resultPage = $pageHelper->prepareResultPage($this, $pageId);
+        if (!$resultPage) {
             $resultForward->setController('index');
             $resultForward->forward('defaultNoRoute');
             return $resultForward;
         }
+        return $resultPage;
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Page/View.php b/app/code/Magento/Cms/Controller/Page/View.php
index a7e92fda6ec51..fcab11addfc5d 100755
--- a/app/code/Magento/Cms/Controller/Page/View.php
+++ b/app/code/Magento/Cms/Controller/Page/View.php
@@ -33,7 +33,7 @@ public function __construct(
     public function execute()
     {
         $pageId = $this->getRequest()->getParam('page_id', $this->getRequest()->getParam('id', false));
-        $resultPage = $this->_objectManager->get('Magento\Cms\Helper\Page')->renderPage($this, $pageId);
+        $resultPage = $this->_objectManager->get('Magento\Cms\Helper\Page')->prepareResultPage($this, $pageId);
         if (!$resultPage) {
             $resultForward = $this->resultForwardFactory->create();
             return $resultForward->forward('noroute');
diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index 70d127c9f9b74..d97da675844f4 100755
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -129,6 +129,87 @@ public function __construct(
         parent::__construct($context);
     }
 
+    /**
+     * Return result CMS page
+     *
+     * @param Action $action
+     * @param null $pageId
+     * @return \Magento\Framework\View\Result\Page|bool
+     */
+    public function prepareResultPage(Action $action, $pageId = null)
+    {
+        if (!is_null($pageId) && $pageId !== $this->_page->getId()) {
+            $delimiterPosition = strrpos($pageId, '|');
+            if ($delimiterPosition) {
+                $pageId = substr($pageId, 0, $delimiterPosition);
+            }
+
+            $this->_page->setStoreId($this->_storeManager->getStore()->getId());
+            if (!$this->_page->load($pageId)) {
+                return false;
+            }
+        }
+
+        if (!$this->_page->getId()) {
+            return false;
+        }
+
+        $inRange = $this->_localeDate->isScopeDateInInterval(
+            null,
+            $this->_page->getCustomThemeFrom(),
+            $this->_page->getCustomThemeTo()
+        );
+
+        if ($this->_page->getCustomTheme()) {
+            if ($inRange) {
+                $this->_design->setDesignTheme($this->_page->getCustomTheme());
+            }
+        }
+        /** @var \Magento\Framework\View\Result\Page $resultPage */
+        $resultPage = $this->resultPageFactory->create();
+        if ($this->_page->getPageLayout()) {
+            if ($this->_page->getCustomPageLayout()
+                && $this->_page->getCustomPageLayout() != 'empty'
+                && $inRange
+            ) {
+                $handle = $this->_page->getCustomPageLayout();
+            } else {
+                $handle = $this->_page->getPageLayout();
+            }
+            $resultPage->getConfig()->setPageLayout($handle);
+        }
+        $resultPage->initLayout();
+        $resultPage->addHandle('cms_page_view');
+        $resultPage->addPageLayoutHandles(['id' => $this->_page->getIdentifier()]);
+
+        $this->_eventManager->dispatch(
+            'cms_page_render',
+            ['page' => $this->_page, 'controller_action' => $action]
+        );
+
+        if ($this->_page->getCustomLayoutUpdateXml() && $inRange) {
+            $layoutUpdate = $this->_page->getCustomLayoutUpdateXml();
+        } else {
+            $layoutUpdate = $this->_page->getLayoutUpdateXml();
+        }
+        if (!empty($layoutUpdate)) {
+            $resultPage->getLayout()->getUpdate()->addUpdate($layoutUpdate);
+        }
+
+        $contentHeadingBlock = $resultPage->getLayout()->getBlock('page_content_heading');
+        if ($contentHeadingBlock) {
+            $contentHeading = $this->_escaper->escapeHtml($this->_page->getContentHeading());
+            $contentHeadingBlock->setContentHeading($contentHeading);
+        }
+
+        /* @TODO: Move catalog and checkout storage types to appropriate modules */
+        $messageBlock = $resultPage->getLayout()->getMessagesBlock();
+        $messageBlock->addStorageType($this->messageManager->getDefaultGroup());
+        $messageBlock->addMessages($this->messageManager->getMessages(true));
+
+        return $resultPage;
+    }
+
     /**
      * Renders CMS page on front end
      *
@@ -136,7 +217,7 @@ public function __construct(
      *
      * @param Action $action
      * @param int $pageId
-     * @return bool|\Magento\Framework\View\Result\Page
+     * @return bool
      */
     public function renderPage(Action $action, $pageId = null)
     {
@@ -148,12 +229,12 @@ public function renderPage(Action $action, $pageId = null)
      *
      * @param Action $action
      * @param int $pageId
-     * @param bool $returnPage
-     * @return bool|\Magento\Framework\View\Result\Page
+     * @param bool $renderLayout
+     * @return bool
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    protected function _renderPage(Action $action, $pageId = null, $returnPage = true)
+    protected function _renderPage(Action $action, $pageId = null, $renderLayout = true)
     {
         if (!is_null($pageId) && $pageId !== $this->_page->getId()) {
             $delimiterPosition = strrpos($pageId, '|');
@@ -182,8 +263,7 @@ protected function _renderPage(Action $action, $pageId = null, $returnPage = tru
                 $this->_design->setDesignTheme($this->_page->getCustomTheme());
             }
         }
-        /** @var \Magento\Framework\View\Result\Page $resultPage */
-        $resultPage = $this->resultPageFactory->create();
+        $resultPage = $this->_view->getPage();
         if ($this->_page->getPageLayout()) {
             if ($this->_page->getCustomPageLayout()
                 && $this->_page->getCustomPageLayout() != 'empty'
@@ -224,8 +304,8 @@ protected function _renderPage(Action $action, $pageId = null, $returnPage = tru
         $messageBlock->addStorageType($this->messageManager->getDefaultGroup());
         $messageBlock->addMessages($this->messageManager->getMessages(true));
 
-        if ($returnPage) {
-            return $resultPage;
+        if ($renderLayout) {
+            $this->_view->renderLayout();
         }
 
         return true;
@@ -239,7 +319,7 @@ protected function _renderPage(Action $action, $pageId = null, $returnPage = tru
      * @param Action $action
      * @param int $pageId
      * @param bool $renderLayout
-     * @return bool|\Magento\Framework\View\Result\Page
+     * @return bool
      */
     public function renderPageExtended(Action $action, $pageId = null, $renderLayout = true)
     {

From 4114be5700de1a4961342b3eb1d8be02d0dfbd52 Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Wed, 28 Jan 2015 15:37:56 +0200
Subject: [PATCH 30/94] MAGETWO-33061: Fix annotations of the methods that
 return __()

---
 app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php | 2 +-
 .../Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php  | 2 +-
 app/code/Magento/Catalog/Model/Layer/Filter/Price.php           | 2 +-
 app/code/Magento/Centinel/Helper/Data.php                       | 2 +-
 .../DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content.php | 2 +-
 .../DesignEditor/Block/Adminhtml/Editor/Tools/Files/Tree.php    | 2 +-
 .../Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
index d9d163fd0c386..26491d6934760 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php
@@ -237,7 +237,7 @@ public function getTabsHtml()
     }
 
     /**
-     * @return \Magento\Framework\Phrase
+     * @return \Magento\Framework\Phrase|string
      */
     public function getHeader()
     {
diff --git a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
index 5d1cae2870c63..daa75bc93c75c 100644
--- a/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
+++ b/app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Config/YearRange.php
@@ -18,7 +18,7 @@ class YearRange extends Field
 {
     /**
      * @param AbstractElement $element
-     * @return \Magento\Framework\Phrase
+     * @return string
      */
     protected function _getElementHtml(AbstractElement $element)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
index 64be1378d0dc8..a14ba7b9d1cfd 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
@@ -210,7 +210,7 @@ public function getResetValue()
     /**
      * Get 'clear price' link text
      *
-     * @return \Magento\Framework\Phrase
+     * @return \Magento\Framework\Phrase|bool
      */
     public function getClearLinkText()
     {
diff --git a/app/code/Magento/Centinel/Helper/Data.php b/app/code/Magento/Centinel/Helper/Data.php
index 00880ca0290a3..393505eef9eb0 100644
--- a/app/code/Magento/Centinel/Helper/Data.php
+++ b/app/code/Magento/Centinel/Helper/Data.php
@@ -64,7 +64,7 @@ public function getCmpiValue($fieldName, $value)
      * Return text value for cmpi eci flag field
      *
      * @param string $value
-     * @return \Magento\Framework\Phrase
+     * @return \Magento\Framework\Phrase|string
      */
     private function _getCmpiEciValue($value)
     {
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content.php
index 9b85f19773dea..1278c2bfacd96 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Content.php
@@ -15,7 +15,7 @@ class Content extends \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content
     /**
      * Get header text
      *
-     * @return \Magento\Framework\Phrase
+     * @return string
      */
     public function getHeaderText()
     {
diff --git a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Tree.php b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Tree.php
index 879cf435ecb97..962bb3c0badf2 100644
--- a/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Tree.php
+++ b/app/code/Magento/DesignEditor/Block/Adminhtml/Editor/Tools/Files/Tree.php
@@ -14,7 +14,7 @@ class Tree extends \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Tree
     /**
      * Override root node name of tree specific to design editor.
      *
-     * @return \Magento\Framework\Phrase
+     * @return string
      */
     public function getRootNodeName()
     {
diff --git a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
index 5fef943a12800..c537188fd1e66 100644
--- a/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
+++ b/app/code/Magento/Shipping/Block/Adminhtml/Order/Tracking/View.php
@@ -85,7 +85,7 @@ public function getRemoveUrl($track)
 
     /**
      * @param string $code
-     * @return \Magento\Framework\Phrase|bool
+     * @return \Magento\Framework\Phrase|string|bool
      */
     public function getCarrierTitle($code)
     {

From f36eac2d72d6572e0427f6aa407b73c71531f00e Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Wed, 28 Jan 2015 15:38:51 +0200
Subject: [PATCH 31/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php     | 1 -
 app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
index 62013bc6fee6e..61405419a007b 100644
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Index.php
@@ -6,7 +6,6 @@
  */
 namespace Magento\Cms\Controller\Adminhtml\Page;
 
-use Magento\Framework\Registry;
 use Magento\Backend\App\Action\Context;
 use Magento\Framework\View\Result\PageFactory;
 
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
index 09e0f8139b5fe..100c0b05f2a0f 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/NewAction.php
@@ -14,11 +14,11 @@ class NewAction extends \Magento\Backend\App\Action
     protected $resultForwardFactory;
 
     /**
-     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
      */
     public function __construct(
-        \Magento\Framework\App\Action\Context $context,
+        \Magento\Backend\App\Action\Context $context,
         \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory
     ) {
         $this->resultForwardFactory = $resultForwardFactory;

From 6773730a416b5ef35e59817f970b43e1d6f1d33e Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Wed, 28 Jan 2015 16:14:11 +0200
Subject: [PATCH 32/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Helper/Page.php | 54 +++++++++++++++-------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index d97da675844f4..d0e6813ccbe14 100755
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -10,6 +10,8 @@
 /**
  * CMS Page Helper
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+ * @SuppressWarnings(PHPMD.NPathComplexity)
  */
 class Page extends \Magento\Framework\App\Helper\AbstractHelper
 {
@@ -165,19 +167,7 @@ public function prepareResultPage(Action $action, $pageId = null)
                 $this->_design->setDesignTheme($this->_page->getCustomTheme());
             }
         }
-        /** @var \Magento\Framework\View\Result\Page $resultPage */
-        $resultPage = $this->resultPageFactory->create();
-        if ($this->_page->getPageLayout()) {
-            if ($this->_page->getCustomPageLayout()
-                && $this->_page->getCustomPageLayout() != 'empty'
-                && $inRange
-            ) {
-                $handle = $this->_page->getCustomPageLayout();
-            } else {
-                $handle = $this->_page->getPageLayout();
-            }
-            $resultPage->getConfig()->setPageLayout($handle);
-        }
+        $resultPage = $this->_setLayoutType($inRange);
         $resultPage->initLayout();
         $resultPage->addHandle('cms_page_view');
         $resultPage->addPageLayoutHandles(['id' => $this->_page->getIdentifier()]);
@@ -263,18 +253,7 @@ protected function _renderPage(Action $action, $pageId = null, $renderLayout = t
                 $this->_design->setDesignTheme($this->_page->getCustomTheme());
             }
         }
-        $resultPage = $this->_view->getPage();
-        if ($this->_page->getPageLayout()) {
-            if ($this->_page->getCustomPageLayout()
-                && $this->_page->getCustomPageLayout() != 'empty'
-                && $inRange
-            ) {
-                $handle = $this->_page->getCustomPageLayout();
-            } else {
-                $handle = $this->_page->getPageLayout();
-            }
-            $resultPage->getConfig()->setPageLayout($handle);
-        }
+        $resultPage = $this->_setLayoutType($inRange);
         $resultPage->initLayout();
         $resultPage->addHandle('cms_page_view');
         $resultPage->addPageLayoutHandles(['id' => $this->_page->getIdentifier()]);
@@ -349,4 +328,29 @@ public function getPageUrl($pageId = null)
 
         return $this->_urlBuilder->getUrl(null, ['_direct' => $page->getIdentifier()]);
     }
+
+    /**
+     * Set layout type
+     *
+     * @param bool $inRange
+     * @return \Magento\Framework\View\Result\Page
+     */
+    protected function _setLayoutType($inRange)
+    {
+        /** @var \Magento\Framework\View\Result\Page $resultPage */
+        $resultPage = $this->resultPageFactory->create();
+        if ($this->_page->getPageLayout()) {
+            if ($this->_page->getCustomPageLayout()
+                && $this->_page->getCustomPageLayout() != 'empty'
+                && $inRange
+            ) {
+                $handle = $this->_page->getCustomPageLayout();
+            } else {
+                $handle = $this->_page->getPageLayout();
+            }
+            $resultPage->getConfig()->setPageLayout($handle);
+            return $resultPage;
+        }
+        return $resultPage;
+    }
 }

From 8d1b7260929763bc3832117c10654116cb13776b Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Wed, 28 Jan 2015 17:03:24 +0200
Subject: [PATCH 33/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Helper/Page.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index d0e6813ccbe14..f57b1ee8cca35 100755
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -167,7 +167,9 @@ public function prepareResultPage(Action $action, $pageId = null)
                 $this->_design->setDesignTheme($this->_page->getCustomTheme());
             }
         }
-        $resultPage = $this->_setLayoutType($inRange);
+        /** @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()]);
@@ -221,8 +223,6 @@ public function renderPage(Action $action, $pageId = null)
      * @param int $pageId
      * @param bool $renderLayout
      * @return bool
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function _renderPage(Action $action, $pageId = null, $renderLayout = true)
     {
@@ -253,7 +253,9 @@ protected function _renderPage(Action $action, $pageId = null, $renderLayout = t
                 $this->_design->setDesignTheme($this->_page->getCustomTheme());
             }
         }
-        $resultPage = $this->_setLayoutType($inRange);
+        /** @var \Magento\Framework\View\Result\Page $resultPage */
+        $resultPage = $this->_view->getPage();
+        $this->_setLayoutType($inRange, $resultPage);
         $resultPage->initLayout();
         $resultPage->addHandle('cms_page_view');
         $resultPage->addPageLayoutHandles(['id' => $this->_page->getIdentifier()]);
@@ -333,12 +335,11 @@ public function getPageUrl($pageId = null)
      * Set layout type
      *
      * @param bool $inRange
+     * @param \Magento\Framework\View\Result\Page $resultPage
      * @return \Magento\Framework\View\Result\Page
      */
-    protected function _setLayoutType($inRange)
+    protected function _setLayoutType($inRange, $resultPage)
     {
-        /** @var \Magento\Framework\View\Result\Page $resultPage */
-        $resultPage = $this->resultPageFactory->create();
         if ($this->_page->getPageLayout()) {
             if ($this->_page->getCustomPageLayout()
                 && $this->_page->getCustomPageLayout() != 'empty'
@@ -349,7 +350,6 @@ protected function _setLayoutType($inRange)
                 $handle = $this->_page->getPageLayout();
             }
             $resultPage->getConfig()->setPageLayout($handle);
-            return $resultPage;
         }
         return $resultPage;
     }

From 0d289721fc5ea18c87862c6c9797222c335ec598 Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Wed, 28 Jan 2015 17:28:11 +0200
Subject: [PATCH 34/94] MAGETWO-33058: Refactor Checkout module

---
 .../Magento/Checkout/Controller/Cart/Add.php  |  3 ++
 .../Checkout/Controller/Cart/Configure.php    | 39 +-----------------
 .../Checkout/Controller/Cart/CouponPost.php   |  7 +---
 .../Checkout/Controller/Cart/EstimatePost.php | 40 +------------------
 .../Checkout/Controller/Cart/Index.php        |  2 +-
 .../Controller/Onepage/ShippingMethod.php     |  2 +-
 .../Controller/Cart/ConfigureTest.php         | 18 +++++----
 7 files changed, 19 insertions(+), 92 deletions(-)

diff --git a/app/code/Magento/Checkout/Controller/Cart/Add.php b/app/code/Magento/Checkout/Controller/Cart/Add.php
index 9cc38384cdfd7..d3b8958c7656f 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Add.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Add.php
@@ -13,6 +13,9 @@
 use Magento\Checkout\Model\Cart as CustomerCart;
 use Magento\Framework\Exception\NoSuchEntityException;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class Add extends \Magento\Checkout\Controller\Cart
 {
     /**
diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
index de95bc6d3deca..236e10afc0c1f 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -6,45 +6,8 @@
  */
 namespace Magento\Checkout\Controller\Cart;
 
-class Configure extends \Magento\Checkout\Controller\Cart
+class Configure extends \Magento\Checkout\Controller\Cart\Index
 {
-    /**
-     * @var \Magento\Framework\View\Result\PageFactory
-     */
-    protected $resultPageFactory;
-
-    /**
-     * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
-     * @param \Magento\Checkout\Model\Cart $cart
-     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
-     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
-     */
-    public function __construct(
-        \Magento\Framework\App\Action\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
-        \Magento\Checkout\Model\Cart $cart,
-        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
-        \Magento\Framework\View\Result\PageFactory $resultPageFactory
-    ) {
-        parent::__construct(
-            $context,
-            $scopeConfig,
-            $checkoutSession,
-            $storeManager,
-            $formKeyValidator,
-            $cart,
-            $resultRedirectFactory
-        );
-        $this->resultPageFactory = $resultPageFactory;
-    }
-
     /**
      * Action to reconfigure cart item
      *
diff --git a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
index c1b81b632d332..bd615f30205e2 100644
--- a/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/CouponPost.php
@@ -1,13 +1,10 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
 namespace Magento\Checkout\Controller\Cart;
 
-use Magento\Checkout\Model\Cart as CustomerCart;
-
 class CouponPost extends \Magento\Checkout\Controller\Cart
 {
     /**
@@ -23,7 +20,7 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
-     * @param CustomerCart $cart
+     * @param \Magento\Checkout\Model\Cart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
      */
@@ -33,7 +30,7 @@ public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
-        CustomerCart $cart,
+        \Magento\Checkout\Model\Cart $cart,
         \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         \Magento\Quote\Model\QuoteRepository $quoteRepository
     ) {
diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
index 8300426d4699d..bef1ca351bb67 100644
--- a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -8,45 +7,8 @@
 
 use Magento\Checkout\Model\Cart as CustomerCart;
 
-class EstimatePost extends \Magento\Checkout\Controller\Cart
+class EstimatePost extends \Magento\Checkout\Controller\Cart\CouponPost
 {
-    /**
-     * @var \Magento\Quote\Model\QuoteRepository
-     */
-    protected $quoteRepository;
-
-    /**
-     * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
-     * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
-     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
-     * @param CustomerCart $cart
-     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
-     * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
-     */
-    public function __construct(
-        \Magento\Framework\App\Action\Context $context,
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
-        \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
-        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
-        CustomerCart $cart,
-        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
-        \Magento\Quote\Model\QuoteRepository $quoteRepository
-    ) {
-        $this->quoteRepository = $quoteRepository;
-        parent::__construct(
-            $context,
-            $scopeConfig,
-            $checkoutSession,
-            $storeManager,
-            $formKeyValidator,
-            $cart,
-            $resultRedirectFactory
-        );
-    }
-
     /**
      * Initialize shipping information
      *
diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
index 73469d8b3c66d..15b238c9a409f 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Index.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -22,7 +22,7 @@ class Index extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
-     * @param CustomerCart $cart
+     * @param \Magento\Checkout\Model\Cart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      */
diff --git a/app/code/Magento/Checkout/Controller/Onepage/ShippingMethod.php b/app/code/Magento/Checkout/Controller/Onepage/ShippingMethod.php
index 8653ed870cf0d..0f3a69eebe6bf 100644
--- a/app/code/Magento/Checkout/Controller/Onepage/ShippingMethod.php
+++ b/app/code/Magento/Checkout/Controller/Onepage/ShippingMethod.php
@@ -17,6 +17,6 @@ public function execute()
             return $this->_ajaxRedirectResponse();
         }
 
-        $this->resultLayoutFactory->create();
+        return $this->resultLayoutFactory->create();
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
index 864a7a7871de4..676aff1fa2829 100644
--- a/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
+++ b/dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php
@@ -80,14 +80,16 @@ public function setUp()
 
         $objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
 
-        $this->configureController = $objectManagerHelper->getObject('Magento\Checkout\Controller\Cart\Configure', [
-            'request' => $this->requestMock,
-            'response' => $this->responseMock,
-            'objectManager' => $this->objectManagerMock,
-            'messageManager' => $this->messageManagerMock,
-            'cart' => $this->cartMock,
-            'resultPageFactory' => $this->resultPageFactoryMock,
-            'resultRedirectFactory' => $resultRedirectFactoryMock
+        $this->configureController = $objectManagerHelper->getObject(
+            'Magento\Checkout\Controller\Cart\Configure',
+            [
+                'request' => $this->requestMock,
+                'response' => $this->responseMock,
+                'objectManager' => $this->objectManagerMock,
+                'messageManager' => $this->messageManagerMock,
+                'cart' => $this->cartMock,
+                'resultPageFactory' => $this->resultPageFactoryMock,
+                'resultRedirectFactory' => $resultRedirectFactoryMock
             ]
         );
     }

From 50e7f7257ed03a5a735c873b838093ddfa4251bb Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Wed, 28 Jan 2015 18:10:45 +0200
Subject: [PATCH 35/94] MAGETWO-33059: Refactor CMS module

---
 .../unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
index 167cbb34125a4..f05d19a1d12a9 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
@@ -103,7 +103,7 @@ protected function setUp()
      */
     public function testIndexAction($renderPage)
     {
-        $this->_cmsHelperMock->expects($this->once())->method('renderPage')->will($this->returnValue($renderPage));
+        $this->_cmsHelperMock->expects($this->once())->method('prepareResultPage')->will($this->returnValue($renderPage));
         $this->_requestMock->expects($this->any())->method('setActionName')->with('defaultNoRoute');
         $this->_controller->execute();
     }

From fffe3b381b6e3bd7032e1db9111b025d11537434 Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Wed, 28 Jan 2015 19:21:32 +0200
Subject: [PATCH 36/94] MAGETWO-33059: Refactor CMS module

---
 .../Magento/Cms/Controller/Noroute/IndexTest.php          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
index f05d19a1d12a9..5323da8b3a7d2 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
@@ -103,7 +103,13 @@ protected function setUp()
      */
     public function testIndexAction($renderPage)
     {
-        $this->_cmsHelperMock->expects($this->once())->method('prepareResultPage')->will($this->returnValue($renderPage));
+        $this->_cmsHelperMock->expects(
+            $this->once()
+        )->method(
+            'prepareResultPage'
+        )->will(
+            $this->returnValue($renderPage)
+        );
         $this->_requestMock->expects($this->any())->method('setActionName')->with('defaultNoRoute');
         $this->_controller->execute();
     }

From 307fb3fbb2cbe4661a76271b6b1a061567fb5489 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Thu, 29 Jan 2015 13:19:34 +0200
Subject: [PATCH 37/94] MAGETWO-33062: Update dictionary search tool to support
 \Magento\Framework\Phrase

---
 .../I18n/Parser/Adapter/Php/Tokenizer.php     | 55 ++++++++++++++++++-
 .../Adapter/Php/Tokenizer/PhraseCollector.php | 24 +++++---
 .../Parser/Adapter/Php/Tokenizer/Token.php    | 30 ++++++++++
 3 files changed, 99 insertions(+), 10 deletions(-)

diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php
index 683c1e51aa54e..2dcd9fdea4058 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php
@@ -50,6 +50,42 @@ public function parse($filePath)
         $this->_tokensCount = count($this->_tokens);
     }
 
+    /**
+     * Checks if the next set of tokens is a valid class identifier and it matches passed class name
+     *
+     * @param string $className
+     * @return bool
+     */
+    public function isMatchingClass($className)
+    {
+        /*
+         * 1 - beginning, class identifier can begin either with identifier or with namespace separator
+         * 2 - after namespace separator, identifier is expected
+         * 3 - after identifier, namespace separator or open brace is expected
+         * 4 - ending, tells that class identifier is valid
+         */
+        $state = 1;
+        $classString = '';
+        while ($token = $this->getNextRealToken()) {
+            if ($token->isNamespaceSeparator() && ($state != 2)) {
+                $classString .= $token->getValue();
+                $state = 2;
+            } elseif ($token->isIdentifier() && ($state != 3)) {
+                $classString .= $token->getValue();
+                $state = 3;
+            } elseif ($token->isOpenBrace() && $state == 3) {
+                $state = 4;
+                break;
+            } else {
+                return false;
+            }
+        }
+        if ($state == 4 && $className == substr($classString, -strlen($className))) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Get arguments tokens of function
      *
@@ -139,13 +175,26 @@ public function getNextToken()
     }
 
     /**
-     * Check is it last token
+     * Get next token skipping all whitespaces
+     *
+     * @return \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token|false
+     */
+    public function getNextRealToken()
+    {
+        do {
+            $token = $this->getNextToken();
+        } while ($token && $token->isWhitespace());
+        return $token;
+    }
+
+    /**
+     * Check if it is end of loop
      *
      * @return bool
      */
-    public function isLastToken()
+    public function isEndOfLoop()
     {
-        return 0 == $this->_tokensCount || key($this->_tokens) + 1 == $this->_tokensCount;
+        return is_null(key($this->_tokens));
     }
 
     /**
diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
index b64a2cfda5444..db0906d35b63f 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
@@ -62,7 +62,7 @@ public function parse($file)
         $this->_phrases = [];
         $this->_file = $file;
         $this->_tokenizer->parse($file);
-        while (!$this->_tokenizer->isLastToken()) {
+        while (!$this->_tokenizer->isEndOfLoop()) {
             $this->_extractPhrases();
         }
     }
@@ -74,12 +74,22 @@ public function parse($file)
      */
     protected function _extractPhrases()
     {
-        $phraseStartToken = $this->_tokenizer->getNextToken();
-        if ($phraseStartToken->isEqualFunction('__') && $this->_tokenizer->getNextToken()->isOpenBrace()) {
-            $arguments = $this->_tokenizer->getFunctionArgumentsTokens();
-            $phrase = $this->_collectPhrase(array_shift($arguments));
-            if (null !== $phrase) {
-                $this->_addPhrase($phrase, count($arguments), $this->_file, $phraseStartToken->getLine());
+        if ($firstToken = $this->_tokenizer->getNextRealToken()) {
+            if ($firstToken->isEqualFunction('__')) {
+                $secondToken = $this->_tokenizer->getNextRealToken();
+                if ($secondToken && $secondToken->isOpenBrace()) {
+                    $arguments = $this->_tokenizer->getFunctionArgumentsTokens();
+                    $phrase = $this->_collectPhrase(array_shift($arguments));
+                    if (null !== $phrase) {
+                        $this->_addPhrase($phrase, count($arguments), $this->_file, $firstToken->getLine());
+                    }
+                }
+            } elseif ($firstToken->isNew() && $this->_tokenizer->isMatchingClass('Phrase')) {
+                $arguments = $this->_tokenizer->getFunctionArgumentsTokens();
+                $phrase = $this->_collectPhrase(array_shift($arguments));
+                if (null !== $phrase) {
+                    $this->_addPhrase($phrase, count($arguments), $this->_file, $firstToken->getLine());
+                }
             }
         }
     }
diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Token.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Token.php
index 8b4cc4d0049aa..3aa9091008b5f 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Token.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Token.php
@@ -75,6 +75,16 @@ public function getLine()
         return $this->_line;
     }
 
+    /**
+     * Is "new" operator
+     *
+     * @return bool
+     */
+    public function isNew()
+    {
+        return $this->getName() == T_NEW;
+    }
+
     /**
      * Whenever token is equal function
      *
@@ -155,4 +165,24 @@ public function isSemicolon()
     {
         return $this->getValue() == ';';
     }
+
+    /**
+     * Is namespace separator
+     *
+     * @return bool
+     */
+    public function isNamespaceSeparator()
+    {
+        return $this->getName() == T_NS_SEPARATOR;
+    }
+
+    /**
+     * Is identifier
+     *
+     * @return bool
+     */
+    public function isIdentifier()
+    {
+        return $this->getName() == T_STRING;
+    }
 }

From d12b596d047da4ff20f847f4da78002f99f43018 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Thu, 29 Jan 2015 15:17:32 +0200
Subject: [PATCH 38/94] MAGETWO-33062: Update dictionary search tool to support
 \Magento\Framework\Phrase

---
 dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php
index 2dcd9fdea4058..80e60e4c8ffea 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php
@@ -67,10 +67,10 @@ public function isMatchingClass($className)
         $state = 1;
         $classString = '';
         while ($token = $this->getNextRealToken()) {
-            if ($token->isNamespaceSeparator() && ($state != 2)) {
+            if ($token->isNamespaceSeparator() && $state != 2) {
                 $classString .= $token->getValue();
                 $state = 2;
-            } elseif ($token->isIdentifier() && ($state != 3)) {
+            } elseif ($token->isIdentifier() && $state != 3) {
                 $classString .= $token->getValue();
                 $state = 3;
             } elseif ($token->isOpenBrace() && $state == 3) {

From 3a8c60a9968d10d3c3257af1dcf9fd608b069531 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Thu, 29 Jan 2015 15:21:14 +0200
Subject: [PATCH 39/94] MAGETWO-33063: Replace usage of __() to Phrase object
 in library

---
 .../Magento/Framework/View/Element/Html/Link/Current.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
index 726e07681f914..811bea3e4eb33 100644
--- a/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
+++ b/lib/internal/Magento/Framework/View/Element/Html/Link/Current.php
@@ -107,9 +107,9 @@ protected function _toHtml()
             $html .= '</li>';
         } else {
             $html = '<li class="nav item' . $highlight . '"><a href="' . $this->escapeHtml($this->getHref()) . '"';
-            $html .= $this->getTitle() ?
-                ' title="' . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getTitle())) . '"' :
-                '';
+            $html .= $this->getTitle()
+                ? ' title="' . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getTitle())) . '"'
+                : '';
             $html .= '>' . $this->escapeHtml((string)new \Magento\Framework\Phrase($this->getLabel())) . '</a></li>';
         }
 

From a65dea9cca5ffd7036668db7ca2ff3a4685ad1fb Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Thu, 29 Jan 2015 16:11:06 +0200
Subject: [PATCH 40/94] MAGETWO-33058: Refactor Checkout module

---
 app/code/Magento/Checkout/Controller/Onepage.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Checkout/Controller/Onepage.php b/app/code/Magento/Checkout/Controller/Onepage.php
index a21f340745f2e..50a888a0da021 100644
--- a/app/code/Magento/Checkout/Controller/Onepage.php
+++ b/app/code/Magento/Checkout/Controller/Onepage.php
@@ -77,7 +77,7 @@ class Onepage extends Action
     protected $resultRawFactory;
 
     /**
-     * @var \Magento\Framework\Controller\Result\JsonFactory
+     * @var \Magento\Framework\Controller\Result\JSONFactory
      */
     protected $resultJsonFactory;
 
@@ -96,7 +96,7 @@ class Onepage extends Action
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
      * @param \Magento\Framework\Controller\Result\RawFactory $resultRawFactory
-     * @param \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+     * @param \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -115,7 +115,7 @@ public function __construct(
         \Magento\Framework\View\Result\PageFactory $resultPageFactory,
         \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory,
         \Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
-        \Magento\Framework\Controller\Result\JsonFactory $resultJsonFactory
+        \Magento\Framework\Controller\Result\JSONFactory $resultJsonFactory
     ) {
         $this->_coreRegistry = $coreRegistry;
         $this->_translateInline = $translateInline;

From 537e2b2ded0b559a5e33f01dd61c16fd7ecb78d5 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Thu, 29 Jan 2015 16:30:19 +0200
Subject: [PATCH 41/94] MAGETWO-33062: Update dictionary search tool to support
 \Magento\Framework\Phrase

---
 dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php
index 80e60e4c8ffea..c74e4db31b6dd 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer.php
@@ -55,6 +55,7 @@ public function parse($filePath)
      *
      * @param string $className
      * @return bool
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      */
     public function isMatchingClass($className)
     {

From 76715fe5db54c433ef8fc349fed9e4fdcfb0d466 Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Thu, 29 Jan 2015 16:37:54 +0200
Subject: [PATCH 42/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
index 2e97a33acafa6..12d4d545a6038 100644
--- a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
+++ b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
@@ -16,11 +16,11 @@ class DefaultNoRoute extends \Magento\Framework\App\Action\Action
     protected $resultLayoutFactory;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
     ) {
         $this->resultLayoutFactory = $resultLayoutFactory;

From 53bd9902b52e2a81219f8564dd9540cfa07a8601 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Thu, 29 Jan 2015 17:02:22 +0200
Subject: [PATCH 43/94] MAGETWO-33060: Refactor __() to return Phrase object

- Unit & integration tests modified;
- Framework DataObjectProcessor updated;
---
 .../Model/Import/Entity/AbstractEntity.php            |  2 +-
 .../testsuite/Magento/Captcha/Model/ObserverTest.php  |  2 +-
 .../Magento/Checkout/Model/Type/OnepageTest.php       |  2 +-
 .../Data/Argument/Interpreter/StringTest.php          |  2 +-
 .../testsuite/Magento/Indexer/Model/ShellTest.php     |  2 +-
 .../Model/Product/Attribute/Source/Price/ViewTest.php |  2 +-
 .../Model/Rule/Condition/CombineTest.php              | 11 ++++++++---
 .../Magento/Cms/Block/Adminhtml/Block/EditTest.php    |  2 +-
 .../testsuite/Magento/Core/Model/Layout/MergeTest.php |  7 ++++++-
 .../Magento/Customer/Block/Widget/NameTest.php        | 10 ++--------
 .../Customer/Controller/Account/ConfirmTest.php       |  4 ++--
 .../Customer/Model/Metadata/Form/BooleanTest.php      |  2 +-
 .../Magento/Tax/Model/Sales/Total/Quote/TaxTest.php   |  2 +-
 .../Framework/Reflection/DataObjectProcessor.php      |  3 ++-
 14 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
index bdb200723d9b9..ebaeeaf30b7c7 100644
--- a/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
+++ b/app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php
@@ -465,7 +465,7 @@ public function getErrorMessages()
         $messages = [];
         foreach ($this->_errors as $errorCode => $errorRows) {
             if (isset($this->_messageTemplates[$errorCode])) {
-                $errorCode = __($this->_messageTemplates[$errorCode]);
+                $errorCode = (string)__($this->_messageTemplates[$errorCode]);
             }
             foreach ($errorRows as $errorRowData) {
                 $key = $errorRowData[1] ? sprintf($errorCode, $errorRowData[1]) : $errorCode;
diff --git a/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php b/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
index 49526b16b0fb2..7d57800fb1763 100644
--- a/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
+++ b/dev/tests/integration/testsuite/Magento/Captcha/Model/ObserverTest.php
@@ -32,7 +32,7 @@ public function testBackendLoginActionWithInvalidCaptchaReturnsError()
         ];
         $this->getRequest()->setPost($post);
         $this->dispatch('backend/admin');
-        $this->assertContains(__('Incorrect CAPTCHA'), $this->getResponse()->getBody());
+        $this->assertContains((string)__('Incorrect CAPTCHA'), $this->getResponse()->getBody());
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/Checkout/Model/Type/OnepageTest.php b/dev/tests/integration/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
index fdd5a18ba45e7..aa5dc67e9dfae 100644
--- a/dev/tests/integration/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
@@ -482,7 +482,7 @@ public function testSaveBillingNewAddressErrorExistingEmail()
         $this->assertArrayHasKey('message', $result, 'Error message was expected to be set');
         $this->assertStringStartsWith(
             'There is already a registered customer using this email address',
-            $result['message'],
+            (string)$result['message'],
             'Validation error is invalid.'
         );
     }
diff --git a/dev/tests/integration/testsuite/Magento/Framework/Data/Argument/Interpreter/StringTest.php b/dev/tests/integration/testsuite/Magento/Framework/Data/Argument/Interpreter/StringTest.php
index 3b80aa24c6495..dc05ddf35d339 100644
--- a/dev/tests/integration/testsuite/Magento/Framework/Data/Argument/Interpreter/StringTest.php
+++ b/dev/tests/integration/testsuite/Magento/Framework/Data/Argument/Interpreter/StringTest.php
@@ -48,7 +48,7 @@ function ($input) {
     public function testEvaluate($input, $expected)
     {
         $actual = $this->_model->evaluate($input);
-        $this->assertSame($expected, $actual);
+        $this->assertSame($expected, (string)$actual);
     }
 
     public function evaluateDataProvider()
diff --git a/dev/tests/integration/testsuite/Magento/Indexer/Model/ShellTest.php b/dev/tests/integration/testsuite/Magento/Indexer/Model/ShellTest.php
index c2e913b4fa184..9d2a1e7d0e183 100644
--- a/dev/tests/integration/testsuite/Magento/Indexer/Model/ShellTest.php
+++ b/dev/tests/integration/testsuite/Magento/Indexer/Model/ShellTest.php
@@ -65,7 +65,7 @@ public function testRunIndexList()
         );
         foreach ($indexerCollection->getItems() as $indexer) {
             /** @var \Magento\Indexer\Model\IndexerInterface $indexer */
-            $this->assertContains($indexer->getTitle(), $result);
+            $this->assertContains((string)$indexer->getTitle(), $result);
         }
     }
 
diff --git a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/Attribute/Source/Price/ViewTest.php b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/Attribute/Source/Price/ViewTest.php
index a27774900aa33..a5362ac9be5e6 100644
--- a/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/Attribute/Source/Price/ViewTest.php
+++ b/dev/tests/unit/testsuite/Magento/Bundle/Model/Product/Attribute/Source/Price/ViewTest.php
@@ -74,7 +74,7 @@ public function testGetOptionTextForExistLabel()
     {
         $existValue = 1;
 
-        $this->assertInternalType('string', $this->model->getOptionText($existValue));
+        $this->assertInstanceOf('Magento\Framework\Phrase', $this->model->getOptionText($existValue));
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php b/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php
index 687146ce8b607..43152fce8b40b 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php
@@ -44,7 +44,7 @@ protected function setUp()
 
     public function testGetNewChildSelectOptions()
     {
-        $options = [
+        $expectedOptions = [
             ['value' => '', 'label' => 'Please choose a condition to add.'],
             ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Combine', 'label' => 'Conditions Combination'],
             ['label' => 'Product Attribute', 'value' => [
@@ -65,9 +65,14 @@ public function testGetNewChildSelectOptions()
         $productCondition->expects($this->any())->method('getAttributeOption')
             ->will($this->returnValue($attributeOptions));
 
-        $this->conditionFactory->expects($this->once())->method('create')->will($this->returnValue($productCondition));
+        $this->conditionFactory->expects($this->atLeastOnce())->method('create')->willReturn($productCondition);
 
-        $this->assertSame($options, $this->condition->getNewChildSelectOptions());
+        $actualOptions = $this->condition->getNewChildSelectOptions();
+        foreach ($actualOptions as $key => $option) {
+            $actualOptions[$key]['label'] = (string)$option['label'];
+        }
+
+        $this->assertSame($expectedOptions, $actualOptions);
     }
 
     public function testCollectValidatedAttributes()
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Block/Adminhtml/Block/EditTest.php b/dev/tests/unit/testsuite/Magento/Cms/Block/Adminhtml/Block/EditTest.php
index c03ec9610ae03..bec202285f24d 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Block/Adminhtml/Block/EditTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Block/Adminhtml/Block/EditTest.php
@@ -84,7 +84,7 @@ public function testGetHeaderText($modelBlockId)
             ->with($title)
             ->willReturn($escapedTitle);
 
-        $this->assertInternalType('string', $this->this->getHeaderText());
+        $this->assertInstanceOf('Magento\Framework\Phrase', $this->this->getHeaderText());
     }
 
     public function getHeaderTextDataProvider()
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
index 3d3997b58011e..376095065e37b 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
@@ -331,7 +331,12 @@ public function testGetAllDesignAbstractions()
             ],
         ];
 
-        $this->assertSame($expected, $this->_model->getAllDesignAbstractions());
+        $actualAbstractions = $this->_model->getAllDesignAbstractions();
+        foreach ($actualAbstractions as $key => $abstraction) {
+            $actualAbstractions[$key]['label'] = (string)$abstraction['label'];
+        }
+
+        $this->assertSame($expected, $actualAbstractions);
     }
 
     public function testIsPageLayoutDesignAbstractions()
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php
index 4986a88c4ab04..57e4613c9e5c6 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Block/Widget/NameTest.php
@@ -367,13 +367,7 @@ public function getContainerClassNameProvider()
      */
     public function testGetStoreLabel($attributeCode, $storeLabel, $expectedValue)
     {
-        $this->attribute->expects(
-            $this->once()
-        )->method(
-            'getStoreLabel'
-        )->will(
-            $this->returnValue($storeLabel)
-        );
+        $this->attribute->expects($this->atLeastOnce())->method('getStoreLabel')->willReturn($storeLabel);
         $this->assertEquals($expectedValue, $this->_block->getStoreLabel($attributeCode));
     }
 
@@ -405,7 +399,7 @@ public function testGetStoreLabelWithException()
                 )
             )
         );
-        $this->assertSame('', $this->_block->getStoreLabel('attributeCode'));
+        $this->assertSame('', (string)$this->_block->getStoreLabel('attributeCode'));
     }
 
     /**
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
index 4d23754e8f950..d56513e1afae5 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Controller/Account/ConfirmTest.php
@@ -388,12 +388,12 @@ public function testSuccessRedirect(
             ->with($this->equalTo('*/*/index'), ['_secure' => true])
             ->will($this->returnValue($successUrl));
 
-        $this->redirectMock->expects($this->once())
+        $this->redirectMock->expects($this->never())
             ->method('success')
             ->with($this->equalTo($resultUrl))
             ->will($this->returnValue($resultUrl));
 
-        $this->scopeConfigMock->expects($this->once())
+        $this->scopeConfigMock->expects($this->never())
             ->method('isSetFlag')
             ->with(
                 $this->equalTo(Url::XML_PATH_CUSTOMER_STARTUP_REDIRECT_TO_DASHBOARD),
diff --git a/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/BooleanTest.php b/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/BooleanTest.php
index ac61fbeb7c60c..eb9b41a3ec66f 100644
--- a/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/BooleanTest.php
+++ b/dev/tests/unit/testsuite/Magento/Customer/Model/Metadata/Form/BooleanTest.php
@@ -25,7 +25,7 @@ public function testGetOptionText($value, $expected)
             $value,
             0
         );
-        $this->assertSame($expected, $boolean->outputValue());
+        $this->assertSame($expected, (string)$boolean->outputValue());
     }
 
     public function getOptionTextDataProvider()
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
index 1e7ff2e174f73..3a259373ea51f 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
@@ -701,7 +701,7 @@ public function testGetLabel()
     {
         $objectManager = new ObjectManager($this);
         $taxTotalsCalcModel = $objectManager->getObject('Magento\Tax\Model\Sales\Total\Quote\Tax');
-        $this->assertSame($taxTotalsCalcModel->getLabel(), __('Tax'));
+        $this->assertSame((string)$taxTotalsCalcModel->getLabel(), (string)__('Tax'));
     }
 
     /**
diff --git a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
index b29b6990e2b44..855d60f24dbb6 100644
--- a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
@@ -6,6 +6,7 @@
 
 namespace Magento\Framework\Reflection;
 
+use Magento\Framework\Phrase;
 use Magento\Framework\Api\AttributeValue;
 use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\SimpleDataObjectConverter;
@@ -109,7 +110,7 @@ public function buildOutputDataArray($dataObject, $dataObjectType)
                 $key = SimpleDataObjectConverter::camelCaseToSnakeCase(substr($methodName, 3));
                 if ($key === ExtensibleDataInterface::CUSTOM_ATTRIBUTES) {
                     $value = $this->convertCustomAttributes($value, $dataObjectType);
-                } elseif (is_object($value)) {
+                } elseif (is_object($value) && !($value instanceof Phrase)) {
                     $value = $this->buildOutputDataArray($value, $returnType);
                 } elseif (is_array($value)) {
                     $valueResult = [];

From 1a66143599af3491bfe37f4fbf82aeb9fa2bbffd Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Fri, 30 Jan 2015 11:45:24 +0200
Subject: [PATCH 44/94] MAGETWO-33061: Fix annotations of the methods that
 return __()

---
 app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
index 51fca97eb6287..e1aaeb17ce9e3 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -10,6 +10,7 @@
 /**
  * Layer price filter based on Search API
  *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class Price extends AbstractFilter
 {
@@ -49,10 +50,9 @@ class Price extends AbstractFilter
      * @param \Magento\Catalog\Model\Resource\Layer\Filter\Price $resource
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Framework\Search\Dynamic\Algorithm $priceAlgorithm
-     * @param \Magento\Framework\Registry $coreRegistry
-     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency
      * @param \Magento\Catalog\Model\Layer\Filter\Dynamic\AlgorithmFactory $algorithmFactory
+     * @param \Magento\Catalog\Model\Layer\Filter\DataProvider\PriceFactory $dataProviderFactory
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)

From 984a3d54632bf390dd562e47888275542bc3f0ed Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Fri, 30 Jan 2015 16:57:21 +0200
Subject: [PATCH 45/94] MAGETWO-33058: Refactor Checkout module

---
 app/code/Magento/Checkout/Controller/Cart/Index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
index e2035e813d50f..15c22a15981bd 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Index.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -20,7 +20,7 @@ class Index extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
-     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
      * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
      * @param \Magento\Checkout\Model\Cart $cart
      * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
@@ -30,7 +30,7 @@ public function __construct(
         \Magento\Framework\App\Action\Context $context,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Store\StoreManagerInterface $storeManager,
         \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
         \Magento\Checkout\Model\Cart $cart,
         \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,

From fd8231be68743e2b8a08c04611c78c7db2d07126 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Fri, 30 Jan 2015 19:07:20 +0200
Subject: [PATCH 46/94] MAGETWO-33060: Refactor __() to return Phrase object

- DataObjectProcessor->buildOutputDataArray() updated;
- Configurable->getSpecifyOptionMessage() modified;
- Integration SaveRatesTest updated;
---
 .../ConfigurableProduct/Model/Product/Type/Configurable.php   | 2 +-
 .../Controller/Adminhtml/System/Currency/SaveRatesTest.php    | 4 ++--
 .../Magento/Framework/Reflection/DataObjectProcessor.php      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index bafaaca7db316..6317f6450e565 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -847,7 +847,7 @@ public function checkProductBuyState($product)
      */
     public function getSpecifyOptionMessage()
     {
-        return __('Please specify the product\'s option(s).');
+        return (string)__('Please specify the product\'s option(s).');
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
index 17d13af9fb7d7..24fc61e53b212 100644
--- a/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
+++ b/dev/tests/integration/testsuite/Magento/CurrencySymbol/Controller/Adminhtml/System/Currency/SaveRatesTest.php
@@ -52,7 +52,7 @@ public function testSaveAction()
         $this->dispatch('backend/admin/system_currency/saveRates');
 
         $this->assertSessionMessages(
-            $this->contains(__('All valid rates have been saved.')),
+            $this->contains((string)__('All valid rates have been saved.')),
             \Magento\Framework\Message\MessageInterface::TYPE_SUCCESS
         );
 
@@ -84,7 +84,7 @@ public function testSaveWithWarningAction()
         $this->dispatch('backend/admin/system_currency/saveRates');
 
         $this->assertSessionMessages(
-            $this->contains(__('Please correct the input data for %1 => %2 rate', $currencyCode, $currencyTo)),
+            $this->contains((string)__('Please correct the input data for %1 => %2 rate', $currencyCode, $currencyTo)),
             \Magento\Framework\Message\MessageInterface::TYPE_WARNING
         );
     }
diff --git a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
index 855d60f24dbb6..c1d58952de1c9 100644
--- a/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
+++ b/lib/internal/Magento/Framework/Reflection/DataObjectProcessor.php
@@ -116,7 +116,7 @@ public function buildOutputDataArray($dataObject, $dataObjectType)
                     $valueResult = [];
                     $arrayElementType = substr($returnType, 0, -2);
                     foreach ($value as $singleValue) {
-                        if (is_object($singleValue)) {
+                        if (is_object($singleValue) && !($singleValue instanceof Phrase)) {
                             $singleValue = $this->buildOutputDataArray($singleValue, $arrayElementType);
                         }
                         $valueResult[] = $this->castValueToType($singleValue, $arrayElementType);

From 740293b1e5a378aa848daffc2178db8e59a752a7 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Fri, 30 Jan 2015 19:46:58 +0200
Subject: [PATCH 47/94] MAGETWO-33062: Update dictionary search tool to support
 \Magento\Framework\Phrase

---
 .../Php/Tokenizer/PhraseCollectorTest.php     | 201 ++++++++++++++++++
 .../Adapter/Php/Tokenizer/TokenTest.php       | 120 +++++++++++
 .../I18n/Parser/Adapter/Php/TokenizerTest.php |  95 +++++++++
 .../Parser/Adapter/Php/_files/objectsCode.php |   5 +
 .../Tokenizer/Translate/MethodCollector.php   |  14 +-
 5 files changed, 427 insertions(+), 8 deletions(-)
 create mode 100644 dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/TokenizerTest.php
 create mode 100644 dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php

diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
new file mode 100644
index 0000000000000..ba86bbae01710
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer;
+
+use Magento\TestFramework\Helper\ObjectManager;
+use Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer;
+
+/**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector
+ */
+class PhraseCollectorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var PhraseCollector
+     */
+    protected $phraseCollector;
+
+    /**
+     * @var ObjectManager
+     */
+    protected $objectManager;
+
+    /**
+     * @var Tokenizer|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $tokenizerMock;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->tokenizerMock = $this->getMockBuilder('Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->phraseCollector = $this->objectManager->getObject(
+            'Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector',
+            [
+                'tokenizer' => $this->tokenizerMock
+            ]
+        );
+    }
+
+    /**
+     * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector::parse
+     *
+     * @param string $file
+     * @param array $isEndOfLoopReturnValues
+     * @param array $getNextRealTokenReturnValues
+     * @param array $getFunctionArgumentsTokensReturnValues
+     * @param array $isMatchingClassReturnValues
+     * @param array $result
+     * @dataProvider testParseDataProvider
+     */
+    public function testParse(
+        $file,
+        array $isEndOfLoopReturnValues,
+        array $getNextRealTokenReturnValues,
+        array $getFunctionArgumentsTokensReturnValues,
+        array $isMatchingClassReturnValues,
+        array $result
+    ) {
+        $matchingClass = 'Phrase';
+
+        $this->tokenizerMock->expects($this->once())
+            ->method('parse')
+            ->with($file);
+        $this->tokenizerMock->expects($this->atLeastOnce())
+            ->method('isEndOfLoop')
+            ->will(call_user_func_array(
+                [$this, 'onConsecutiveCalls'],
+                $isEndOfLoopReturnValues
+            ));
+        $this->tokenizerMock->expects($this->any())
+            ->method('getNextRealToken')
+            ->will(call_user_func_array(
+                [$this, 'onConsecutiveCalls'],
+                $getNextRealTokenReturnValues
+            ));
+        $this->tokenizerMock->expects($this->any())
+            ->method('getFunctionArgumentsTokens')
+            ->will(call_user_func_array(
+                [$this, 'onConsecutiveCalls'],
+                $getFunctionArgumentsTokensReturnValues
+            ));
+        $this->tokenizerMock->expects($this->any())
+            ->method('isMatchingClass')
+            ->with($matchingClass)
+            ->will(call_user_func_array(
+                [$this, 'onConsecutiveCalls'],
+                $isMatchingClassReturnValues
+            ));
+
+        $this->phraseCollector->parse($file);
+        $this->assertEquals($result, $this->phraseCollector->getPhrases());
+    }
+
+    /**
+     * @return array
+     */
+    public function testParseDataProvider()
+    {
+        $file = 'path/to/file.php';
+        $line = 110;
+        return [
+            /* Test simulates parsing of the following code:
+             *
+             * $phrase1 = new \Magento\Framework\Phrase('Testing');
+             * $phrase2 = __('More testing');
+             */
+            'two phrases' => [
+                'file' => $file,
+                'isEndOfLoopReturnValues' => [
+                    false, //before $phrase1
+                    false, //before =
+                    false, //before new \Magento\Framework\Phrase('Testing')
+                    false, //before ;
+                    false, //before $phrase2
+                    false, //before =
+                    false, //before __('More testing')
+                    false, //before ;
+                    true //end of loop
+                ],
+                'getNextRealTokenReturnValues' => [
+                    $this->createToken(false, false, false, false, '$phrase1'),
+                    $this->createToken(false, false, false, false, '='),
+                    $this->createToken(false, false, true, false, 'new', $line),
+                    $this->createToken(false, false, false, false, ';'),
+                    $this->createToken(false, false, false, false, '$phrase2'),
+                    $this->createToken(false, false, false, false, '='),
+                    $this->createToken(true, false, false, false, '__', $line),
+                    $this->createToken(false, true, false, false, '(')
+                ],
+                'getFunctionArgumentsTokensReturnValues' => [
+                    [[$this->createToken(false, false, false, true, 'Testing')]], // 'Testing')
+                    [[$this->createToken(false, false, false, true, 'More testing')]] // 'More testing')
+                ],
+                'isMatchingClassReturnValues' => [
+                    true // \Magento\Framework\Phrase(
+                ],
+                'result' => [
+                    [
+                        'phrase' => 'Testing',
+                        'arguments' => 0,
+                        'file' => $file,
+                        'line' => $line
+                    ],
+                    [
+                        'phrase' => 'More testing',
+                        'arguments' => 0,
+                        'file' => $file,
+                        'line' => $line
+                    ]
+                ]
+            ]
+        ];
+    }
+
+    /**
+     * @param bool $isEqualFunctionReturnValue
+     * @param bool $isOpenBraceReturnValue
+     * @param bool $isNewReturnValue
+     * @param bool $isConstantEncapsedString
+     * @param string $value
+     * @param int|null $line
+     * @return Token|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected function createToken(
+        $isEqualFunctionReturnValue,
+        $isOpenBraceReturnValue,
+        $isNewReturnValue,
+        $isConstantEncapsedString,
+        $value,
+        $line = null
+    ) {
+        $token = $this->getMockBuilder('Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $token->expects($this->any())
+            ->method('isEqualFunction')
+            ->with('__')
+            ->willReturn($isEqualFunctionReturnValue);
+        $token->expects($this->any())
+            ->method('isOpenBrace')
+            ->willReturn($isOpenBraceReturnValue);
+        $token->expects($this->any())
+            ->method('isNew')
+            ->willReturn($isNewReturnValue);
+        $token->expects($this->any())
+            ->method('isConstantEncapsedString')
+            ->willReturn($isConstantEncapsedString);
+        $token->expects($this->any())
+            ->method('getValue')
+            ->willReturn($value);
+        $token->expects($this->any())
+            ->method('getLine')
+            ->willReturn($line);
+        return $token;
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php
new file mode 100644
index 0000000000000..633586103cd78
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+/**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token
+ */
+class TokenTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ObjectManager
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+    }
+
+    /**
+     * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token::isNew
+     *
+     * @param int $name
+     * @param string $value
+     * @param bool $result
+     * @dataProvider testIsNewDataProvider
+     */
+    public function testIsNew($name, $value, $result)
+    {
+        $token = $this->createToken($name, $value);
+        $this->assertEquals($result, $token->isNew());
+    }
+
+    /**
+     * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token::isNamespaceSeparator
+     *
+     * @param int $name
+     * @param string $value
+     * @param bool $result
+     * @dataProvider testIsNamespaceSeparatorDataProvider
+     */
+    public function testIsNamespaceSeparator($name, $value, $result)
+    {
+        $token = $this->createToken($name, $value);
+        $this->assertEquals($result, $token->isNamespaceSeparator());
+    }
+
+    /**
+     * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token::isIdentifier
+     *
+     * @param int $name
+     * @param string $value
+     * @param bool $result
+     * @dataProvider testIsIdentifierDataProvider
+     */
+    public function testIsIdentifier($name, $value, $result)
+    {
+        $token = $this->createToken($name, $value);
+        $this->assertEquals($result, $token->isIdentifier());
+    }
+
+    /**
+     * @return array
+     */
+    public function testIsNewDataProvider()
+    {
+        return [
+            'new' => ['name' => T_NEW, 'value' => 'new', 'result' => true],
+            'namespace' => ['name' => T_NS_SEPARATOR, 'value' => '\\', 'result' => false],
+            'identifier' => ['name' => T_STRING, 'value' => '__', 'result' => false]
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function testIsNamespaceSeparatorDataProvider()
+    {
+        return [
+            'new' => ['name' => T_NEW, 'value' => 'new', 'result' => false],
+            'namespace' => ['name' => T_NS_SEPARATOR, 'value' => '\\', 'result' => true],
+            'identifier' => ['name' => T_STRING, 'value' => '__', 'result' => false]
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    public function testIsIdentifierDataProvider()
+    {
+        return [
+            'new' => ['name' => T_NEW, 'value' => 'new', 'result' => false],
+            'namespace' => ['name' => T_NS_SEPARATOR, 'value' => '\\', 'result' => false],
+            'identifier' => ['name' => T_STRING, 'value' => '__', 'result' => true]
+        ];
+    }
+
+    /**
+     * @param int $name
+     * @param string $value
+     * @return Token
+    */
+    protected function createToken($name, $value)
+    {
+        $line = 110;
+        return $this->objectManager->getObject(
+            'Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Token',
+            [
+                'name' => $name,
+                'value' => $value,
+                'line' => $line
+            ]
+        );
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/TokenizerTest.php b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/TokenizerTest.php
new file mode 100644
index 0000000000000..e2ae4a2f8a6dd
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/TokenizerTest.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Tools\I18n\Parser\Adapter\Php;
+
+use Magento\TestFramework\Helper\ObjectManager;
+
+/**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer
+ */
+class TokenizerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var Tokenizer
+     */
+    protected $tokenizer;
+
+    /**
+     * @var ObjectManager
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = new ObjectManager($this);
+        $this->tokenizer = $this->objectManager->getObject(
+            'Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer'
+        );
+    }
+
+    /**
+     * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer::isMatchingClass
+     */
+    public function testIsMatchingClass()
+    {
+        $class = 'Phrase';
+        $this->parseFile();
+        $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // new
+        $this->assertEquals(true, $this->tokenizer->isMatchingClass($class)); // \Magento\Framework\Phrase(
+        $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // 'Testing'
+        $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // )
+        $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // ;
+        $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // new
+        $this->assertEquals(true, $this->tokenizer->isMatchingClass($class)); // Phrase(
+        $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // 'More testing'
+        $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // )
+        $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // ;
+        $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // new
+        $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // \Magento\Framework\Object(
+        $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // )
+        $this->assertEquals(false, $this->tokenizer->isMatchingClass($class)); // ;
+    }
+
+    /**
+     * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer::getNextRealToken
+     */
+    public function testGetNextRealToken()
+    {
+        $this->parseFile();
+        $this->assertEquals('new', $this->tokenizer->getNextRealToken()->getValue());
+        $this->assertEquals('\\', $this->tokenizer->getNextRealToken()->getValue());
+        $this->assertEquals('Magento', $this->tokenizer->getNextRealToken()->getValue());
+        $this->assertEquals('\\', $this->tokenizer->getNextRealToken()->getValue());
+        $this->assertEquals('Framework', $this->tokenizer->getNextRealToken()->getValue());
+        $this->assertEquals('\\', $this->tokenizer->getNextRealToken()->getValue());
+        $this->assertEquals('Phrase', $this->tokenizer->getNextRealToken()->getValue());
+        $this->assertEquals('(', $this->tokenizer->getNextRealToken()->getValue());
+        $this->assertEquals('\'Testing\'', $this->tokenizer->getNextRealToken()->getValue());
+        $this->assertEquals(')', $this->tokenizer->getNextRealToken()->getValue());
+        $this->assertEquals(';', $this->tokenizer->getNextRealToken()->getValue());
+    }
+
+    /**
+     * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer::isEndOfLoop
+     */
+    public function testIsEndOfLoop()
+    {
+        $this->parseFile();
+        //We have 27 total tokens in objectsCode.php file (excluding whitespaces)
+        //So the isEndOfLoop function should return true after we pick 28th non-existent token
+        for ($i = 0; $i < 28; $i += 1) {
+            $this->assertEquals(false, $this->tokenizer->isEndOfLoop());
+            $this->tokenizer->getNextRealToken();
+        }
+        $this->assertEquals(true, $this->tokenizer->isEndOfLoop());
+    }
+
+    protected function parseFile()
+    {
+        $file = __DIR__.'/_files/objectsCode.php';
+        $this->tokenizer->parse($file);
+    }
+}
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php
new file mode 100644
index 0000000000000..72b351197a11a
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php
@@ -0,0 +1,5 @@
+<?php
+
+new \Magento\Framework\Phrase('Testing');
+new Phrase('More testing');
+new \Magento\Framework\Object();
diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollector.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollector.php
index 24ba20d3139d5..dffc693d299dc 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollector.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollector.php
@@ -19,9 +19,10 @@ class MethodCollector extends PhraseCollector
      */
     protected function _extractPhrases()
     {
-        if ($this->_tokenizer->getNextToken()->isObjectOperator()) {
-            $phraseStartToken = $this->_tokenizer->getNextToken();
-            if ($this->_isTranslateFunction($phraseStartToken)) {
+        $token = $this->_tokenizer->getNextRealToken();
+        if ($token && $token->isObjectOperator()) {
+            $phraseStartToken = $this->_tokenizer->getNextRealToken();
+            if ($phraseStartToken && $this->_isTranslateFunction($phraseStartToken)) {
                 $arguments = $this->_tokenizer->getFunctionArgumentsTokens();
                 $phrase = $this->_collectPhrase(array_shift($arguments));
                 $this->_addPhrase($phrase, count($arguments), $this->_file, $phraseStartToken->getLine());
@@ -37,10 +38,7 @@ protected function _extractPhrases()
      */
     protected function _isTranslateFunction($token)
     {
-        return ($token->isEqualFunction(
-            '__'
-        ) || $token->isWhitespace() && $this->_tokenizer->getNextToken()->isEqualFunction(
-            '__'
-        )) && $this->_tokenizer->getNextToken()->isOpenBrace();
+        $nextToken = $this->_tokenizer->getNextRealToken();
+        return $nextToken && $token->isEqualFunction('__') && $nextToken->isOpenBrace();
     }
 }

From 22dba5395cfe8c9d19fe66c4a64ffce5184584b2 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Fri, 30 Jan 2015 20:08:31 +0200
Subject: [PATCH 48/94] MAGETWO-33062: Update dictionary search tool to support
 \Magento\Framework\Phrase

---
 .../Tools/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php
index 633586103cd78..99ed584493f13 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/TokenTest.php
@@ -104,7 +104,7 @@ public function testIsIdentifierDataProvider()
      * @param int $name
      * @param string $value
      * @return Token
-    */
+     */
     protected function createToken($name, $value)
     {
         $line = 110;

From 82206562c27ebf77e019f1aa5c084638a244b07f Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Fri, 30 Jan 2015 20:09:15 +0200
Subject: [PATCH 49/94] MAGETWO-31524: Refactor controller actions in the CMS
 module

---
 .../Magento/Cms/Controller/Index/DefaultNoRoute.php  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php

diff --git a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
old mode 100644
new mode 100755
index 12d4d545a6038..e68f6f8c00e00
--- a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
+++ b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
@@ -11,19 +11,19 @@
 class DefaultNoRoute extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @var \Magento\Framework\View\Result\LayoutFactory
+     * @var \Magento\Framework\View\Result\PageFactory
      */
-    protected $resultLayoutFactory;
+    protected $resultPageFactory;
 
     /**
      * @param \Magento\Framework\App\Action\Context $context
-     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     * @param \Magento\Framework\View\Result\PageFactory resultPageFactory
      */
     public function __construct(
         \Magento\Framework\App\Action\Context $context,
-        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory
     ) {
-        $this->resultLayoutFactory = $resultLayoutFactory;
+        $this->resultPageFactory = $resultPageFactory;
         parent::__construct($context);
     }
 
@@ -32,7 +32,7 @@ public function __construct(
      */
     public function execute()
     {
-        $resultLayout = $this->resultLayoutFactory->create();
+        $resultLayout = $this->resultPageFactory->create();
         $resultLayout->setHeader('HTTP/1.1', '404 Not Found');
         $resultLayout->setHeader('Status', '404 File not found');
         return $resultLayout;

From f7ff60f42bfaed3dacb0a227efb27ba53c914849 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Sat, 31 Jan 2015 16:21:06 +0200
Subject: [PATCH 50/94] MAGETWO-33060: Refactor __() to return Phrase object

- AbstractAggregateException->addError() method updated for it to set message property as string;
---
 .../Magento/Framework/Exception/AbstractAggregateException.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
index 18079823dce97..d5d2f8f254cf0 100644
--- a/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
+++ b/lib/internal/Magento/Framework/Exception/AbstractAggregateException.php
@@ -74,7 +74,7 @@ public function addError($rawMessage, array $params = [])
                 // First call: simply overwrite the message and params
                 $this->rawMessage = $rawMessage;
                 $this->params = $params;
-                $this->message = __($rawMessage, $params);
+                $this->message = (string)__($rawMessage, $params);
             } elseif (2 === $this->addErrorCalls) {
                 // Second call: store the error from the first call and the second call in the array
                 // restore the message and params to their original value

From 9317114a085a72d75daa7dd36851904e455bb3e3 Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Mon, 2 Feb 2015 10:46:30 +0200
Subject: [PATCH 51/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Controller/Noroute/Index.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php
index 1eeb70b5010e8..2513b6d3c6567 100755
--- a/app/code/Magento/Cms/Controller/Noroute/Index.php
+++ b/app/code/Magento/Cms/Controller/Noroute/Index.php
@@ -32,11 +32,6 @@ public function __construct(
      */
     public function execute()
     {
-        /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */
-        $resultForward = $this->resultForwardFactory->create();
-        $resultForward->setHeader('HTTP/1.1', '404 Not Found');
-        $resultForward->setHeader('Status', '404 File not found');
-
         $pageId = $this->_objectManager->get(
             'Magento\Framework\App\Config\ScopeConfigInterface',
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -47,11 +42,16 @@ public function execute()
         /** @var \Magento\Cms\Helper\Page $pageHelper */
         $pageHelper = $this->_objectManager->get('Magento\Cms\Helper\Page');
         $resultPage = $pageHelper->prepareResultPage($this, $pageId);
-        if (!$resultPage) {
+        if ($resultPage) {
+            $resultPage->setHeader('HTTP/1.1', '404 Not Found');
+            $resultPage->setHeader('Status', '404 File not found');
+            return $resultPage;
+        } else {
+            /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */
+            $resultForward = $this->resultForwardFactory->create();
             $resultForward->setController('index');
             $resultForward->forward('defaultNoRoute');
             return $resultForward;
         }
-        return $resultPage;
     }
 }

From ed25c9c141b298fcead964d4ddc246b7e461144b Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Mon, 2 Feb 2015 12:48:02 +0200
Subject: [PATCH 52/94] MAGETWO-33062: Update dictionary search tool to support
 \Magento\Framework\Phrase

---
 .../Php/Tokenizer/PhraseCollectorTest.php     | 57 +++++++++++++++++++
 .../Translate/MethodCollectorTest.php         | 57 +++++++++++++++++++
 .../Php/Tokenizer/_files/methodsCode.php.txt  |  5 ++
 .../Php/Tokenizer/_files/objectsCode.php.txt} |  0
 .../Php/Tokenizer/PhraseCollectorTest.php     | 29 +++++-----
 .../I18n/Parser/Adapter/Php/TokenizerTest.php |  6 +-
 .../Adapter/Php/_files/objectsCode.php.txt    |  5 ++
 7 files changed, 143 insertions(+), 16 deletions(-)
 create mode 100644 dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php
 create mode 100644 dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/_files/methodsCode.php.txt
 rename dev/tests/{unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php => integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/_files/objectsCode.php.txt} (100%)
 create mode 100644 dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php.txt

diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
new file mode 100644
index 0000000000000..8def51e7c8227
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer;
+
+use Magento\Framework\ObjectManager;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector
+ */
+class PhraseCollectorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var PhraseCollector
+     */
+    protected $phraseCollector;
+
+    /**
+     * @var ObjectManager
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->phraseCollector = $this->objectManager->create(
+            'Magento\\Tools\\I18n\\Parser\\Adapter\\Php\\Tokenizer\\PhraseCollector'
+        );
+    }
+
+    /**
+     * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector::parse
+     */
+    public function testParse()
+    {
+        $file = __DIR__.'/_files/objectsCode.php.txt';
+        $this->phraseCollector->parse($file);
+        $expectation = [
+            [
+                'phrase' => '\'Testing\'',
+                'arguments' => 0,
+                'file' => $file,
+                'line' => 3
+            ],
+            [
+                'phrase' => '\'More testing\'',
+                'arguments' => 0,
+                'file' => $file,
+                'line' => 4
+            ]
+        ];
+        $this->assertEquals($expectation, $this->phraseCollector->getPhrases());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php
new file mode 100644
index 0000000000000..a50fc5384e7bd
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Translate;
+
+use Magento\Framework\ObjectManager;
+use Magento\TestFramework\Helper\Bootstrap;
+
+/**
+ * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Translate\MethodCollector
+ */
+class MethodCollectorTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var MethodCollector
+     */
+    protected $methodCollector;
+
+    /**
+     * @var ObjectManager
+     */
+    protected $objectManager;
+
+    protected function setUp()
+    {
+        $this->objectManager = Bootstrap::getObjectManager();
+        $this->methodCollector = $this->objectManager->create(
+            'Magento\\Tools\\I18n\\Parser\\Adapter\\Php\\Tokenizer\\Translate\\MethodCollector'
+        );
+    }
+
+    /**
+     * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Translate\MethodCollector::parse
+     */
+    public function testParse()
+    {
+        $file = __DIR__.'/../_files/methodsCode.php.txt';
+        $this->methodCollector->parse($file);
+        $expectation = [
+            [
+                'phrase' => '\'Some string\'',
+                'arguments' => 0,
+                'file' => $file,
+                'line' => 4
+            ],
+            [
+                'phrase' => '\'One more string\'',
+                'arguments' => 0,
+                'file' => $file,
+                'line' => 5
+            ]
+        ];
+        $this->assertEquals($expectation, $this->methodCollector->getPhrases());
+    }
+}
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/_files/methodsCode.php.txt b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/_files/methodsCode.php.txt
new file mode 100644
index 0000000000000..d3b427d0be4c7
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/_files/methodsCode.php.txt
@@ -0,0 +1,5 @@
+<?php
+
+$obj1->___toString('Irrelevant string');
+$obj2->__('Some string');
+$obj3->__('One more string');
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/_files/objectsCode.php.txt
similarity index 100%
rename from dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php
rename to dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/_files/objectsCode.php.txt
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
index ba86bbae01710..a5223ce075962 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
@@ -113,14 +113,15 @@ public function testParseDataProvider()
                 'file' => $file,
                 'isEndOfLoopReturnValues' => [
                     false, //before $phrase1
-                    false, //before =
-                    false, //before new \Magento\Framework\Phrase('Testing')
-                    false, //before ;
-                    false, //before $phrase2
-                    false, //before =
-                    false, //before __('More testing')
-                    false, //before ;
-                    true //end of loop
+                    false, //at $phrase1
+                    false, //at =
+                    false, //at new
+                    false, //at ;
+                    false, //at $phrase2
+                    false, //at =
+                    false, //at __
+                    false, //at ;
+                    true //after ;
                 ],
                 'getNextRealTokenReturnValues' => [
                     $this->createToken(false, false, false, false, '$phrase1'),
@@ -130,24 +131,26 @@ public function testParseDataProvider()
                     $this->createToken(false, false, false, false, '$phrase2'),
                     $this->createToken(false, false, false, false, '='),
                     $this->createToken(true, false, false, false, '__', $line),
-                    $this->createToken(false, true, false, false, '(')
+                    $this->createToken(false, true, false, false, '('),
+                    $this->createToken(false, false, false, false, ';'),
+                    false
                 ],
                 'getFunctionArgumentsTokensReturnValues' => [
-                    [[$this->createToken(false, false, false, true, 'Testing')]], // 'Testing')
-                    [[$this->createToken(false, false, false, true, 'More testing')]] // 'More testing')
+                    [[$this->createToken(false, false, false, true, '\'Testing\'')]], // 'Testing')
+                    [[$this->createToken(false, false, false, true, '\'More testing\'')]] // 'More testing')
                 ],
                 'isMatchingClassReturnValues' => [
                     true // \Magento\Framework\Phrase(
                 ],
                 'result' => [
                     [
-                        'phrase' => 'Testing',
+                        'phrase' => '\'Testing\'',
                         'arguments' => 0,
                         'file' => $file,
                         'line' => $line
                     ],
                     [
-                        'phrase' => 'More testing',
+                        'phrase' => '\'More testing\'',
                         'arguments' => 0,
                         'file' => $file,
                         'line' => $line
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/TokenizerTest.php b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/TokenizerTest.php
index e2ae4a2f8a6dd..4520e479c5e23 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/TokenizerTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/TokenizerTest.php
@@ -81,15 +81,15 @@ public function testIsEndOfLoop()
         //We have 27 total tokens in objectsCode.php file (excluding whitespaces)
         //So the isEndOfLoop function should return true after we pick 28th non-existent token
         for ($i = 0; $i < 28; $i += 1) {
-            $this->assertEquals(false, $this->tokenizer->isEndOfLoop());
+            $this->assertFalse($this->tokenizer->isEndOfLoop());
             $this->tokenizer->getNextRealToken();
         }
-        $this->assertEquals(true, $this->tokenizer->isEndOfLoop());
+        $this->assertTrue($this->tokenizer->isEndOfLoop());
     }
 
     protected function parseFile()
     {
-        $file = __DIR__.'/_files/objectsCode.php';
+        $file = __DIR__.'/_files/objectsCode.php.txt';
         $this->tokenizer->parse($file);
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php.txt b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php.txt
new file mode 100644
index 0000000000000..72b351197a11a
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/_files/objectsCode.php.txt
@@ -0,0 +1,5 @@
+<?php
+
+new \Magento\Framework\Phrase('Testing');
+new Phrase('More testing');
+new \Magento\Framework\Object();

From d01c7109beee261f6cdb8f209401f610b747be8c Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Mon, 2 Feb 2015 13:02:30 +0200
Subject: [PATCH 53/94] MAGETWO-33062: Update dictionary search tool to support
 \Magento\Framework\Phrase

---
 .../I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php   | 2 +-
 .../Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
index 8def51e7c8227..f5811554f54b7 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer;
+namespace Magento\Test\Tools\I18n\Parser\Adapter\Php\Tokenizer;
 
 use Magento\Framework\ObjectManager;
 use Magento\TestFramework\Helper\Bootstrap;
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php
index a50fc5384e7bd..57bb29f5ce73b 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php
@@ -3,7 +3,7 @@
  * Copyright © 2015 Magento. All rights reserved.
  * See COPYING.txt for license details.
  */
-namespace Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Translate;
+namespace Magento\Test\Tools\I18n\Parser\Adapter\Php\Tokenizer\Translate;
 
 use Magento\Framework\ObjectManager;
 use Magento\TestFramework\Helper\Bootstrap;

From 2d689e236a46dee63fd24e8cb71dcc7acc29c096 Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Mon, 2 Feb 2015 13:16:08 +0200
Subject: [PATCH 54/94] MAGETWO-33059: Refactor CMS module

---
 .../Cms/Controller/Noroute/IndexTest.php      | 86 ++++++++++++-------
 1 file changed, 56 insertions(+), 30 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
index 5323da8b3a7d2..2b9e202517120 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
@@ -32,11 +32,19 @@ class IndexTest extends \PHPUnit_Framework_TestCase
      */
     protected $forwardMock;
 
+    /**
+     * @var \Magento\Framework\View\Result\Page|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultPageMock;
+
     protected function setUp()
     {
         $helper = new \Magento\TestFramework\Helper\ObjectManager($this);
         $objectManagerMock = $this->getMock('Magento\Framework\ObjectManagerInterface');
         $responseMock = $this->getMock('Magento\Framework\App\Response\Http', [], [], '', false);
+        $this->resultPageMock = $this->getMockBuilder('\Magento\Framework\View\Result\Page')
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->forwardFactoryMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\ForwardFactory')
             ->setMethods(['create'])
             ->disableOriginalConstructor()
@@ -47,26 +55,6 @@ protected function setUp()
         $this->forwardFactoryMock->expects($this->any())
             ->method('create')
             ->willReturn($this->forwardMock);
-        $this->forwardMock->expects(
-            $this->at(0)
-        )->method(
-            'setHeader'
-        )->with(
-            'HTTP/1.1',
-            '404 Not Found'
-        )->will(
-            $this->returnSelf()
-        );
-        $this->forwardMock->expects(
-            $this->at(1)
-        )->method(
-            'setHeader'
-        )->with(
-            'Status',
-            '404 File not found'
-        )->will(
-            $this->returnSelf()
-        );
 
         $scopeConfigMock = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
         $this->_requestMock = $this->getMock('Magento\Framework\App\Request\Http', [], [], '', false);
@@ -97,25 +85,63 @@ protected function setUp()
         );
     }
 
-    /**
-     * @param bool $renderPage
-     * @dataProvider indexActionDataProvider
-     */
-    public function testIndexAction($renderPage)
+    public function testExecuteResultPage()
     {
+        $this->resultPageMock->expects(
+            $this->at(0)
+        )->method(
+            'setHeader'
+        )->with(
+            'HTTP/1.1', '404 Not Found'
+        )->will(
+            $this->returnSelf()
+        );
+        $this->resultPageMock->expects(
+            $this->at(1)
+        )->method(
+            'setHeader'
+        )->with(
+            'Status', '404 File not found'
+        )->will(
+            $this->returnSelf()
+        );
         $this->_cmsHelperMock->expects(
             $this->once()
         )->method(
             'prepareResultPage'
         )->will(
-            $this->returnValue($renderPage)
+            $this->returnValue($this->resultPageMock)
         );
-        $this->_requestMock->expects($this->any())->method('setActionName')->with('defaultNoRoute');
-        $this->_controller->execute();
+        $this->assertInstanceOf('Magento\Framework\View\Result\Page', $this->_controller->execute());
     }
 
-    public function indexActionDataProvider()
+    public function testExecuteResultForward()
     {
-        return ['renderPage_return_true' => [true], 'renderPage_return_false' => [false]];
+        $this->forwardMock->expects(
+            $this->once()
+        )->method(
+            'setController'
+        )->with(
+            'index'
+        )->will(
+            $this->returnSelf()
+        );
+        $this->forwardMock->expects(
+            $this->once()
+        )->method(
+            'forward'
+        )->with(
+            'defaultNoRoute'
+        )->will(
+            $this->returnSelf()
+        );
+        $this->_cmsHelperMock->expects(
+            $this->once()
+        )->method(
+            'prepareResultPage'
+        )->will(
+            $this->returnValue(false)
+        );
+        $this->assertInstanceOf('Magento\Backend\Model\View\Result\Forward', $this->_controller->execute());
     }
 }

From b037ba3343c4fca6c5dc9b2a7b542c533dece19c Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Mon, 2 Feb 2015 14:37:13 +0200
Subject: [PATCH 55/94] MAGETWO-33059: Refactor CMS module

---
 .../testsuite/Magento/Cms/Controller/Noroute/IndexTest.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
index 2b9e202517120..1166acad0202d 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
@@ -92,7 +92,8 @@ public function testExecuteResultPage()
         )->method(
             'setHeader'
         )->with(
-            'HTTP/1.1', '404 Not Found'
+            'HTTP/1.1',
+            '404 Not Found'
         )->will(
             $this->returnSelf()
         );
@@ -101,7 +102,8 @@ public function testExecuteResultPage()
         )->method(
             'setHeader'
         )->with(
-            'Status', '404 File not found'
+            'Status',
+            '404 File not found'
         )->will(
             $this->returnSelf()
         );

From f7ae824f7d5be33c607edabae379a685d85b1d98 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Mon, 2 Feb 2015 15:12:21 +0200
Subject: [PATCH 56/94] MAGETWO-33062: Update dictionary search tool to support
 \Magento\Framework\Phrase

---
 .../Adapter/Php/Tokenizer/PhraseCollectorTest.php      |  3 ++-
 .../Php/Tokenizer/Translate/MethodCollectorTest.php    |  1 +
 .../Adapter/Php/Tokenizer/PhraseCollectorTest.php      |  2 +-
 dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php    |  2 +-
 .../Parser/Adapter/Php/Tokenizer/PhraseCollector.php   | 10 ++++++----
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
index f5811554f54b7..6ec31451e2cf0 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\ObjectManager;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector;
 
 /**
  * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector
@@ -37,7 +38,7 @@ protected function setUp()
     public function testParse()
     {
         $file = __DIR__.'/_files/objectsCode.php.txt';
-        $this->phraseCollector->parse($file);
+        $this->phraseCollector->parse($file, true);
         $expectation = [
             [
                 'phrase' => '\'Testing\'',
diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php
index 57bb29f5ce73b..6d401f7ce7ee7 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/Translate/MethodCollectorTest.php
@@ -7,6 +7,7 @@
 
 use Magento\Framework\ObjectManager;
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Translate\MethodCollector;
 
 /**
  * @covers \Magento\Tools\I18n\Parser\Adapter\Php\Tokenizer\Translate\MethodCollector
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
index a5223ce075962..0edadede84de4 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
@@ -92,7 +92,7 @@ public function testParse(
                 $isMatchingClassReturnValues
             ));
 
-        $this->phraseCollector->parse($file);
+        $this->phraseCollector->parse($file, true);
         $this->assertEquals($result, $this->phraseCollector->getPhrases());
     }
 
diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php
index 16768914058f8..0c358dda64b6f 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php
@@ -34,7 +34,7 @@ public function __construct(PhraseCollector $phraseCollector)
      */
     protected function _parse()
     {
-        $this->_phraseCollector->parse($this->_file);
+        $this->_phraseCollector->parse($this->_file, true);
 
         foreach ($this->_phraseCollector->getPhrases() as $phrase) {
             $this->_addPhrase($phrase['phrase'], $phrase['line']);
diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
index db0906d35b63f..861dcc00c0061 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
@@ -55,24 +55,26 @@ public function getPhrases()
      * Parse given files for phrase
      *
      * @param string $file
+     * @param bool $searchObjects
      * @return void
      */
-    public function parse($file)
+    public function parse($file, $searchObjects = false)
     {
         $this->_phrases = [];
         $this->_file = $file;
         $this->_tokenizer->parse($file);
         while (!$this->_tokenizer->isEndOfLoop()) {
-            $this->_extractPhrases();
+            $this->_extractPhrases($searchObjects);
         }
     }
 
     /**
      * Extract phrases from given tokens. e.g.: __('phrase', ...)
      *
+     * @param bool $searchObjects
      * @return void
      */
-    protected function _extractPhrases()
+    protected function _extractPhrases($searchObjects)
     {
         if ($firstToken = $this->_tokenizer->getNextRealToken()) {
             if ($firstToken->isEqualFunction('__')) {
@@ -84,7 +86,7 @@ protected function _extractPhrases()
                         $this->_addPhrase($phrase, count($arguments), $this->_file, $firstToken->getLine());
                     }
                 }
-            } elseif ($firstToken->isNew() && $this->_tokenizer->isMatchingClass('Phrase')) {
+            } elseif ($searchObjects && $firstToken->isNew() && $this->_tokenizer->isMatchingClass('Phrase')) {
                 $arguments = $this->_tokenizer->getFunctionArgumentsTokens();
                 $phrase = $this->_collectPhrase(array_shift($arguments));
                 if (null !== $phrase) {

From 98ed69c1e06163e8655a20db87c7e62c4a01e132 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Mon, 2 Feb 2015 15:31:50 +0200
Subject: [PATCH 57/94] MAGETWO-33062: Update dictionary search tool to support
 \Magento\Framework\Phrase

---
 .../Adapter/Php/Tokenizer/PhraseCollector.php | 44 ++++++++++++++-----
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
index 861dcc00c0061..f40a487d4e5ee 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
@@ -77,23 +77,47 @@ public function parse($file, $searchObjects = false)
     protected function _extractPhrases($searchObjects)
     {
         if ($firstToken = $this->_tokenizer->getNextRealToken()) {
-            if ($firstToken->isEqualFunction('__')) {
-                $secondToken = $this->_tokenizer->getNextRealToken();
-                if ($secondToken && $secondToken->isOpenBrace()) {
-                    $arguments = $this->_tokenizer->getFunctionArgumentsTokens();
-                    $phrase = $this->_collectPhrase(array_shift($arguments));
-                    if (null !== $phrase) {
-                        $this->_addPhrase($phrase, count($arguments), $this->_file, $firstToken->getLine());
-                    }
-                }
-            } elseif ($searchObjects && $firstToken->isNew() && $this->_tokenizer->isMatchingClass('Phrase')) {
+            if (!$this->extractMethodPhrase($firstToken) && $searchObjects) {
+                $this->extractObjectPhrase($firstToken);
+            }
+        }
+    }
+
+    /**
+     * @param Token $firstToken
+     * @return bool
+     */
+    protected function extractMethodPhrase(Token $firstToken)
+    {
+        if ($firstToken->isEqualFunction('__')) {
+            $secondToken = $this->_tokenizer->getNextRealToken();
+            if ($secondToken && $secondToken->isOpenBrace()) {
                 $arguments = $this->_tokenizer->getFunctionArgumentsTokens();
                 $phrase = $this->_collectPhrase(array_shift($arguments));
                 if (null !== $phrase) {
                     $this->_addPhrase($phrase, count($arguments), $this->_file, $firstToken->getLine());
+                    return true;
                 }
             }
         }
+        return false;
+    }
+
+    /**
+     * @param Token $firstToken
+     * @return bool
+     */
+    protected function extractObjectPhrase(Token $firstToken)
+    {
+        if ($firstToken->isNew() && $this->_tokenizer->isMatchingClass('Phrase')) {
+            $arguments = $this->_tokenizer->getFunctionArgumentsTokens();
+            $phrase = $this->_collectPhrase(array_shift($arguments));
+            if (null !== $phrase) {
+                $this->_addPhrase($phrase, count($arguments), $this->_file, $firstToken->getLine());
+                return true;
+            }
+        }
+        return false;
     }
 
     /**

From 0fdef6821ed66c37cd04310b979fc975c52021cc Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Mon, 2 Feb 2015 16:28:51 +0200
Subject: [PATCH 58/94] MAGETWO-33060: Refactor __() to return Phrase object

---
 app/code/Magento/Customer/Model/Resource/GroupRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Customer/Model/Resource/GroupRepository.php b/app/code/Magento/Customer/Model/Resource/GroupRepository.php
index ddf6868ed9f4c..e6c4462d759eb 100644
--- a/app/code/Magento/Customer/Model/Resource/GroupRepository.php
+++ b/app/code/Magento/Customer/Model/Resource/GroupRepository.php
@@ -124,7 +124,7 @@ public function save(\Magento\Customer\Api\Data\GroupInterface $group)
              * Would like a better way to determine this error condition but
              *  difficult to do without imposing more database calls
              */
-            if ($e->getMessage() === __('Customer Group already exists.')) {
+            if ($e->getMessage() == (string)__('Customer Group already exists.')) {
                 throw new InvalidTransitionException('Customer Group already exists.');
             }
             throw $e;

From 2f74854c83a06f5d85386eaabf5b9a9da20ecbbe Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Mon, 2 Feb 2015 16:48:08 +0200
Subject: [PATCH 59/94] MAGETWO-33062: Update dictionary search tool to support
 \Magento\Framework\Phrase

---
 .../Php/Tokenizer/PhraseCollectorTest.php     |  3 +-
 .../Php/Tokenizer/PhraseCollectorTest.php     |  3 +-
 .../Magento/Tools/I18n/Parser/Adapter/Php.php |  3 +-
 .../Adapter/Php/Tokenizer/PhraseCollector.php | 31 ++++++++++++++-----
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
index 6ec31451e2cf0..7e0f91b9e91b5 100644
--- a/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
+++ b/dev/tests/integration/testsuite/Magento/Test/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
@@ -38,7 +38,8 @@ protected function setUp()
     public function testParse()
     {
         $file = __DIR__.'/_files/objectsCode.php.txt';
-        $this->phraseCollector->parse($file, true);
+        $this->phraseCollector->setIncludeObjects();
+        $this->phraseCollector->parse($file);
         $expectation = [
             [
                 'phrase' => '\'Testing\'',
diff --git a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
index 0edadede84de4..674838f748253 100644
--- a/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollectorTest.php
@@ -92,7 +92,8 @@ public function testParse(
                 $isMatchingClassReturnValues
             ));
 
-        $this->phraseCollector->parse($file, true);
+        $this->phraseCollector->setIncludeObjects();
+        $this->phraseCollector->parse($file);
         $this->assertEquals($result, $this->phraseCollector->getPhrases());
     }
 
diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php
index 0c358dda64b6f..fa9af6e339496 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php.php
@@ -34,7 +34,8 @@ public function __construct(PhraseCollector $phraseCollector)
      */
     protected function _parse()
     {
-        $this->_phraseCollector->parse($this->_file, true);
+        $this->_phraseCollector->setIncludeObjects();
+        $this->_phraseCollector->parse($this->_file);
 
         foreach ($this->_phraseCollector->getPhrases() as $phrase) {
             $this->_addPhrase($phrase['phrase'], $phrase['line']);
diff --git a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
index f40a487d4e5ee..297177e1071c7 100644
--- a/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
+++ b/dev/tools/Magento/Tools/I18n/Parser/Adapter/Php/Tokenizer/PhraseCollector.php
@@ -31,14 +31,23 @@ class PhraseCollector
      */
     protected $_file;
 
+    /**
+     * Are the Phrase objects are parsed as well
+     *
+     * @var bool
+     */
+    protected $includeObjects = false;
+
     /**
      * Construct
      *
      * @param Tokenizer $tokenizer
+     * @param bool $includeObjects
      */
-    public function __construct(Tokenizer $tokenizer)
+    public function __construct(Tokenizer $tokenizer, $includeObjects = false)
     {
         $this->_tokenizer = $tokenizer;
+        $this->includeObjects = $includeObjects;
     }
 
     /**
@@ -55,29 +64,27 @@ public function getPhrases()
      * Parse given files for phrase
      *
      * @param string $file
-     * @param bool $searchObjects
      * @return void
      */
-    public function parse($file, $searchObjects = false)
+    public function parse($file)
     {
         $this->_phrases = [];
         $this->_file = $file;
         $this->_tokenizer->parse($file);
         while (!$this->_tokenizer->isEndOfLoop()) {
-            $this->_extractPhrases($searchObjects);
+            $this->_extractPhrases();
         }
     }
 
     /**
      * Extract phrases from given tokens. e.g.: __('phrase', ...)
      *
-     * @param bool $searchObjects
      * @return void
      */
-    protected function _extractPhrases($searchObjects)
+    protected function _extractPhrases()
     {
         if ($firstToken = $this->_tokenizer->getNextRealToken()) {
-            if (!$this->extractMethodPhrase($firstToken) && $searchObjects) {
+            if (!$this->extractMethodPhrase($firstToken) && $this->includeObjects) {
                 $this->extractObjectPhrase($firstToken);
             }
         }
@@ -161,4 +168,14 @@ protected function _addPhrase($phrase, $argumentsAmount, $file, $line)
             'line' => $line,
         ];
     }
+
+    /**
+     * @param bool $includeObjects
+     * @return $this
+     */
+    public function setIncludeObjects($includeObjects = true)
+    {
+        $this->includeObjects = (bool)$includeObjects;
+        return $this;
+    }
 }

From c9f15c52140c7d2b6aec8695d9fdca5df35e324b Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Tue, 3 Feb 2015 13:16:33 +0200
Subject: [PATCH 60/94] MAGETWO-15418: Sold products aren't displayed in
 Bestsellers

- License header updated where needed;
- AssertBestsellersOnDashboard->isProductVisible updated;
---
 .../Adminhtml/Dashboard/RefreshStatistics.php |  5 +--
 .../totalbar/refreshstatistics.phtml          |  3 +-
 .../Test/Block/Dashboard/StoreStats.php       | 13 ++++---
 .../Test/Block/Dashboard/StoreStats.xml       |  3 +-
 .../Test/Block/Dashboard/Tab/Products.php     |  4 ++-
 .../Block/Dashboard/Tab/Products/Ordered.php  | 35 ++++++++++---------
 .../AssertBestsellersOnDashboard.php          | 35 ++++---------------
 .../Dashboard/RefreshStatisticsTest.php       |  4 ++-
 8 files changed, 43 insertions(+), 59 deletions(-)

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
index a0f73d5d254f4..511e0891bc48d 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
@@ -1,8 +1,9 @@
 <?php
 /**
- *
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Controller\Adminhtml\Dashboard;
 
 class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
index a8bd71bf1b5af..650f937102370 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
@@ -1,6 +1,7 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 ?>
 <form action="<?php echo $this->getUrl('*/*/refreshStatistics'); ?>" method="post">
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php
index 19d417da04374..278fd8973f3bc 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.php
@@ -1,20 +1,19 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
-namespace Magento\Backend\Test\Block\Dashboard;
 
-use Magento\Mtf\Client\Locator;
-use Magento\Backend\Test\Block\Widget\FormTabs;
+namespace Magento\Backend\Test\Block\Dashboard;
 
-class StoreStats extends FormTabs
+class StoreStats extends \Magento\Backend\Test\Block\Widget\FormTabs
 {
     /**
      * Refresh data button
      *
      * @var string
      */
-    protected $refreshData = '//button[@title="Refresh data"]';
+    protected $refreshData = 'button';
 
     /**
      * Click Refresh Data button
@@ -23,6 +22,6 @@ class StoreStats extends FormTabs
      */
     public function refreshData()
     {
-        $this->_rootElement->find($this->refreshData, Locator::SELECTOR_XPATH)->click();
+        $this->_rootElement->find($this->refreshData)->click();
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.xml b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.xml
index fd0baa2eb287d..5a5a5b86dae91 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.xml
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/StoreStats.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" ?>
 <!--
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 -->
 <tabs>
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php
index 22b19e53b6614..a2ae34fdf9155 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products.php
@@ -1,7 +1,9 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Test\Block\Dashboard\Tab;
 
 use Magento\Mtf\Client\Element;
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
index c4400052a5c5e..cc8ae67fde0ef 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
@@ -1,40 +1,41 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Backend\Test\Block\Dashboard\Tab\Products;
 
 use Magento\Mtf\Client\Locator;
 use Magento\Backend\Test\Block\Widget\Grid;
+use Magento\Catalog\Test\Fixture\CatalogProductSimple;
 
 /**
  * Ordered products grid on bestsellers tab on Dashboard
  */
 class Ordered extends Grid
 {
-    // @codingStandardsIgnoreStart
-    /**
-     * Ordered products row in bestsellers grid
-     *
-     * @var string
-     */
-    protected $orderedProductsRow = '//table[@id="productsOrderedGrid_table"]/tbody/tr[td[contains(., "%s")] and td[contains(., "%d")] and td[contains(., "%d")]]';
-    // @codingStandardsIgnoreEnd
-
     /**
      * Check if ordered product is in grid
      *
-     * @param array $filter
+     * @param CatalogProductSimple $product
      * @return bool
      */
-    public function isProductVisible($filter)
+    public function isProductVisible(CatalogProductSimple $product)
     {
-        if ($this->_rootElement->find(sprintf($this->orderedProductsRow, $filter['name'], $filter['price'],
-            $filter['qty']), Locator::SELECTOR_XPATH)->isVisible()
-        ) {
-            return true;
+        $location = '//table[@id="productsOrderedGrid_table"]/tbody/tr[';
+        $rowTemplate = 'td[contains(., "%s")]';
+        $filter = [
+            $product->getName(),
+            $product->getPrice(),
+            $product->getCheckoutData()['qty'],
+        ];
+        $rows = [];
+        foreach ($filter as $value) {
+            $rows[] = sprintf($rowTemplate, $value);
         }
-        return false;
+        $location = $location . implode(' and ', $rows) . ']';
+
+        return $this->_rootElement->find($location, Locator::SELECTOR_XPATH)->isVisible() ? true : false;
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
index 66e64440114d1..2db5fe1018056 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Constraint/AssertBestsellersOnDashboard.php
@@ -1,25 +1,7 @@
 <?php
 /**
- * Magento
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Open Software License (OSL 3.0)
- * that is bundled with this package in the file LICENSE.txt.
- * It is also available through the world-wide-web at this URL:
- * http://opensource.org/licenses/osl-3.0.php
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@magentocommerce.com so we can send you a copy immediately.
- *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade Magento to newer
- * versions in the future. If you wish to customize Magento for your
- * needs please refer to http://www.magentocommerce.com for more information.
- *
- * @copyright   Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
- * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Backend\Test\Constraint;
@@ -38,7 +20,7 @@ class AssertBestsellersOnDashboard extends AbstractConstraint
     /* end tags */
 
     /**
-     * Assert that ordered products in bestsellers on Dashboard successfully refreshed
+     * Assert that ordered products in bestsellers on Dashboard successfully refreshed.
      *
      * @param OrderInjectable $order
      * @param Dashboard $dashboard
@@ -51,15 +33,10 @@ public function processAssert(OrderInjectable $order, Dashboard $dashboard)
         /** @var \Magento\Backend\Test\Block\Dashboard\Tab\Products\Ordered $bestsellersGrid */
         $bestsellersGrid = $dashboard->getStoreStatsBlock()->getTabElement('bestsellers')->getBestsellersGrid();
         $products = $order->getEntityId()['products'];
-        foreach($products as $product) {
-            $filter = [
-                'name' => $product->getName(),
-                'price' => $product->getPrice(),
-                'qty' => $product->getCheckoutData()['qty'],
-            ];
+        foreach ($products as $product) {
             \PHPUnit_Framework_Assert::assertTrue(
-                $bestsellersGrid->isProductVisible($filter),
-                'Bestseller does not present in report grid after refresh data.'
+                $bestsellersGrid->isProductVisible($product),
+                'Bestseller ' . $product->getName() . ' is not present in report grid after refresh data.'
             );
         }
     }
diff --git a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
index d422e193f9ca5..0a7835a0ae3fe 100644
--- a/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
+++ b/dev/tests/unit/testsuite/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatisticsTest.php
@@ -1,7 +1,9 @@
 <?php
 /**
- * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
  */
+
 namespace Magento\Backend\Controller\Adminhtml\Dashboard;
 
 /**

From 96dc5442aadd896293372823c076ad2e229980bb Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Tue, 3 Feb 2015 15:36:48 +0200
Subject: [PATCH 61/94] MAGETWO-15418: Sold products aren't displayed in
 Bestsellers

- Changed $this to $block in templates;
- Swapped Magento\Framework\Logger for Psr\Log\LoggerInterface;
---
 .../Adminhtml/Dashboard/RefreshStatistics.php | 20 ++++++++++++++++++-
 .../adminhtml/templates/dashboard/index.phtml |  2 +-
 .../totalbar/refreshstatistics.phtml          |  4 ++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
index 511e0891bc48d..eab058ed41384 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
@@ -8,6 +8,24 @@
 
 class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
 {
+    /**
+     * @param \Psr\Log\LoggerInterface $logger
+     * @param \Magento\Backend\App\Action\Context $context
+     * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
+     * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
+     * @param array $reportTypes
+     */
+    public function __construct(
+        \Psr\Log\LoggerInterface $logger,
+        \Magento\Backend\App\Action\Context $context,
+        \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
+        \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
+        array $reportTypes
+    ) {
+        $this->logger = $logger;
+        parent::__construct($context, $dateFilter, $resultRedirectFactory, $reportTypes);
+    }
+
     /**
      * @return \Magento\Backend\Model\View\Result\Redirect
      */
@@ -21,7 +39,7 @@ public function execute()
             $this->messageManager->addSuccess(__('We updated lifetime statistic.'));
         } catch (\Exception $e) {
             $this->messageManager->addError(__('We can\'t refresh lifetime statistics.'));
-            $this->_objectManager->get('Magento\Framework\Logger')->logException($e);
+            $this->logger->critical($e);
         }
         return $this->resultRedirectFactory->create()->setPath('*/*');
     }
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
index 51663e0b47081..aa9244f406b1b 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/index.phtml
@@ -81,7 +81,7 @@ window.changeDiagramsPeriod = function(periodObj) {
              <div class="dashboard-store-stats">
                  <?php echo $block->getChildHtml('grids') ?>
                  <div id="grid_tab_content" class="dashboard-store-stats-content"></div>
-                 <?php echo $this->getChildHtml('refresh_statistics') ?>
+                 <?php echo $block->getChildHtml('refresh_statistics') ?>
              </div>
          </div>
          <div class="dashboard-secondary">
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
index 650f937102370..52c656076e9e4 100644
--- a/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
+++ b/app/code/Magento/Backend/view/adminhtml/templates/dashboard/totalbar/refreshstatistics.phtml
@@ -4,8 +4,8 @@
  * See COPYING.txt for license details.
  */
 ?>
-<form action="<?php echo $this->getUrl('*/*/refreshStatistics'); ?>" method="post">
-    <input name="form_key" type="hidden" value="<?php echo $this->getFormKey() ?>" />
+<form action="<?php echo $block->getUrl('*/*/refreshStatistics'); ?>" method="post">
+    <input name="form_key" type="hidden" value="<?php echo $block->getFormKey(); ?>" />
     <button type="submit" style="float:right; margin: 15px"  title="Refresh data">
         <?php echo __('Refresh data') ?>
     </button>

From 6dc076b8ee74d8f4780eff450a4812663cca633f Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Tue, 3 Feb 2015 16:29:11 +0200
Subject: [PATCH 62/94] MAGETWO-33060: Refactor __() to return Phrase object

- Expected result in unit tests modified for it to contain Phrase objects instead of raw strings;
---
 .../Model/Rule/Condition/CombineTest.php            | 13 ++++---------
 .../Magento/Core/Model/Layout/MergeTest.php         | 11 +++--------
 .../Magento/Tax/Model/Sales/Total/Quote/TaxTest.php |  2 +-
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php b/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php
index 43152fce8b40b..c5271a11a4ce9 100644
--- a/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php
+++ b/dev/tests/unit/testsuite/Magento/CatalogWidget/Model/Rule/Condition/CombineTest.php
@@ -45,9 +45,9 @@ protected function setUp()
     public function testGetNewChildSelectOptions()
     {
         $expectedOptions = [
-            ['value' => '', 'label' => 'Please choose a condition to add.'],
-            ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Combine', 'label' => 'Conditions Combination'],
-            ['label' => 'Product Attribute', 'value' => [
+            ['value' => '', 'label' => __('Please choose a condition to add.')],
+            ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Combine', 'label' => __('Conditions Combination')],
+            ['label' => __('Product Attribute'), 'value' => [
                 ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|sku', 'label' => 'SKU'],
                 ['value' => 'Magento\CatalogWidget\Model\Rule\Condition\Product|category', 'label' => 'Category'],
             ]],
@@ -67,12 +67,7 @@ public function testGetNewChildSelectOptions()
 
         $this->conditionFactory->expects($this->atLeastOnce())->method('create')->willReturn($productCondition);
 
-        $actualOptions = $this->condition->getNewChildSelectOptions();
-        foreach ($actualOptions as $key => $option) {
-            $actualOptions[$key]['label'] = (string)$option['label'];
-        }
-
-        $this->assertSame($expectedOptions, $actualOptions);
+        $this->assertEquals($expectedOptions, $this->condition->getNewChildSelectOptions());
     }
 
     public function testCollectValidatedAttributes()
diff --git a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
index 4951257bf34ee..a34d242149d9d 100644
--- a/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
+++ b/dev/tests/unit/testsuite/Magento/Core/Model/Layout/MergeTest.php
@@ -321,22 +321,17 @@ public function testGetAllDesignAbstractions()
         $expected = [
             'customer_account' => [
                 'name' => 'customer_account',
-                'label' => 'Customer My Account (All Pages)',
+                'label' => __('Customer My Account (All Pages)'),
                 'design_abstraction' => 'custom',
             ],
             'page_empty' => [
                 'name' => 'page_empty',
-                'label' => 'All Empty Layout Pages',
+                'label' => __('All Empty Layout Pages'),
                 'design_abstraction' => 'page_layout',
             ],
         ];
 
-        $actualAbstractions = $this->_model->getAllDesignAbstractions();
-        foreach ($actualAbstractions as $key => $abstraction) {
-            $actualAbstractions[$key]['label'] = (string)$abstraction['label'];
-        }
-
-        $this->assertSame($expected, $actualAbstractions);
+        $this->assertEquals($expected, $this->_model->getAllDesignAbstractions());
     }
 
     public function testIsPageLayoutDesignAbstractions()
diff --git a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
index 1f557a2725c16..53bf78d921998 100644
--- a/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
+++ b/dev/tests/unit/testsuite/Magento/Tax/Model/Sales/Total/Quote/TaxTest.php
@@ -701,7 +701,7 @@ public function testGetLabel()
     {
         $objectManager = new ObjectManager($this);
         $taxTotalsCalcModel = $objectManager->getObject('Magento\Tax\Model\Sales\Total\Quote\Tax');
-        $this->assertSame((string)$taxTotalsCalcModel->getLabel(), (string)__('Tax'));
+        $this->assertEquals($taxTotalsCalcModel->getLabel(), __('Tax'));
     }
 
     /**

From 27db6fc96bc960c440199a58ac2c6b34f5294b3f Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Tue, 3 Feb 2015 17:07:41 +0200
Subject: [PATCH 63/94] MAGETWO-15418: Sold products aren't displayed in
 Bestsellers

- Changed argument sequence in the constructor of RefreshStatistics class;
---
 .../Controller/Adminhtml/Dashboard/RefreshStatistics.php  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
index eab058ed41384..5172f791b6d02 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/Dashboard/RefreshStatistics.php
@@ -9,21 +9,21 @@
 class RefreshStatistics extends \Magento\Reports\Controller\Adminhtml\Report\Statistics
 {
     /**
-     * @param \Psr\Log\LoggerInterface $logger
      * @param \Magento\Backend\App\Action\Context $context
      * @param \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter
      * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory
      * @param array $reportTypes
+     * @param \Psr\Log\LoggerInterface $logger
      */
     public function __construct(
-        \Psr\Log\LoggerInterface $logger,
         \Magento\Backend\App\Action\Context $context,
         \Magento\Framework\Stdlib\DateTime\Filter\Date $dateFilter,
         \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory,
-        array $reportTypes
+        array $reportTypes,
+        \Psr\Log\LoggerInterface $logger
     ) {
-        $this->logger = $logger;
         parent::__construct($context, $dateFilter, $resultRedirectFactory, $reportTypes);
+        $this->logger = $logger;
     }
 
     /**

From b81ad3f6a2f2a0df68f8130231b1ca70a1083eb6 Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Tue, 3 Feb 2015 17:11:22 +0200
Subject: [PATCH 64/94] MAGETWO-33578: Exception on frontend when Minimum Order
 Amount set to Yes

---
 app/code/Magento/Checkout/Controller/Cart/Index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
index 15c22a15981bd..1b2e1b221eef7 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Index.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -61,7 +61,7 @@ public function execute()
             $this->cart->save();
 
             if (!$this->cart->getQuote()->validateMinimumAmount()) {
-                $currencyCode = $this->_objectManager->get('Magento\Framework\Store\ScopeInterface::SCOPE_STORE')
+                $currencyCode = $this->_objectManager->get('Magento\Framework\Store\StoreManagerInterface')
                     ->getStore()
                     ->getCurrentCurrencyCode();
                 $minimumAmount = $this->_objectManager->get('Magento\Framework\Locale\CurrencyInterface')

From 1ec848786ea027824c372399437a4f4abcba1372 Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Tue, 3 Feb 2015 18:05:39 +0200
Subject: [PATCH 65/94] MAGETWO-32989: Image isn't displayed in CMS page on
 Frontend if webserver rewrites = no

---
 .../Magento/Widget/Model/Template/Filter.php  | 13 +++++++
 .../Widget/Model/Template/FilterTest.php      | 23 ++++++++++++
 .../Widget/Model/Template/FilterTest.php      | 36 +++++++++++++++++++
 3 files changed, 72 insertions(+)
 mode change 100644 => 100755 app/code/Magento/Widget/Model/Template/Filter.php
 create mode 100755 dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php
 create mode 100755 dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php

diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
old mode 100644
new mode 100755
index a4fed3b151e13..713868ac60bb4
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -110,4 +110,17 @@ public function widgetDirective($construction)
 
         return $widget->toHtml();
     }
+
+    /**
+     * Retrieve media file URL directive
+     *
+     * @param string[] $construction
+     * @return string
+     */
+    public function mediaDirective($construction)
+    {
+        $params = $this->_getIncludeParameters($construction[2]);
+        return $this->_storeManager->getStore()
+            ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
+    }
 }
diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php
new file mode 100755
index 0000000000000..1cf1458f2dcae
--- /dev/null
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Widget\Model\Template;
+
+class FilterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testMediaDirective()
+    {
+        $image = 'wysiwyg/VB.png';
+        $construction = ['{{media url="' . $image . '"}}', 'media', ' url="' . $image . '"'];
+        $baseUrl = 'http://localhost/pub/media/';
+
+        /** @var \Magento\Widget\Model\Template\Filter $filter */
+        $filter = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            'Magento\Widget\Model\Template\Filter'
+        );
+        $result = $filter->mediaDirective($construction);
+        $this->assertEquals($baseUrl . $image, $result);
+    }
+}
\ No newline at end of file
diff --git a/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php b/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php
new file mode 100755
index 0000000000000..0b4c7fb55d66e
--- /dev/null
+++ b/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Widget\Model\Template;
+
+use Magento\Framework\Store\StoreManagerInterface;
+
+class FilterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testMediaDirective()
+    {
+        $image = 'wysiwyg/VB.png';
+        $construction = ['{{media url="' . $image . '"}}', 'media', ' url="' . $image . '"'];
+        $baseUrl = 'http://localhost/pub/media/';
+
+        /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject $storeMock */
+        $storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
+        $storeMock->expects($this->once())->method('getBaseUrl')->with(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA)
+            ->will($this->returnValue($baseUrl));
+
+        /** @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject $storeManagerMock */
+        $storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);
+        $storeManagerMock->expects($this->once())->method('getStore')->will($this->returnValue($storeMock));
+
+        /** @var \Magento\Widget\Model\Template\Filter $filter */
+        $filter = (new \Magento\TestFramework\Helper\ObjectManager($this))
+            ->getObject(
+                'Magento\Widget\Model\Template\Filter',
+                ['storeManager' => $storeManagerMock]
+            );
+        $result = $filter->mediaDirective($construction);
+        $this->assertEquals($baseUrl . $image, $result);
+    }
+}
\ No newline at end of file

From 7573b3a6ad4dabc0b705f084af1cb2aa2377294f Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Tue, 3 Feb 2015 18:43:24 +0200
Subject: [PATCH 66/94] MAGETWO-32989: Image isn't displayed in CMS page on
 Frontend if webserver rewrites = no

---
 .../testsuite/Magento/Widget/Model/Template/FilterTest.php      | 2 +-
 .../unit/testsuite/Magento/Widget/Model/Template/FilterTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php
index 1cf1458f2dcae..e777b48a76c57 100755
--- a/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php
+++ b/dev/tests/integration/testsuite/Magento/Widget/Model/Template/FilterTest.php
@@ -20,4 +20,4 @@ public function testMediaDirective()
         $result = $filter->mediaDirective($construction);
         $this->assertEquals($baseUrl . $image, $result);
     }
-}
\ No newline at end of file
+}
diff --git a/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php b/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php
index 0b4c7fb55d66e..eb074b7b097c0 100755
--- a/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php
@@ -33,4 +33,4 @@ public function testMediaDirective()
         $result = $filter->mediaDirective($construction);
         $this->assertEquals($baseUrl . $image, $result);
     }
-}
\ No newline at end of file
+}

From 946d85d916d07e5217d90f6cdf849896697ddd1e Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Wed, 4 Feb 2015 12:13:00 +0200
Subject: [PATCH 67/94] MAGETWO-15418: Sold products aren't displayed in
 Bestsellers

- Moved selectors to separate properties in Ordered class;
---
 .../Block/Dashboard/Tab/Products/Ordered.php  | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
index cc8ae67fde0ef..1d505680a261c 100644
--- a/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
+++ b/dev/tests/functional/tests/app/Magento/Backend/Test/Block/Dashboard/Tab/Products/Ordered.php
@@ -15,6 +15,20 @@
  */
 class Ordered extends Grid
 {
+    /**
+     * Base part of row locator template
+     *
+     * @var string
+     */
+    protected $location = '//table[@id="productsOrderedGrid_table"]/tbody/tr';
+
+    /**
+     * Secondary part of row locator template
+     *
+     * @var string
+     */
+    protected $rowTemplate = 'td[contains(., "%s")]';
+
     /**
      * Check if ordered product is in grid
      *
@@ -23,8 +37,6 @@ class Ordered extends Grid
      */
     public function isProductVisible(CatalogProductSimple $product)
     {
-        $location = '//table[@id="productsOrderedGrid_table"]/tbody/tr[';
-        $rowTemplate = 'td[contains(., "%s")]';
         $filter = [
             $product->getName(),
             $product->getPrice(),
@@ -32,10 +44,10 @@ public function isProductVisible(CatalogProductSimple $product)
         ];
         $rows = [];
         foreach ($filter as $value) {
-            $rows[] = sprintf($rowTemplate, $value);
+            $rows[] = sprintf($this->rowTemplate, $value);
         }
-        $location = $location . implode(' and ', $rows) . ']';
+        $location = $this->location . '[' . implode(' and ', $rows) . ']';
 
-        return $this->_rootElement->find($location, Locator::SELECTOR_XPATH)->isVisible() ? true : false;
+        return $this->_rootElement->find($location, Locator::SELECTOR_XPATH)->isVisible();
     }
 }

From d7d4eb4b3946963b87cd1d5d1650cf6d8148a02f Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Wed, 4 Feb 2015 14:49:20 +0200
Subject: [PATCH 68/94] MAGETWO-33063: Replace usage of __() to Phrase object
 in library

---
 .../Magento/Framework/DB/Adapter/Pdo/Mysql.php        |  4 ++--
 .../Magento/Framework/Data/AbstractCriteria.php       | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
index d9303282bcb0e..c8de592f1e52f 100644
--- a/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
+++ b/lib/internal/Magento/Framework/DB/Adapter/Pdo/Mysql.php
@@ -3721,8 +3721,8 @@ public function createTrigger(\Magento\Framework\DB\Ddl\Trigger $trigger)
     {
         if (!$trigger->getStatements()) {
             throw new \Zend_Db_Exception(
-                sprintf(
-                    (string)new \Magento\Framework\Phrase('Trigger %s has not statements available'),
+                (string)new \Magento\Framework\Phrase(
+                    'Trigger %1 has not statements available',
                     [$trigger->getName()]
                 )
             );
diff --git a/lib/internal/Magento/Framework/Data/AbstractCriteria.php b/lib/internal/Magento/Framework/Data/AbstractCriteria.php
index 40738c95da066..ced168d20efcf 100644
--- a/lib/internal/Magento/Framework/Data/AbstractCriteria.php
+++ b/lib/internal/Magento/Framework/Data/AbstractCriteria.php
@@ -37,8 +37,10 @@ public function getMapperInterfaceName()
     {
         if (!$this->mapperInterfaceName) {
             throw new \Exception(
-                (string)new \Magento\Framework\Phrase("Missed Mapper Interface for Criteria Interface: ")
-                . get_class($this)
+                (string)new \Magento\Framework\Phrase(
+                    'Missed Mapper Interface for Criteria Interface: %1',
+                    [get_class($this)]
+                )
             );
         }
         return $this->mapperInterfaceName;
@@ -115,7 +117,10 @@ public function addFilter($name, $field, $condition = null, $type = 'and')
     {
         if (isset($this->data[self::PART_FILTERS]['list'][$name])) {
             throw new \Exception(
-                (string)new \Magento\Framework\Phrase("Filter already exists in Criteria object: ") . $name
+                (string)new \Magento\Framework\Phrase(
+                    'Filter already exists in Criteria object: %1',
+                    [$name]
+                )
             );
         }
         $filter = new Object();

From 468c0b4cc567ad7c2deccd3c9f04e1dfd308d10b Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Wed, 4 Feb 2015 15:16:48 +0200
Subject: [PATCH 69/94] MAGETWO-33058: Refactor Checkout module

---
 .../Checkout/Controller/Cart/Configure.php    | 41 ++++++++++++++++++-
 .../Checkout/Controller/Cart/EstimatePost.php | 40 +++++++++++++++++-
 2 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Checkout/Controller/Cart/Configure.php b/app/code/Magento/Checkout/Controller/Cart/Configure.php
index 236e10afc0c1f..7aa783af5930a 100644
--- a/app/code/Magento/Checkout/Controller/Cart/Configure.php
+++ b/app/code/Magento/Checkout/Controller/Cart/Configure.php
@@ -6,8 +6,47 @@
  */
 namespace Magento\Checkout\Controller\Cart;
 
-class Configure extends \Magento\Checkout\Controller\Cart\Index
+use Magento\Framework;
+
+class Configure extends \Magento\Checkout\Controller\Cart
 {
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory
+     */
+    protected $resultPageFactory;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param \Magento\Checkout\Model\Cart $cart
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     */
+    public function __construct(
+        Framework\App\Action\Context $context,
+        Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        \Magento\Checkout\Model\Cart $cart,
+        Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
+        Framework\View\Result\PageFactory $resultPageFactory
+    ) {
+        parent::__construct(
+            $context,
+            $scopeConfig,
+            $checkoutSession,
+            $storeManager,
+            $formKeyValidator,
+            $cart,
+            $resultRedirectFactory
+        );
+        $this->resultPageFactory = $resultPageFactory;
+    }
+
     /**
      * Action to reconfigure cart item
      *
diff --git a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
index bef1ca351bb67..4ef98861c9488 100644
--- a/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/EstimatePost.php
@@ -5,10 +5,48 @@
  */
 namespace Magento\Checkout\Controller\Cart;
 
+use Magento\Framework;
 use Magento\Checkout\Model\Cart as CustomerCart;
 
-class EstimatePost extends \Magento\Checkout\Controller\Cart\CouponPost
+class EstimatePost extends \Magento\Checkout\Controller\Cart
 {
+    /**
+     * @var \Magento\Quote\Model\QuoteRepository
+     */
+    protected $quoteRepository;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
+     * @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
+     * @param CustomerCart $cart
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+     * @param \Magento\Quote\Model\QuoteRepository $quoteRepository
+     */
+    public function __construct(
+        Framework\App\Action\Context $context,
+        Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        Framework\Store\StoreManagerInterface $storeManager,
+        \Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
+        CustomerCart $cart,
+        Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
+        \Magento\Quote\Model\QuoteRepository $quoteRepository
+    ) {
+        $this->quoteRepository = $quoteRepository;
+        parent::__construct(
+            $context,
+            $scopeConfig,
+            $checkoutSession,
+            $storeManager,
+            $formKeyValidator,
+            $cart,
+            $resultRedirectFactory
+        );
+    }
+
     /**
      * Initialize shipping information
      *

From 7f3face079463c402c1133ea7e68eed6bdc0c3a3 Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Wed, 4 Feb 2015 15:44:05 +0200
Subject: [PATCH 70/94] MAGETWO-32989: Image isn't displayed in CMS page on
 Frontend if webserver rewrites = no

---
 app/code/Magento/Widget/Model/Template/Filter.php              | 3 ++-
 .../testsuite/Magento/Widget/Model/Template/FilterTest.php     | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index 713868ac60bb4..bed1b280efc24 100755
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -119,7 +119,8 @@ public function widgetDirective($construction)
      */
     public function mediaDirective($construction)
     {
-        $params = $this->_getIncludeParameters($construction[2]);
+        $value = isset($construction[2]) ? $construction[2] : '';
+        $params = $this->_getIncludeParameters($value);
         return $this->_storeManager->getStore()
             ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
     }
diff --git a/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php b/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php
index eb074b7b097c0..142c9bed0d36e 100755
--- a/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php
+++ b/dev/tests/unit/testsuite/Magento/Widget/Model/Template/FilterTest.php
@@ -18,7 +18,7 @@ public function testMediaDirective()
         /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject $storeMock */
         $storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false);
         $storeMock->expects($this->once())->method('getBaseUrl')->with(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA)
-            ->will($this->returnValue($baseUrl));
+            ->willReturn($baseUrl);
 
         /** @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject $storeManagerMock */
         $storeManagerMock = $this->getMock('Magento\Framework\Store\StoreManagerInterface', [], [], '', false);

From 4a1089fee82f2fc4712b8ad0c67e81cc638ea8de Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Wed, 4 Feb 2015 15:58:52 +0200
Subject: [PATCH 71/94] MAGETWO-15418: Sold products aren't displayed in
 Bestsellers

- Variable $aliases deleted;
---
 .../Magento/Reports/Controller/Adminhtml/Report/Statistics.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
index cfb52a444d5ae..ff2f27decbf31 100644
--- a/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
+++ b/app/code/Magento/Reports/Controller/Adminhtml/Report/Statistics.php
@@ -90,10 +90,9 @@ protected function _getCollectionNames()
             $codes = explode(',', $codes);
         }
 
-        $aliases = $this->reportTypes;
         $out = [];
         foreach ($codes as $code) {
-            $out[] = $aliases[$code];
+            $out[] = $this->reportTypes[$code];
         }
         return $out;
     }

From 1bb6cf5c51931102e0e6f93a27b44a8f43e3b20b Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Wed, 4 Feb 2015 16:16:46 +0200
Subject: [PATCH 72/94] MAGETWO-33059: Refactor CMS module

---
 .../Cms/Controller/Adminhtml/Block.php        | 23 +------------------
 .../Cms/Controller/Adminhtml/Block/Edit.php   |  2 +-
 .../Cms/Controller/Adminhtml/Block/Index.php  |  2 +-
 .../Cms/Controller/Index/DefaultNoCookies.php | 20 ++++++++--------
 .../Adminhtml/Wysiwyg/DirectiveTest.php       |  4 ++--
 .../Cms/Controller/Noroute/IndexTest.php      |  4 ++--
 6 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block.php b/app/code/Magento/Cms/Controller/Adminhtml/Block.php
index 47c29e0c7af43..ef36e67ec6f0f 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block.php
@@ -35,7 +35,7 @@ public function __construct(\Magento\Backend\App\Action\Context $context, \Magen
      * @param \Magento\Backend\Model\View\Result\Page $resultPage
      * @return \Magento\Backend\Model\View\Result\Page
      */
-    protected function _initPage($resultPage)
+    protected function initPage($resultPage)
     {
         $resultPage->setActiveMenu(
             'Magento_Cms::cms_block'
@@ -49,27 +49,6 @@ protected function _initPage($resultPage)
         return $resultPage;
     }
 
-    /**
-     * Init actions
-     *
-     * @return $this
-     */
-    protected function _initAction()
-    {
-        // load layout, set active menu and breadcrumbs
-        $this->_view->loadLayout();
-        $this->_setActiveMenu(
-            'Magento_Cms::cms_block'
-        )->_addBreadcrumb(
-            __('CMS'),
-            __('CMS')
-        )->_addBreadcrumb(
-            __('Static Blocks'),
-            __('Static Blocks')
-        );
-        return $this;
-    }
-
     /**
      * Check the permission to run it
      *
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
index e198db27e1700..d042bb4fc351e 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php
@@ -70,7 +70,7 @@ public function execute()
         $resultPage = $this->resultPageFactory->create();
 
         // 5. Build edit form
-        $this->_initPage($resultPage)->addBreadcrumb(
+        $this->initPage($resultPage)->addBreadcrumb(
             $id ? __('Edit Block') : __('New Block'),
             $id ? __('Edit Block') : __('New Block')
         );
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
index 9a68f03df08b3..b81e879b9171f 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php
@@ -36,7 +36,7 @@ public function execute()
     {
         /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
-        $this->_initPage($resultPage)->getConfig()->getTitle()->prepend(__('Blocks'));
+        $this->initPage($resultPage)->getConfig()->getTitle()->prepend(__('Blocks'));
         return $resultPage;
     }
 }
diff --git a/app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php b/app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php
index 87212dd161690..3345a5c8ce0c8 100644
--- a/app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php
+++ b/app/code/Magento/Cms/Controller/Index/DefaultNoCookies.php
@@ -9,19 +9,19 @@
 class DefaultNoCookies extends \Magento\Framework\App\Action\Action
 {
     /**
-     * @var \Magento\Framework\View\Result\LayoutFactory
+     * @var \Magento\Framework\View\Result\PageFactory
      */
-    protected $resultLayoutFactory;
+    protected $resultPageFactory;
 
     /**
-     * @param \Magento\Backend\App\Action\Context $context
-     * @param \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      */
     public function __construct(
-        \Magento\Backend\App\Action\Context $context,
-        \Magento\Framework\View\Result\LayoutFactory $resultLayoutFactory
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Framework\View\Result\PageFactory $resultPageFactory
     ) {
-        $this->resultLayoutFactory = $resultLayoutFactory;
+        $this->resultPageFactory = $resultPageFactory;
         parent::__construct($context);
     }
 
@@ -29,11 +29,11 @@ public function __construct(
      * Default no cookies page action
      * Used if no cookies page don't configure or available
      *
-     * @return \Magento\Framework\View\Result\LayoutFactory
+     * @return \Magento\Framework\View\Result\PageFactory
      */
     public function execute()
     {
-        $resultLayout = $this->resultLayoutFactory->create();
-        return $resultLayout;
+        $resultPage = $this->resultPageFactory->create();
+        return $resultPage;
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
index 9fd60466969ed..bacb4471cf2ee 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
@@ -186,7 +186,7 @@ public function testExecute()
             ->method('create')
             ->willReturn($this->rawMock);
 
-        $this->wysiwygDirective->execute();
+        $this->assertSame($this->rawMock, $this->wysiwygDirective->execute());
     }
 
     /**
@@ -231,7 +231,7 @@ public function testExecuteException()
             ->method('create')
             ->willReturn($this->rawMock);
 
-        $this->wysiwygDirective->execute();
+        $this->assertSame($this->rawMock, $this->wysiwygDirective->execute());
     }
 
     protected function prepareExecuteTest()
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
index 1166acad0202d..474a49ffa5446 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
@@ -62,7 +62,7 @@ protected function setUp()
         $valueMap = [
             [
                 'Magento\Framework\App\Config\ScopeConfigInterface',
-                \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+                \Magento\Framework\Store\ScopeInterface::SCOPE_STORE,
                 $scopeConfigMock,
             ],
             ['Magento\Cms\Helper\Page', $this->_cmsHelperMock],
@@ -114,7 +114,7 @@ public function testExecuteResultPage()
         )->will(
             $this->returnValue($this->resultPageMock)
         );
-        $this->assertInstanceOf('Magento\Framework\View\Result\Page', $this->_controller->execute());
+        $this->assertSame($this->resultPageMock, $this->_controller->execute());
     }
 
     public function testExecuteResultForward()

From 98ad2208a48c48cd5365e3f345c64e25f5e9b6a5 Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Wed, 4 Feb 2015 17:26:57 +0200
Subject: [PATCH 73/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Helper/Page.php                   |  9 ---------
 .../Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php | 10 ++++++++--
 .../Magento/Cms/Controller/Noroute/IndexTest.php       | 10 ++++++++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index 87e53cd8c8a59..a6a41020248e1 100755
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/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);
     }
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
index bacb4471cf2ee..322d671dce6b8 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/Adminhtml/Wysiwyg/DirectiveTest.php
+++ b/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()
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
index 474a49ffa5446..4ce82499ab21c 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
+++ b/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()
+        );
     }
 }

From eda544b20c6826b39da88adc7a0a812aa5e4e56c Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Wed, 4 Feb 2015 17:29:16 +0200
Subject: [PATCH 74/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Helper/Page.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index a6a41020248e1..1807929d5345e 100755
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -160,7 +160,7 @@ public function prepareResultPage(Action $action, $pageId = null)
         }
         /** @var \Magento\Framework\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
-        $this->_setLayoutType($inRange, $resultPage);
+        $this->setLayoutType($inRange, $resultPage);
         $resultPage->initLayout();
         $resultPage->addHandle('cms_page_view');
         $resultPage->addPageLayoutHandles(['id' => $this->_page->getIdentifier()]);
@@ -246,7 +246,7 @@ protected function _renderPage(Action $action, $pageId = null, $renderLayout = t
         }
         /** @var \Magento\Framework\View\Result\Page $resultPage */
         $resultPage = $this->_view->getPage();
-        $this->_setLayoutType($inRange, $resultPage);
+        $this->setLayoutType($inRange, $resultPage);
         $resultPage->initLayout();
         $resultPage->addHandle('cms_page_view');
         $resultPage->addPageLayoutHandles(['id' => $this->_page->getIdentifier()]);
@@ -329,7 +329,7 @@ public function getPageUrl($pageId = null)
      * @param \Magento\Framework\View\Result\Page $resultPage
      * @return \Magento\Framework\View\Result\Page
      */
-    protected function _setLayoutType($inRange, $resultPage)
+    protected function setLayoutType($inRange, $resultPage)
     {
         if ($this->_page->getPageLayout()) {
             if ($this->_page->getCustomPageLayout()

From a124b17ead48e404a5808353337ba044e3a87954 Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Wed, 4 Feb 2015 17:40:59 +0200
Subject: [PATCH 75/94] MAGETWO-33064: Implement obsolete test for refactored
 controllers

---
 .../Test/Legacy/ObsoleteResponseTest.php      | 64 +++++++++++++++++++
 .../_files/obsolete_response_methods.php      | 22 +++++++
 .../whitelist/refactored_controllers.php      | 17 +++++
 3 files changed, 103 insertions(+)
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Legacy/_files/whitelist/refactored_controllers.php

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
new file mode 100644
index 0000000000000..24721ed84ba95
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Temporary test that will be removed in scope of MAGETWO-28356.
+ * Test verifies obsolete usages in controllers that were refactored to work with ResultInterface.
+ */
+namespace Magento\Test\Legacy;
+
+class ObsoleteResponseTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var array
+     */
+    protected $obsoleteMethods = [];
+
+    protected function setUp()
+    {
+        $this->obsoleteMethods = include __DIR__ . '/_files/obsolete_response_methods.php';
+    }
+
+    /**
+     * Test verify that obsolete methods do not appear in refactored folders
+     */
+    public function testControllersMethods()
+    {
+        $invoker = new \Magento\Framework\Test\Utility\AggregateInvoker($this);
+        $invoker(
+            function ($file) {
+                $content = file_get_contents($file);
+                foreach ($this->obsoleteMethods as $method) {
+                    $this->assertSame(
+                        0,
+                        preg_match('/(?<=[a-z\d_:]|->|function\s)' . $method . '\s*\(/iS', $content),
+                        "Controller: $file\nContains obsolete method: $method . "
+                    );
+                }
+            },
+            $this->controllersFilesDataProvider()
+        );
+    }
+
+    /**
+     * Return controllers files list
+     *
+     * @return array
+     */
+    public function controllersFilesDataProvider()
+    {
+        $result = [];
+        $appPath = \Magento\Framework\Test\Utility\Files::init()->getPathToSource();
+        $refactoredControllers = include __DIR__ . '/_files/whitelist/refactored_controllers.php';
+        foreach ($refactoredControllers as $refactoredFolder) {
+            $files = \Magento\Framework\Test\Utility\Files::init()->getFiles([$appPath . $refactoredFolder], '*.php');
+            $result = array_merge($result, $files);
+        }
+
+        return \Magento\Framework\Test\Utility\Files::composeDataSets($result);
+    }
+}
+
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php
new file mode 100644
index 0000000000000..8102968e13d82
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Temporary implementation that will be removed in scope of MAGETWO-28356.
+ *
+ * Obsolete methods for controllers
+ */
+return [
+    'loadLayout',
+    'renderLayout',
+    '_redirect',
+    '_setActiveMenu',
+    '_addBreadcrumb',
+    '_addContent',
+    '_addLeft',
+    '_addJs',
+    '_moveBlockToContainer',
+];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/whitelist/refactored_controllers.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/whitelist/refactored_controllers.php
new file mode 100644
index 0000000000000..f5e0a31ef823c
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/whitelist/refactored_controllers.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Temporary implementation that will be removed in scope of MAGETWO-28356.
+ *
+ * Controllers that were refactored and use ResultInterface
+ */
+return [
+    '\app\code\Magento\Catalog\Controller',
+    '\app\code\Magento\Backend\Controller',
+    '\app\code\Magento\Sales\Controller',
+    '\app\code\Magento\Customer\Controller',
+];

From 9dc95cd8dba5b7622eef872296dcd49bc9074aad Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Wed, 4 Feb 2015 18:01:00 +0200
Subject: [PATCH 76/94] MAGETWO-33064: Implement obsolete test for refactored
 controllers

---
 .../testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
index 24721ed84ba95..623450282cb33 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
@@ -61,4 +61,3 @@ public function controllersFilesDataProvider()
         return \Magento\Framework\Test\Utility\Files::composeDataSets($result);
     }
 }
-

From 57a9d7e4f4863cf61348dffe82abc2c62ca442e1 Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Wed, 4 Feb 2015 18:33:14 +0200
Subject: [PATCH 77/94] MAGETWO-33064: Implement obsolete test for refactored
 controllers

---
 .../Legacy/_files/whitelist/refactored_controllers.php    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/whitelist/refactored_controllers.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/whitelist/refactored_controllers.php
index f5e0a31ef823c..e75568b7125f0 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/whitelist/refactored_controllers.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/whitelist/refactored_controllers.php
@@ -10,8 +10,8 @@
  * Controllers that were refactored and use ResultInterface
  */
 return [
-    '\app\code\Magento\Catalog\Controller',
-    '\app\code\Magento\Backend\Controller',
-    '\app\code\Magento\Sales\Controller',
-    '\app\code\Magento\Customer\Controller',
+    '/app/code/Magento/Catalog/Controller',
+    '/app/code/Magento/Backend/Controller',
+    '/app/code/Magento/Sales/Controller',
+    '/app/code/Magento/Customer/Controller',
 ];

From e477f50fe7daebaae853ab3dfb1425192d08d5c3 Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Wed, 4 Feb 2015 19:12:53 +0200
Subject: [PATCH 78/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Controller/Adminhtml/Block.php  | 12 +++---------
 .../Magento/Cms/Controller/Index/DefaultNoRoute.php  |  3 ---
 app/code/Magento/Cms/Controller/Index/NoCookies.php  |  7 +++----
 app/code/Magento/Cms/Controller/Noroute/Index.php    |  6 +++---
 app/code/Magento/Cms/Controller/Page/View.php        |  6 +++---
 app/code/Magento/Cms/Helper/Page.php                 |  1 -
 6 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block.php b/app/code/Magento/Cms/Controller/Adminhtml/Block.php
index ef36e67ec6f0f..d14bd9e73dbf3 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Block.php
+++ b/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;
     }
 
diff --git a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php b/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
index e68f6f8c00e00..48375885c9842 100755
--- a/app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php
+++ b/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.
  */
diff --git a/app/code/Magento/Cms/Controller/Index/NoCookies.php b/app/code/Magento/Cms/Controller/Index/NoCookies.php
index d1030c46923d5..794803ffa6a09 100755
--- a/app/code/Magento/Cms/Controller/Index/NoCookies.php
+++ b/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);
diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php
index 5661e8ebad342..5cc59f729d54e 100755
--- a/app/code/Magento/Cms/Controller/Noroute/Index.php
+++ b/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);
diff --git a/app/code/Magento/Cms/Controller/Page/View.php b/app/code/Magento/Cms/Controller/Page/View.php
index fcab11addfc5d..4775fc3fe9358 100755
--- a/app/code/Magento/Cms/Controller/Page/View.php
+++ b/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);
diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index 1807929d5345e..e64a551714ab4 100755
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/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()]);
 

From e980f1c2fb3452c3244a433c52ee0ab1a44ac1ad Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Thu, 5 Feb 2015 12:36:19 +0200
Subject: [PATCH 79/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Controller/Noroute/Index.php         | 2 +-
 .../Magento/Cms/Controller/Noroute/IndexTest.php          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Noroute/Index.php b/app/code/Magento/Cms/Controller/Noroute/Index.php
index 5cc59f729d54e..ebd61e73ac136 100755
--- a/app/code/Magento/Cms/Controller/Noroute/Index.php
+++ b/app/code/Magento/Cms/Controller/Noroute/Index.php
@@ -47,7 +47,7 @@ public function execute()
             $resultPage->setHeader('Status', '404 File not found');
             return $resultPage;
         } else {
-            /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */
+            /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
             $resultForward = $this->resultForwardFactory->create();
             $resultForward->setController('index');
             $resultForward->forward('defaultNoRoute');
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
index 4ce82499ab21c..b53938a303da0 100644
--- a/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Controller/Noroute/IndexTest.php
@@ -23,12 +23,12 @@ class IndexTest extends \PHPUnit_Framework_TestCase
     protected $_requestMock;
 
     /**
-     * @var \Magento\Backend\Model\View\Result\ForwardFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Controller\Result\ForwardFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $forwardFactoryMock;
 
     /**
-     * @var \Magento\Backend\Model\View\Result\Forward|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Framework\Controller\Result\Forward|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $forwardMock;
 
@@ -45,11 +45,11 @@ protected function setUp()
         $this->resultPageMock = $this->getMockBuilder('\Magento\Framework\View\Result\Page')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->forwardFactoryMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\ForwardFactory')
+        $this->forwardFactoryMock = $this->getMockBuilder('\Magento\Framework\Controller\Result\ForwardFactory')
             ->setMethods(['create'])
             ->disableOriginalConstructor()
             ->getMock();
-        $this->forwardMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\Forward')
+        $this->forwardMock = $this->getMockBuilder('Magento\Framework\Controller\Result\Forward')
             ->disableOriginalConstructor()
             ->getMock();
         $this->forwardFactoryMock->expects($this->any())

From 6540495171ef823efba15993b6aabfc5737ab358 Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Thu, 5 Feb 2015 13:21:57 +0200
Subject: [PATCH 80/94] MAGETWO-33063: Replace usage of __() to Phrase object
 in library

---
 .../Magento/Test/Legacy/ObsoleteCodeTest.php  | 22 +++++++++++++++++++
 .../App/Response/Http/FileFactory.php         |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
index dcb1b59726ce2..1e67f12e1fed1 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
@@ -10,6 +10,8 @@
  */
 namespace Magento\Test\Legacy;
 
+use Magento\Framework\Test\Utility\Files;
+
 class ObsoleteCodeTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -129,6 +131,7 @@ function ($file) {
                 $this->_testObsoleteActions($content);
                 $this->_testObsoleteConstants($content);
                 $this->_testObsoletePropertySkipCalculate($content);
+                $this->checkLibraryDependence($content, $file);
             },
             \Magento\TestFramework\Utility\ChangedFiles::getPhpFiles(__DIR__ . '/_files/changed_files*')
         );
@@ -491,6 +494,25 @@ protected function _testObsoletePropertySkipCalculate($content)
         );
     }
 
+    /**
+     * Checks that library is not using app defined code
+     *
+     * @param string $content
+     * @param string $file
+     */
+    protected function checkLibraryDependence($content, $file)
+    {
+        $path = Files::init()->getPathToSource();
+        if (strpos($file, $path . '/lib/') === 0) {
+            $this->_assertNotRegexp(
+                '~(?<![a-z\\d_:]|->|function\\s)__\\s*\\(~iS',
+                $content,
+                'Function __() is defined outside of the library and must not be used there. ' .
+                'Replacement suggestion: new \\Magento\\Framework\\Phrase()'
+            );
+        }
+    }
+
     /**
      * Analyze contents to determine whether this is declaration of specified class/interface
      *
diff --git a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
index bfe5cf299d5c3..1c996157d5337 100644
--- a/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
+++ b/lib/internal/Magento/Framework/App/Response/Http/FileFactory.php
@@ -67,7 +67,7 @@ public function create(
                 $isFile = true;
                 $file = $content['value'];
                 if (!$dir->isFile($file)) {
-                    throw new \Exception(__('File not found'));
+                    throw new \Exception((string)new \Magento\Framework\Phrase('File not found'));
                 }
                 $contentLength = $dir->stat($file)['size'];
             }

From 73a2234aac0b49745b3fe58938fa3c58ecb5a89f Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Thu, 5 Feb 2015 14:55:29 +0200
Subject: [PATCH 81/94] MAGETWO-33064: Implement obsolete test for refactored
 controllers

---
 .../Test/Legacy/ObsoleteResponseTest.php      | 77 +++++++++++++++++++
 .../_files/obsolete_response_methods.php      | 22 ++++++
 .../response_whitelist/refactored_modules.php | 17 ++++
 3 files changed, 116 insertions(+)
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Legacy/_files/response_whitelist/refactored_modules.php

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
new file mode 100644
index 0000000000000..d39fc0cbc8399
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Test\Legacy;
+
+/**
+ * Temporary test that will be removed in scope of MAGETWO-28356.
+ * Test verifies obsolete usages in modules that were refactored to work with ResultInterface.
+ */
+class ObsoleteResponseTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var array
+     */
+    protected $obsoleteMethods = [];
+
+    protected function setUp()
+    {
+        $this->obsoleteMethods = include __DIR__ . '/_files/obsolete_response_methods.php';
+    }
+
+    /**
+     * Test verify that obsolete methods do not appear in refactored folders
+     */
+    public function testObsoleteResponseMethods()
+    {
+        $invoker = new \Magento\Framework\Test\Utility\AggregateInvoker($this);
+        $invoker(
+            function ($file) {
+                $content = file_get_contents($file);
+                foreach ($this->obsoleteMethods as $method) {
+                    $this->assertSame(
+                        0,
+                        preg_match('/(?<=[a-z\d_:]|->|function\s)' . $method . '\s*\(/iS', $content),
+                        "File: $file\nContains obsolete method: $method . "
+                    );
+                }
+            },
+            $this->modulesFilesDataProvider()
+        );
+    }
+
+    /**
+     * Return refactored files
+     *
+     * @return array
+     */
+    public function modulesFilesDataProvider()
+    {
+        $result = [];
+        $appPath = \Magento\Framework\Test\Utility\Files::init()->getPathToSource();
+        $refactoredModules = $this->getRefactoredModules('refactored_modules*');
+        foreach ($refactoredModules as $refactoredFolder) {
+            $files = \Magento\Framework\Test\Utility\Files::init()->getFiles([$appPath . $refactoredFolder], '*.php');
+            $result = array_merge($result, $files);
+        }
+
+        return \Magento\Framework\Test\Utility\Files::composeDataSets($result);
+    }
+
+    /**
+     * @param string $filePattern
+     * @return array
+     */
+    protected function getRefactoredModules($filePattern)
+    {
+        $result = [];
+        foreach (glob(__DIR__ . '/_files/response_whitelist/' . $filePattern) as $file) {
+            $fileData = include $file;
+            $result = array_merge($result, $fileData);
+        }
+        return $result;
+    }
+}
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php
new file mode 100644
index 0000000000000..a3e7139765ffa
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Temporary implementation that will be removed in scope of MAGETWO-28356.
+ *
+ * Obsolete methods for refactored modules
+ */
+return [
+    'loadLayout',
+    'renderLayout',
+    '_redirect',
+    '_setActiveMenu',
+    '_addBreadcrumb',
+    '_addContent',
+    '_addLeft',
+    '_addJs',
+    '_moveBlockToContainer',
+];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response_whitelist/refactored_modules.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response_whitelist/refactored_modules.php
new file mode 100644
index 0000000000000..8605007ce7b9c
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response_whitelist/refactored_modules.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Temporary implementation that will be removed in scope of MAGETWO-28356.
+ *
+ * Modules that were refactored and use ResultInterface
+ */
+return [
+    '/app/code/Magento/Catalog',
+    '/app/code/Magento/Backend',
+    '/app/code/Magento/Sales',
+    '/app/code/Magento/Customer',
+];

From 18e1715b5b2fc30329ba58078f022b0496ab5669 Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Thu, 5 Feb 2015 17:00:31 +0200
Subject: [PATCH 82/94] MAGETWO-33064: Implement obsolete test for refactored
 controllers

---
 .../Test/Legacy/ObsoleteResponseTest.php      | 45 +++++++++++++++----
 .../_files/response/blacklist/files_list.php  | 14 ++++++
 .../obsolete_response_methods.php             |  1 +
 .../whitelist}/refactored_modules.php         |  0
 4 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/blacklist/files_list.php
 rename dev/tests/static/testsuite/Magento/Test/Legacy/_files/{ => response}/obsolete_response_methods.php (96%)
 rename dev/tests/static/testsuite/Magento/Test/Legacy/_files/{response_whitelist => response/whitelist}/refactored_modules.php (100%)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
index d39fc0cbc8399..936c2e51e65ba 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
@@ -17,9 +17,21 @@ class ObsoleteResponseTest extends \PHPUnit_Framework_TestCase
      */
     protected $obsoleteMethods = [];
 
+    /**
+     * @var array
+     */
+    protected $filesBlackList = [];
+
+    /**
+     * @var string
+     */
+    protected $appPath;
+
     protected function setUp()
     {
-        $this->obsoleteMethods = include __DIR__ . '/_files/obsolete_response_methods.php';
+        $this->appPath = \Magento\Framework\Test\Utility\Files::init()->getPathToSource();
+        $this->obsoleteMethods = include __DIR__ . '/_files/response/obsolete_response_methods.php';
+        $this->filesBlackList = $this->getBlackList();
     }
 
     /**
@@ -50,25 +62,40 @@ function ($file) {
      */
     public function modulesFilesDataProvider()
     {
-        $result = [];
-        $appPath = \Magento\Framework\Test\Utility\Files::init()->getPathToSource();
-        $refactoredModules = $this->getRefactoredModules('refactored_modules*');
-        foreach ($refactoredModules as $refactoredFolder) {
-            $files = \Magento\Framework\Test\Utility\Files::init()->getFiles([$appPath . $refactoredFolder], '*.php');
-            $result = array_merge($result, $files);
+        $filesList = [];
+
+        foreach ($this->getFilesData('whitelist/refactored_modules*') as $refactoredFolder) {
+            $files = \Magento\Framework\Test\Utility\Files::init()->getFiles(
+                [$this->appPath . $refactoredFolder], '*.php'
+            );
+            $filesList = array_merge($filesList, $files);
         }
 
+        $result = array_map('realpath', $filesList);
+        $result = array_diff($result, $this->filesBlackList);
         return \Magento\Framework\Test\Utility\Files::composeDataSets($result);
     }
 
+    /**
+     * @return array
+     */
+    protected function getBlackList()
+    {
+        $blackListFiles = [];
+        foreach ($this->getFilesData('blacklist/files_list*') as $file) {
+            $blackListFiles[] = realpath($this->appPath . $file);
+        }
+        return $blackListFiles;
+    }
+
     /**
      * @param string $filePattern
      * @return array
      */
-    protected function getRefactoredModules($filePattern)
+    protected function getFilesData($filePattern)
     {
         $result = [];
-        foreach (glob(__DIR__ . '/_files/response_whitelist/' . $filePattern) as $file) {
+        foreach (glob(__DIR__ . '/_files/response/' . $filePattern) as $file) {
             $fileData = include $file;
             $result = array_merge($result, $fileData);
         }
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/blacklist/files_list.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/blacklist/files_list.php
new file mode 100644
index 0000000000000..7f3dfbd8b00f3
--- /dev/null
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/blacklist/files_list.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+/**
+ * Temporary implementation that will be removed in scope of MAGETWO-28356.
+ *
+ * Files that temporary excluded from results
+ */
+return [
+    '/app/code/Magento/Backend/Model/View.php',
+];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/obsolete_response_methods.php
similarity index 96%
rename from dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php
rename to dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/obsolete_response_methods.php
index a3e7139765ffa..c3af8f0806516 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_response_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/obsolete_response_methods.php
@@ -13,6 +13,7 @@
     'loadLayout',
     'renderLayout',
     '_redirect',
+    '_forward',
     '_setActiveMenu',
     '_addBreadcrumb',
     '_addContent',
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response_whitelist/refactored_modules.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/whitelist/refactored_modules.php
similarity index 100%
rename from dev/tests/static/testsuite/Magento/Test/Legacy/_files/response_whitelist/refactored_modules.php
rename to dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/whitelist/refactored_modules.php

From fb2c43415a996b708f6a107416ec9fcb300c8f79 Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Thu, 5 Feb 2015 17:39:42 +0200
Subject: [PATCH 83/94] MAGETWO-33061: Fix annotations of the methods that
 return __()

---
 app/code/Magento/Catalog/Model/Layer/Filter/Price.php           | 2 +-
 app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php    | 2 +-
 app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php     | 2 +-
 .../Downloadable/Block/Customer/Products/ListProducts.php       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
index b3a73d8f15157..a18190e0a2f9a 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price.php
@@ -227,7 +227,7 @@ public function getClearLinkText()
      *
      * @param float|string $fromPrice
      * @param float|string $toPrice
-     * @return \Magento\Framework\Phrase
+     * @return float|\Magento\Framework\Phrase
      */
     protected function _renderRangeLabel($fromPrice, $toPrice)
     {
diff --git a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
index 5fc945082e044..35e15b20a9a1e 100644
--- a/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
+++ b/app/code/Magento/Catalog/Model/Layer/Filter/Price/Render.php
@@ -49,7 +49,7 @@ public function __construct(
      *
      * @param float|string $fromPrice
      * @param float|string $toPrice
-     * @return \Magento\Framework\Phrase
+     * @return float|\Magento\Framework\Phrase
      */
     public function renderRangeLabel($fromPrice, $toPrice)
     {
diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
index e1aaeb17ce9e3..413c616222b45 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -171,7 +171,7 @@ public function getCurrencyRate()
      *
      * @param float|string $fromPrice
      * @param float|string $toPrice
-     * @return \Magento\Framework\Phrase|string
+     * @return float|\Magento\Framework\Phrase|string
      */
     protected function _renderRangeLabel($fromPrice, $toPrice)
     {
diff --git a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
index ae599df147dd9..b485eb81b0a6b 100644
--- a/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
+++ b/app/code/Magento/Downloadable/Block/Customer/Products/ListProducts.php
@@ -136,7 +136,7 @@ public function getBackUrl()
      * Return number of left downloads or unlimited
      *
      * @param Item $item
-     * @return \Magento\Framework\Phrase|string
+     * @return \Magento\Framework\Phrase|int
      */
     public function getRemainingDownloads($item)
     {

From c56c9e92cd0ee69907791417334b464aee50517c Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Thu, 5 Feb 2015 18:12:47 +0200
Subject: [PATCH 84/94] MAGETWO-33061: Fix annotations of the methods that
 return __()

---
 app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
index 413c616222b45..80974819bad6d 100644
--- a/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
+++ b/app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php
@@ -171,7 +171,7 @@ public function getCurrencyRate()
      *
      * @param float|string $fromPrice
      * @param float|string $toPrice
-     * @return float|\Magento\Framework\Phrase|string
+     * @return float|\Magento\Framework\Phrase
      */
     protected function _renderRangeLabel($fromPrice, $toPrice)
     {

From a44395a63dfd3ac46ff73bcbca4cf0c339034ac2 Mon Sep 17 00:00:00 2001
From: Yurii Torbyk <itorbyk@ebay.com>
Date: Thu, 5 Feb 2015 18:19:00 +0200
Subject: [PATCH 85/94] MAGETWO-33064: Implement obsolete test for refactored
 controllers

---
 .../Adminhtml/System/Store/DeleteStore.php    |  1 -
 .../Catalog/Controller/Category/View.php      | 25 +++++++++++++++----
 .../_files/response/blacklist/files_list.php  |  4 +++
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
index d7e2b7d677fe6..65b4ec34cccfb 100644
--- a/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
+++ b/app/code/Magento/Backend/Controller/Adminhtml/System/Store/DeleteStore.php
@@ -16,7 +16,6 @@ public function execute()
         $itemId = $this->getRequest()->getParam('item_id', null);
         if (!($model = $this->_objectManager->create('Magento\Store\Model\Store')->load($itemId))) {
             $this->messageManager->addError(__('Unable to proceed. Please, try again.'));
-            $this->_redirect('adminhtml/*/');
             /** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
             $redirectResult = $this->resultRedirectFactory->create();
             return $redirectResult->setPath('adminhtml/*/');
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index 79be48c730c5c..bc4eaa1e538b6 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -52,6 +52,16 @@ class View extends \Magento\Framework\App\Action\Action
      */
     protected $resultPageFactory;
 
+    /**
+     * @var \Magento\Framework\Controller\Result\ForwardFactory
+     */
+    protected $resultForwardFactory;
+
+    /**
+     * @var \Magento\Framework\Controller\Result\RedirectFactory
+     */
+    protected $resultRedirectFactory;
+
     /**
      * Catalog Layer Resolver
      *
@@ -73,8 +83,10 @@ class View extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\Registry $coreRegistry
      * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
      * @param \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator
-     * @param Resolver $layerResolver
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
+     * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
+     * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
+     * @param Resolver $layerResolver
      * @param CategoryRepositoryInterface $categoryRepository
      */
     public function __construct(
@@ -85,6 +97,8 @@ public function __construct(
         \Magento\Framework\Store\StoreManagerInterface $storeManager,
         \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator $categoryUrlPathGenerator,
         PageFactory $resultPageFactory,
+        \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory,
+        \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
         Resolver $layerResolver,
         CategoryRepositoryInterface $categoryRepository
     ) {
@@ -95,6 +109,8 @@ public function __construct(
         $this->_coreRegistry = $coreRegistry;
         $this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
         $this->resultPageFactory = $resultPageFactory;
+        $this->resultForwardFactory = $resultForwardFactory;
+        $this->resultRedirectFactory = $resultRedirectFactory;
         $this->layerResolver = $layerResolver;
         $this->categoryRepository = $categoryRepository;
     }
@@ -137,15 +153,14 @@ protected function _initCategory()
     /**
      * Category view action
      *
-     * @return \Magento\Framework\View\Result\Page
+     * @return \Magento\Framework\Controller\ResultInterface
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function execute()
     {
         if ($this->_request->getParam(\Magento\Framework\App\Action\Action::PARAM_NAME_URL_ENCODED)) {
-            $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
-            return;
+            return $this->resultRedirectFactory->create()->setUrl($this->_redirect->getRedirectUrl());
         }
         $category = $this->_initCategory();
         if ($category) {
@@ -192,7 +207,7 @@ public function execute()
             $page->getLayout()->initMessages();
             return $page;
         } elseif (!$this->getResponse()->isRedirect()) {
-            $this->_forward('noroute');
+            return $this->resultForwardFactory->create()->forward('noroute');
         }
     }
 }
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/blacklist/files_list.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/blacklist/files_list.php
index 7f3dfbd8b00f3..07dff1f7785df 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/blacklist/files_list.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/response/blacklist/files_list.php
@@ -11,4 +11,8 @@
  */
 return [
     '/app/code/Magento/Backend/Model/View.php',
+    '/app/code/Magento/Backend/App/AbstractAction.php',
+    '/app/code/Magento/Backend/App/Response/Http/FileFactory.php',
+    '/app/code/Magento/Backend/Block/Widget.php',
+    '/app/code/Magento/Backend/Block/System/Config/Dwstree.php',
 ];

From 71d399fe738865f5888ec957bce78a12026a66a0 Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Thu, 5 Feb 2015 18:22:11 +0200
Subject: [PATCH 86/94] MAGETWO-33064: Implement obsolete test for refactored
 controllers

---
 .../testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
index 936c2e51e65ba..03e10b396de55 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
@@ -44,9 +44,10 @@ public function testObsoleteResponseMethods()
             function ($file) {
                 $content = file_get_contents($file);
                 foreach ($this->obsoleteMethods as $method) {
+                    $quotedMethod = preg_quote($method, '/');
                     $this->assertSame(
                         0,
-                        preg_match('/(?<=[a-z\d_:]|->|function\s)' . $method . '\s*\(/iS', $content),
+                        preg_match('/(?<=[a-z\d_:]|->|function\s)' . $quotedMethod . '\s*\(/iS', $content),
                         "File: $file\nContains obsolete method: $method . "
                     );
                 }
@@ -66,7 +67,8 @@ public function modulesFilesDataProvider()
 
         foreach ($this->getFilesData('whitelist/refactored_modules*') as $refactoredFolder) {
             $files = \Magento\Framework\Test\Utility\Files::init()->getFiles(
-                [$this->appPath . $refactoredFolder], '*.php'
+                [$this->appPath . $refactoredFolder],
+                '*.php'
             );
             $filesList = array_merge($filesList, $files);
         }

From c34af04d2a3b5a1cf6bee0cb3dc7a2048caf9396 Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Thu, 5 Feb 2015 18:50:21 +0200
Subject: [PATCH 87/94] MAGETWO-33059: Refactor CMS module

---
 app/code/Magento/Cms/Helper/Page.php          | 115 ------------------
 .../testsuite/Magento/Cms/Helper/PageTest.php |   4 +-
 .../testsuite/Magento/Cms/Helper/PageTest.php |  50 +++-----
 3 files changed, 21 insertions(+), 148 deletions(-)
 mode change 100644 => 100755 dev/tests/integration/testsuite/Magento/Cms/Helper/PageTest.php
 mode change 100644 => 100755 dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php

diff --git a/app/code/Magento/Cms/Helper/Page.php b/app/code/Magento/Cms/Helper/Page.php
index e64a551714ab4..c6c6dd649399e 100755
--- a/app/code/Magento/Cms/Helper/Page.php
+++ b/app/code/Magento/Cms/Helper/Page.php
@@ -71,13 +71,6 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected $_escaper;
 
-    /**
-     * @deprecated
-     * @TODO MAGETWO-28356: Refactor controller actions to new ResultInterface
-     * @var \Magento\Framework\App\ViewInterface
-     */
-    protected $_view;
-
     /**
      * @var \Magento\Framework\View\Result\PageFactory
      */
@@ -94,7 +87,6 @@ class Page extends \Magento\Framework\App\Helper\AbstractHelper
      * @param \Magento\Framework\Store\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
      * @param \Magento\Framework\Escaper $escaper
-     * @param \Magento\Framework\App\ViewInterface $view
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -107,11 +99,9 @@ public function __construct(
         \Magento\Framework\Store\StoreManagerInterface $storeManager,
         \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
         \Magento\Framework\Escaper $escaper,
-        \Magento\Framework\App\ViewInterface $view,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory
     ) {
         $this->messageManager = $messageManager;
-        $this->_view = $view;
         $this->_page = $page;
         $this->_design = $design;
         $this->_pageFactory = $pageFactory;
@@ -192,111 +182,6 @@ public function prepareResultPage(Action $action, $pageId = null)
         return $resultPage;
     }
 
-    /**
-     * Renders CMS page on front end
-     *
-     * Call from controller action
-     *
-     * @param Action $action
-     * @param int $pageId
-     * @return bool
-     */
-    public function renderPage(Action $action, $pageId = null)
-    {
-        return $this->_renderPage($action, $pageId);
-    }
-
-    /**
-     * Renders CMS page
-     *
-     * @param Action $action
-     * @param int $pageId
-     * @param bool $renderLayout
-     * @return bool
-     */
-    protected function _renderPage(Action $action, $pageId = null, $renderLayout = true)
-    {
-        if (!is_null($pageId) && $pageId !== $this->_page->getId()) {
-            $delimiterPosition = strrpos($pageId, '|');
-            if ($delimiterPosition) {
-                $pageId = substr($pageId, 0, $delimiterPosition);
-            }
-
-            $this->_page->setStoreId($this->_storeManager->getStore()->getId());
-            if (!$this->_page->load($pageId)) {
-                return false;
-            }
-        }
-
-        if (!$this->_page->getId()) {
-            return false;
-        }
-
-        $inRange = $this->_localeDate->isScopeDateInInterval(
-            null,
-            $this->_page->getCustomThemeFrom(),
-            $this->_page->getCustomThemeTo()
-        );
-
-        if ($this->_page->getCustomTheme()) {
-            if ($inRange) {
-                $this->_design->setDesignTheme($this->_page->getCustomTheme());
-            }
-        }
-        /** @var \Magento\Framework\View\Result\Page $resultPage */
-        $resultPage = $this->_view->getPage();
-        $this->setLayoutType($inRange, $resultPage);
-        $resultPage->initLayout();
-        $resultPage->addHandle('cms_page_view');
-        $resultPage->addPageLayoutHandles(['id' => $this->_page->getIdentifier()]);
-
-        $this->_eventManager->dispatch(
-            'cms_page_render',
-            ['page' => $this->_page, 'controller_action' => $action]
-        );
-
-        if ($this->_page->getCustomLayoutUpdateXml() && $inRange) {
-            $layoutUpdate = $this->_page->getCustomLayoutUpdateXml();
-        } else {
-            $layoutUpdate = $this->_page->getLayoutUpdateXml();
-        }
-        if (!empty($layoutUpdate)) {
-            $resultPage->getLayout()->getUpdate()->addUpdate($layoutUpdate);
-        }
-
-        $contentHeadingBlock = $resultPage->getLayout()->getBlock('page_content_heading');
-        if ($contentHeadingBlock) {
-            $contentHeading = $this->_escaper->escapeHtml($this->_page->getContentHeading());
-            $contentHeadingBlock->setContentHeading($contentHeading);
-        }
-
-        /* @TODO: Move catalog and checkout storage types to appropriate modules */
-        $messageBlock = $resultPage->getLayout()->getMessagesBlock();
-        $messageBlock->addStorageType($this->messageManager->getDefaultGroup());
-        $messageBlock->addMessages($this->messageManager->getMessages(true));
-
-        if ($renderLayout) {
-            $this->_view->renderLayout();
-        }
-
-        return true;
-    }
-
-    /**
-     * Renders CMS Page with more flexibility then original renderPage function.
-     * Allows to use also backend action as first parameter.
-     * Also takes third parameter which allows not run renderLayout method.
-     *
-     * @param Action $action
-     * @param int $pageId
-     * @param bool $renderLayout
-     * @return bool
-     */
-    public function renderPageExtended(Action $action, $pageId = null, $renderLayout = true)
-    {
-        return $this->_renderPage($action, $pageId, $renderLayout);
-    }
-
     /**
      * Retrieve page direct URL
      *
diff --git a/dev/tests/integration/testsuite/Magento/Cms/Helper/PageTest.php b/dev/tests/integration/testsuite/Magento/Cms/Helper/PageTest.php
old mode 100644
new mode 100755
index 915586fea097c..8a486813071ca
--- a/dev/tests/integration/testsuite/Magento/Cms/Helper/PageTest.php
+++ b/dev/tests/integration/testsuite/Magento/Cms/Helper/PageTest.php
@@ -36,7 +36,7 @@ public function testRenderPage()
         // fixture
         /** @var $pageHelper \Magento\Cms\Helper\Page */
         $pageHelper = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->get('Magento\Cms\Helper\Page');
-        $result = $pageHelper->renderPage(
+        $result = $pageHelper->prepareResultPage(
             \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
                 'Magento\Framework\App\Action\Action',
                 ['context' => $context]
@@ -47,6 +47,6 @@ public function testRenderPage()
             'Magento\Framework\View\DesignInterface'
         );
         $this->assertEquals('Magento/blank', $design->getDesignTheme()->getThemePath());
-        $this->assertTrue($result);
+        $this->assertInstanceOf('Magento\Framework\View\Result\Page', $result);
     }
 }
diff --git a/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php b/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php
old mode 100644
new mode 100755
index f8d59563ce77d..e8591bb94fb80
--- a/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php
+++ b/dev/tests/unit/testsuite/Magento/Cms/Helper/PageTest.php
@@ -53,11 +53,6 @@ class PageTest extends \PHPUnit_Framework_TestCase
      */
     protected $pageConfigMock;
 
-    /**
-     * @var \Magento\Framework\App\ViewInterface|\PHPUnit_Framework_MockObject_MockObject
-     */
-    protected $viewMock;
-
     /**
      * @var \Magento\Framework\Escaper|\PHPUnit_Framework_MockObject_MockObject
      */
@@ -113,6 +108,11 @@ class PageTest extends \PHPUnit_Framework_TestCase
      */
     protected $messageCollectionMock;
 
+    /**
+     * @var \Magento\Framework\View\Result\PageFactory|\PHPUnit_Framework_MockObject_MockObject
+     */
+    protected $resultPageFactory;
+
     protected function setUp()
     {
         $this->actionMock = $this->getMockBuilder('Magento\Framework\App\Action\Action')
@@ -150,8 +150,6 @@ protected function setUp()
         $this->pageConfigMock = $this->getMockBuilder('Magento\Framework\View\Page\Config')
             ->disableOriginalConstructor()
             ->getMock();
-        $this->viewMock = $this->getMockBuilder('Magento\Framework\App\ViewInterface')
-            ->getMockForAbstractClass();
         $this->escaperMock = $this->getMockBuilder('Magento\Framework\Escaper')
             ->disableOriginalConstructor()
             ->getMock();
@@ -189,6 +187,9 @@ protected function setUp()
                 'urlBuilder' => $this->urlBuilderMock
             ]
         );
+
+        $this->resultPageFactory = $this->getMock('Magento\Framework\View\Result\PageFactory', [], [], '', false);
+
         $this->object = $objectManager->getObject(
             'Magento\Cms\Helper\Page',
             [
@@ -199,9 +200,9 @@ protected function setUp()
                 'localeDate' => $this->localeDateMock,
                 'design' => $this->designMock,
                 'pageConfig' => $this->pageConfigMock,
-                'view' => $this->viewMock,
                 'escaper' => $this->escaperMock,
-                'messageManager' => $this->messageManagerMock
+                'messageManager' => $this->messageManagerMock,
+                'resultPageFactory' => $this->resultPageFactory
             ]
         );
     }
@@ -221,7 +222,7 @@ protected function setUp()
      *
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function testRenderPageExtended(
+    public function testPrepareResultPage(
         $pageId,
         $internalPageId,
         $pageLoadResultIndex,
@@ -287,6 +288,8 @@ public function testRenderPageExtended(
         $this->pageMock->expects($this->any())
             ->method('getCustomPageLayout')
             ->willReturn($customPageLayout);
+        $this->resultPageFactory->expects($this->any())->method('create')
+            ->will($this->returnValue($this->resultPageMock));
         $this->resultPageMock->expects($this->any())
             ->method('getConfig')
             ->willReturn($this->pageConfigMock);
@@ -294,9 +297,6 @@ public function testRenderPageExtended(
             ->method('setPageLayout')
             ->with($handle)
             ->willReturnSelf();
-        $this->viewMock->expects($this->any())
-            ->method('getPage')
-            ->willReturn($this->resultPageMock);
         $this->resultPageMock->expects($this->any())
             ->method('initLayout')
             ->willReturnSelf();
@@ -313,10 +313,6 @@ public function testRenderPageExtended(
         $this->pageMock->expects($this->any())
             ->method('getIdentifier')
             ->willReturn($pageIdentifier);
-        $this->viewMock->expects($this->any())
-            ->method('addPageLayoutHandles')
-            ->with(['id' => $pageIdentifier])
-            ->willReturn(true);
         $this->eventManagerMock->expects($this->any())
             ->method('dispatch')
             ->with(
@@ -326,9 +322,6 @@ public function testRenderPageExtended(
                     'controller_action' => $this->actionMock
                 ]
             );
-        $this->viewMock->expects($this->any())
-            ->method('loadLayoutUpdates')
-            ->willReturnSelf();
         $this->pageMock->expects($this->any())
             ->method('getCustomLayoutUpdateXml')
             ->willReturn($customLayoutUpdateXml);
@@ -339,12 +332,6 @@ public function testRenderPageExtended(
             ->method('addUpdate')
             ->with($layoutUpdate)
             ->willReturnSelf();
-        $this->viewMock->expects($this->any())
-            ->method('generateLayoutXml')
-            ->willReturnSelf();
-        $this->viewMock->expects($this->any())
-            ->method('generateLayoutBlocks')
-            ->willReturnSelf();
         $this->layoutMock->expects($this->any())
             ->method('getBlock')
             ->with('page_content_heading')
@@ -377,13 +364,14 @@ public function testRenderPageExtended(
             ->method('addMessages')
             ->with($this->messageCollectionMock)
             ->willReturnSelf();
-        $this->viewMock->expects($this->any())
-            ->method('renderLayout')
-            ->willReturnSelf();
 
-        $this->assertEquals(
+        if ($expectedResult) {
+            $expectedResult = $this->resultPageMock;
+        }
+
+        $this->assertSame(
             $expectedResult,
-            $this->object->renderPageExtended($this->actionMock, $pageId)
+            $this->object->prepareResultPage($this->actionMock, $pageId)
         );
     }
 

From b5713dec40c5e611299e1da8216d19b3dd175307 Mon Sep 17 00:00:00 2001
From: vpaladiychuk <vpaladiychuk@ebay.com>
Date: Fri, 6 Feb 2015 11:52:41 +0200
Subject: [PATCH 88/94] MAGETWO-33059: Refactor CMS module

---
 .../testsuite/Magento/Test/Legacy/_files/obsolete_methods.php  | 3 +++
 .../Magento/Test/Legacy/_files/obsolete_properties.php         | 1 +
 2 files changed, 4 insertions(+)
 mode change 100644 => 100755 dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
 mode change 100644 => 100755 dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
old mode 100644
new mode 100755
index 3efaaeaa5e577..55f56e8ced3f9
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -2046,4 +2046,7 @@
     ['_initSendToFriendModel', 'Magento\Sendfriend\Controller\Product'],
     ['register', 'Magento\Sendfriend\Model\Sendfriend'],
     ['_getImageHelper', 'Magento\Catalog\Model\Product'],
+    ['renderPage', 'Magento\Cms\Helper\Page'],
+    ['renderPageExtended', 'Magento\Cms\Helper\Page'],
+    ['_renderPage', 'Magento\Cms\Helper\Page'],
 ];
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
old mode 100644
new mode 100755
index 89dcd2f0e9bbb..e9c1cb5a8d170
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_properties.php
@@ -368,4 +368,5 @@
     ['_catalogData', 'Magento\Catalog\Block\Product\AbstractProduct'],
     ['_env', 'Magento\Rule\Model\Resource\Rule\Collection\AbstractCollection'],
     ['_catalogImage', 'Magento\Catalog\Model\Product'],
+    ['_view', 'Magento\Cms\Helper\Page'],
 ];

From 7c9f59f33a9c9f9a53a22b38a29f8871ecd16bbb Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Fri, 6 Feb 2015 12:08:13 +0200
Subject: [PATCH 89/94] MAGETWO-33064: Implement obsolete test for refactored
 controllers

---
 .../testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
index 03e10b396de55..d5db435c9644c 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
@@ -47,7 +47,7 @@ function ($file) {
                     $quotedMethod = preg_quote($method, '/');
                     $this->assertSame(
                         0,
-                        preg_match('/(?<=[a-z\d_:]|->|function\s)' . $quotedMethod . '\s*\(/iS', $content),
+                        preg_match('/(?<=[a-z\\d_:]|->|function\s)' . $quotedMethod . '\s*\(/iS', $content),
                         "File: $file\nContains obsolete method: $method . "
                     );
                 }

From e44a3cbd8947c97037264eabf2ca675201754237 Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Fri, 6 Feb 2015 12:21:45 +0200
Subject: [PATCH 90/94] MAGETWO-33064: Implement obsolete test for refactored
 controllers

---
 .../testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
index d5db435c9644c..46ad16317e8a9 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteResponseTest.php
@@ -47,7 +47,7 @@ function ($file) {
                     $quotedMethod = preg_quote($method, '/');
                     $this->assertSame(
                         0,
-                        preg_match('/(?<=[a-z\\d_:]|->|function\s)' . $quotedMethod . '\s*\(/iS', $content),
+                        preg_match('/(?<=[a-z\\d_:]|->|function\\s)' . $quotedMethod . '\\s*\\(/iS', $content),
                         "File: $file\nContains obsolete method: $method . "
                     );
                 }

From 643187ae53cde6c1290a250c5393e3b63034b4bd Mon Sep 17 00:00:00 2001
From: Yuri Kovsher <ikovsher@ebay.com>
Date: Fri, 6 Feb 2015 12:38:03 +0200
Subject: [PATCH 91/94] MAGETWO-33063: Replace usage of __() to Phrase object
 in library

---
 .../Test/Integrity/Library/DependencyTest.php | 22 +++++++++++++++++++
 .../Magento/Test/Legacy/ObsoleteCodeTest.php  | 22 -------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php
index 62d92d5606b10..6d91b472c35f5 100644
--- a/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Integrity/Library/DependencyTest.php
@@ -6,6 +6,7 @@
 namespace Magento\Test\Integrity\Library;
 
 use Magento\Framework\Test\Utility\Files;
+use Magento\Framework\Test\Utility\AggregateInvoker;
 use Magento\TestFramework\Integrity\Library\Injectable;
 use Magento\TestFramework\Integrity\Library\PhpParser\ParserFactory;
 use Magento\TestFramework\Integrity\Library\PhpParser\Tokens;
@@ -67,6 +68,27 @@ function ($file) {
         );
     }
 
+    public function testAppCodeUsage()
+    {
+        $files = Files::init();
+        $path = $files->getPathToSource();
+        $invoker = new AggregateInvoker($this);
+        $invoker(
+            function ($file) use ($path) {
+                $content = file_get_contents($file);
+                if (strpos($file, $path . '/lib/') === 0) {
+                    $this->assertSame(
+                        0,
+                        preg_match('~(?<![a-z\\d_:]|->|function\\s)__\\s*\\(~iS', $content),
+                        'Function __() is defined outside of the library and must not be used there. ' .
+                        'Replacement suggestion: new \\Magento\\Framework\\Phrase()'
+                    );
+                }
+            },
+            $files->getPhpFiles(false, true, false)
+        );
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
index 1e67f12e1fed1..dcb1b59726ce2 100644
--- a/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
+++ b/dev/tests/static/testsuite/Magento/Test/Legacy/ObsoleteCodeTest.php
@@ -10,8 +10,6 @@
  */
 namespace Magento\Test\Legacy;
 
-use Magento\Framework\Test\Utility\Files;
-
 class ObsoleteCodeTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -131,7 +129,6 @@ function ($file) {
                 $this->_testObsoleteActions($content);
                 $this->_testObsoleteConstants($content);
                 $this->_testObsoletePropertySkipCalculate($content);
-                $this->checkLibraryDependence($content, $file);
             },
             \Magento\TestFramework\Utility\ChangedFiles::getPhpFiles(__DIR__ . '/_files/changed_files*')
         );
@@ -494,25 +491,6 @@ protected function _testObsoletePropertySkipCalculate($content)
         );
     }
 
-    /**
-     * Checks that library is not using app defined code
-     *
-     * @param string $content
-     * @param string $file
-     */
-    protected function checkLibraryDependence($content, $file)
-    {
-        $path = Files::init()->getPathToSource();
-        if (strpos($file, $path . '/lib/') === 0) {
-            $this->_assertNotRegexp(
-                '~(?<![a-z\\d_:]|->|function\\s)__\\s*\\(~iS',
-                $content,
-                'Function __() is defined outside of the library and must not be used there. ' .
-                'Replacement suggestion: new \\Magento\\Framework\\Phrase()'
-            );
-        }
-    }
-
     /**
      * Analyze contents to determine whether this is declaration of specified class/interface
      *

From 8eb8ae3b5730a9c87dc12fc55f971e505184497d Mon Sep 17 00:00:00 2001
From: Maxim Shikula <mshikula@ebay.com>
Date: Fri, 6 Feb 2015 14:33:21 +0200
Subject: [PATCH 92/94] MAGETWO-32989: Image isn't displayed in CMS page on
 Frontend if webserver rewrites = no

---
 app/code/Magento/Widget/Model/Template/Filter.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php
index bed1b280efc24..713868ac60bb4 100755
--- a/app/code/Magento/Widget/Model/Template/Filter.php
+++ b/app/code/Magento/Widget/Model/Template/Filter.php
@@ -119,8 +119,7 @@ public function widgetDirective($construction)
      */
     public function mediaDirective($construction)
     {
-        $value = isset($construction[2]) ? $construction[2] : '';
-        $params = $this->_getIncludeParameters($value);
+        $params = $this->_getIncludeParameters($construction[2]);
         return $this->_storeManager->getStore()
             ->getBaseUrl(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) . $params['url'];
     }

From d3751e20baff7c5cc08170e718ac70f0cd768303 Mon Sep 17 00:00:00 2001
From: Evgeniy Miskov <emiskov@ebay.com>
Date: Fri, 6 Feb 2015 15:55:22 +0200
Subject: [PATCH 93/94] MAGETWO-33059: Refactor CMS module

---
 .../Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php   | 1 -
 app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php       | 4 ++--
 .../Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php    | 2 --
 .../Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php   | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php
index f56e9e2e5efd2..c3a871112593f 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/AbstractMassDelete.php
@@ -76,7 +76,6 @@ public function execute()
                 $this->selectedDelete($data['selected']);
             } else {
                 $this->messageManager->addError(__('Please select item(s).'));
-                $resultRedirect->setPath(static::REDIRECT_URL);
             }
         } catch (\Exception $e) {
             $this->messageManager->addError($e->getMessage());
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
index a4c05f5fd4683..36e68c281a54a 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php
@@ -72,7 +72,7 @@ protected function _initAction()
     /**
      * Edit CMS page
      *
-     * @return \Magento\Backend\Model\View\Result\Page|\Magento\Framework\Controller\Result\Redirect
+     * @return \Magento\Backend\Model\View\Result\Page|\Magento\Backend\Model\View\Result\Redirect
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function execute()
@@ -86,7 +86,7 @@ public function execute()
             $model->load($id);
             if (!$model->getId()) {
                 $this->messageManager->addError(__('This page no longer exists.'));
-                /** \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+                /** \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
                 $resultRedirect = $this->resultRedirectFactory->create();
 
                 return $resultRedirect->setPath('*/*/');
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
index cd4f9817eebee..51d1fc3502be0 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Directive.php
@@ -38,8 +38,6 @@ public function __construct(
     /**
      * Template directives callback
      *
-     * todo: move this to some model
-     *
      * @return \Magento\Framework\Controller\Result\Raw
      */
     public function execute()
diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
index e91b82fbd7600..c415e2331c36c 100755
--- a/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
+++ b/app/code/Magento/Cms/Controller/Adminhtml/Wysiwyg/Images/DeleteFiles.php
@@ -10,7 +10,6 @@
 
 class DeleteFiles extends \Magento\Cms\Controller\Adminhtml\Wysiwyg\Images
 {
-
     /**
      * @var \Magento\Framework\Controller\Result\JSONFactory
      */

From 14fb2d872f77f20ced13dbd8770ffb57625dadb1 Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Fri, 6 Feb 2015 18:39:57 +0200
Subject: [PATCH 94/94] MAGETWO-33060: Refactor __() to return Phrase object

- Method getSpecifyOptionMessage returns Phrase object;
---
 .../Model/Product/Type/Configurable.php                   | 8 ++++----
 .../Model/Product/Type/ConfigurableTest.php               | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
index 6317f6450e565..8643b3a1df95a 100644
--- a/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
+++ b/app/code/Magento/ConfigurableProduct/Model/Product/Type/Configurable.php
@@ -809,7 +809,7 @@ protected function _prepareProduct(\Magento\Framework\Object $buyRequest, $produ
             }
         }
 
-        return $this->getSpecifyOptionMessage();
+        return (string)$this->getSpecifyOptionMessage();
     }
 
     /**
@@ -834,7 +834,7 @@ public function checkProductBuyState($product)
                 }
             }
             if (empty($attributes)) {
-                throw new \Magento\Framework\Model\Exception($this->getSpecifyOptionMessage());
+                throw new \Magento\Framework\Model\Exception((string)$this->getSpecifyOptionMessage());
             }
         }
         return $this;
@@ -843,11 +843,11 @@ public function checkProductBuyState($product)
     /**
      * Retrieve message for specify option(s)
      *
-     * @return string
+     * @return \Magento\Framework\Phrase
      */
     public function getSpecifyOptionMessage()
     {
-        return (string)__('Please specify the product\'s option(s).');
+        return __('Please specify the product\'s option(s).');
     }
 
     /**
diff --git a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
index c6bee612e4b49..2a99dede48422 100644
--- a/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
+++ b/dev/tests/integration/testsuite/Magento/ConfigurableProduct/Model/Product/Type/ConfigurableTest.php
@@ -291,7 +291,10 @@ public function testPrepareForCart()
 
     public function testGetSpecifyOptionMessage()
     {
-        $this->assertEquals('Please specify the product\'s option(s).', $this->_model->getSpecifyOptionMessage());
+        $this->assertEquals(
+            'Please specify the product\'s option(s).',
+            (string)$this->_model->getSpecifyOptionMessage()
+        );
     }
 
     /**