From 41022c9340d45ca82b0c7591ed416cd78b8d6ccc Mon Sep 17 00:00:00 2001
From: Dmytro Poperechnyy <dpoperechnyy@ebay.com>
Date: Fri, 23 Jan 2015 16:08:41 +0200
Subject: [PATCH] MAGETWO-32567: Refactor address, review, ajax directories

- Changed all Backend Result to Framework where needed;
---
 app/code/Magento/Customer/Controller/Address/Delete.php    | 2 +-
 app/code/Magento/Customer/Controller/Address/Edit.php      | 4 ++--
 app/code/Magento/Customer/Controller/Address/Form.php      | 4 ++--
 app/code/Magento/Customer/Controller/Address/FormPost.php  | 2 +-
 app/code/Magento/Customer/Controller/Address/Index.php     | 2 +-
 app/code/Magento/Customer/Controller/Address/NewAction.php | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/code/Magento/Customer/Controller/Address/Delete.php b/app/code/Magento/Customer/Controller/Address/Delete.php
index 8ee4eb4f543..6c334448779 100644
--- a/app/code/Magento/Customer/Controller/Address/Delete.php
+++ b/app/code/Magento/Customer/Controller/Address/Delete.php
@@ -9,7 +9,7 @@ namespace Magento\Customer\Controller\Address;
 class Delete extends \Magento\Customer\Controller\Address
 {
     /**
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Address/Edit.php b/app/code/Magento/Customer/Controller/Address/Edit.php
index 8c33588376f..0691ffd8ad5 100644
--- a/app/code/Magento/Customer/Controller/Address/Edit.php
+++ b/app/code/Magento/Customer/Controller/Address/Edit.php
@@ -11,11 +11,11 @@ class Edit extends \Magento\Customer\Controller\Address
     /**
      * Customer address edit action
      *
-     * @return \Magento\Backend\Model\View\Result\Forward
+     * @return \Magento\Framework\Controller\Result\Forward
      */
     public function execute()
     {
-        /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */
+        /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
         $resultForward = $this->resultForwardFactory->create();
         return $resultForward->forward('form');
     }
diff --git a/app/code/Magento/Customer/Controller/Address/Form.php b/app/code/Magento/Customer/Controller/Address/Form.php
index 1750b06a70c..8948125c397 100644
--- a/app/code/Magento/Customer/Controller/Address/Form.php
+++ b/app/code/Magento/Customer/Controller/Address/Form.php
@@ -11,11 +11,11 @@ class Form extends \Magento\Customer\Controller\Address
     /**
      * Address book form
      *
-     * @return \Magento\Backend\Model\View\Result\Page
+     * @return \Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
-        /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+        /** @var \Magento\Framework\View\Result\Page $resultPage */
         $resultPage = $this->resultPageFactory->create();
         $resultPage->getLayout()->initMessages();
         $navigationBlock = $resultPage->getLayout()->getBlock('customer_account_navigation');
diff --git a/app/code/Magento/Customer/Controller/Address/FormPost.php b/app/code/Magento/Customer/Controller/Address/FormPost.php
index c952ff5ebf8..2fdf486d56d 100644
--- a/app/code/Magento/Customer/Controller/Address/FormPost.php
+++ b/app/code/Magento/Customer/Controller/Address/FormPost.php
@@ -64,7 +64,7 @@ class FormPost extends \Magento\Customer\Controller\Address
     /**
      * Process address form save
      *
-     * @return \Magento\Backend\Model\View\Result\Redirect
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
diff --git a/app/code/Magento/Customer/Controller/Address/Index.php b/app/code/Magento/Customer/Controller/Address/Index.php
index 4b82b517b64..de8e53def17 100644
--- a/app/code/Magento/Customer/Controller/Address/Index.php
+++ b/app/code/Magento/Customer/Controller/Address/Index.php
@@ -72,7 +72,7 @@ class Index extends \Magento\Customer\Controller\Address
     {
         $addresses = $this->customerRepository->getById($this->_getSession()->getCustomerId())->getAddresses();
         if (count($addresses)) {
-            /** @var \Magento\Backend\Model\View\Result\Page $resultPage */
+            /** @var \Magento\Framework\View\Result\Page $resultPage */
             $resultPage = $this->resultPageFactory->create();
             $resultPage->getLayout()->initMessages();
             $block = $resultPage->getLayout()->getBlock('address_book');
diff --git a/app/code/Magento/Customer/Controller/Address/NewAction.php b/app/code/Magento/Customer/Controller/Address/NewAction.php
index 427f6329f2d..4bfdabbbd5e 100644
--- a/app/code/Magento/Customer/Controller/Address/NewAction.php
+++ b/app/code/Magento/Customer/Controller/Address/NewAction.php
@@ -9,11 +9,11 @@ namespace Magento\Customer\Controller\Address;
 class NewAction extends \Magento\Customer\Controller\Address
 {
     /**
-     * @return \Magento\Backend\Model\View\Result\Forward
+     * @return \Magento\Framework\Controller\Result\Forward
      */
     public function execute()
     {
-        /** @var \Magento\Backend\Model\View\Result\Forward $resultForward */
+        /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
         $resultForward = $this->resultForwardFactory->create();
         return $resultForward->forward('form');
     }
-- 
GitLab