From 6c8179af931658253fa4f147bbb476a65bcd4569 Mon Sep 17 00:00:00 2001 From: Dmytro Poperechnyy <dpoperechnyy@ebay.com> Date: Fri, 23 Jan 2015 15:35:36 +0200 Subject: [PATCH] MAGETWO-32567: Refactor address, review, ajax directories - Changed Backend Result Redirect & Forward to Framework Result; --- app/code/Magento/Customer/Controller/Address.php | 12 ++++++------ .../Magento/Customer/Controller/Address/Index.php | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/code/Magento/Customer/Controller/Address.php b/app/code/Magento/Customer/Controller/Address.php index 14e2a97fc72..edea47dcc25 100644 --- a/app/code/Magento/Customer/Controller/Address.php +++ b/app/code/Magento/Customer/Controller/Address.php @@ -50,12 +50,12 @@ class Address extends \Magento\Framework\App\Action\Action protected $_dataProcessor; /** - * @var \Magento\Backend\Model\View\Result\RedirectFactory + * @var \Magento\Framework\Controller\Result\Redirect */ protected $resultRedirectFactory; /** - * @var \Magento\Backend\Model\View\Result\ForwardFactory + * @var \Magento\Framework\Controller\Result\ForwardFactory */ protected $resultForwardFactory; @@ -73,8 +73,8 @@ class Address extends \Magento\Framework\App\Action\Action * @param \Magento\Customer\Api\Data\AddressDataBuilder $addressDataBuilder * @param \Magento\Customer\Api\Data\RegionDataBuilder $regionDataBuilder * @param \Magento\Framework\Reflection\DataObjectProcessor $dataProcessor - * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory - * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory + * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory + * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ @@ -87,8 +87,8 @@ class Address extends \Magento\Framework\App\Action\Action \Magento\Customer\Api\Data\AddressDataBuilder $addressDataBuilder, \Magento\Customer\Api\Data\RegionDataBuilder $regionDataBuilder, \Magento\Framework\Reflection\DataObjectProcessor $dataProcessor, - \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory, - \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory, + \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory, + \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory, \Magento\Framework\View\Result\PageFactory $resultPageFactory ) { $this->_customerSession = $customerSession; diff --git a/app/code/Magento/Customer/Controller/Address/Index.php b/app/code/Magento/Customer/Controller/Address/Index.php index 82efdc7cb4c..4b82b517b64 100644 --- a/app/code/Magento/Customer/Controller/Address/Index.php +++ b/app/code/Magento/Customer/Controller/Address/Index.php @@ -28,8 +28,8 @@ class Index extends \Magento\Customer\Controller\Address * @param \Magento\Customer\Api\Data\RegionDataBuilder $regionDataBuilder * @param \Magento\Framework\Reflection\DataObjectProcessor $dataProcessor * @param CustomerRepositoryInterface $customerRepository - * @param \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory - * @param \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory + * @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory + * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory * @SuppressWarnings(PHPMD.ExcessiveParameterList) */ @@ -42,8 +42,8 @@ class Index extends \Magento\Customer\Controller\Address \Magento\Customer\Api\Data\AddressDataBuilder $addressDataBuilder, \Magento\Customer\Api\Data\RegionDataBuilder $regionDataBuilder, \Magento\Framework\Reflection\DataObjectProcessor $dataProcessor, - \Magento\Backend\Model\View\Result\RedirectFactory $resultRedirectFactory, - \Magento\Backend\Model\View\Result\ForwardFactory $resultForwardFactory, + \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory, + \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory, \Magento\Framework\View\Result\PageFactory $resultPageFactory, CustomerRepositoryInterface $customerRepository ) { -- GitLab