MAGETWO-34995: Refactor controllers from the list (Part2)

vpaladiychuk · vpaladiychuk · commit 0d74a689ce9f · 2015-03-26T16:40:46.000+02:00
diff --git a/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php b/app/code/Magento/Sales/Controller/Adminhtml/Transactions/Fetch.php
@@ -7,14 +7,13 @@
 namespace Magento\Sales\Controller\Adminhtml\Transactions;
 
 use Magento\Backend\App\Action;
-use Magento\Backend\Model\View\Result\Redirect;
 
 class Fetch extends \Magento\Sales\Controller\Adminhtml\Transactions
 {
     /**
      * Fetch transaction details action
      *
-     * @return Redirect
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
     {
@@ -31,7 +30,7 @@ public function execute()
     }
 
     /**
-     * @return Redirect
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function getDefaultRedirect()
     {
diff --git a/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Email.php b/app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Email.php
@@ -45,7 +45,7 @@ protected function _isAllowed()
     /**
      * Send email with shipment data to customer
      *
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
     {
@@ -66,7 +66,7 @@ public function execute()
     /**
      * @inheritdoc
      *
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function getDefaultRedirect()
     {
diff --git a/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/EmailTest.php b/app/code/Magento/Shipping/Test/Unit/Controller/Adminhtml/Order/Shipment/EmailTest.php
@@ -64,12 +64,12 @@ class EmailTest extends \PHPUnit_Framework_TestCase
     protected $helper;
 
     /**
-     * @var \Magento\Framework\Controller\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Backend\Model\View\Result\RedirectFactory|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $resultRedirectFactory;
 
     /**
-     * @var \Magento\Framework\Controller\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
+     * @var \Magento\Backend\Model\View\Result\Redirect|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $resultRedirect;
 
@@ -140,9 +140,9 @@ public function setUp()
         $this->session = $this->getMock('Magento\Backend\Model\Session', ['setIsUrlNotice'], [], '', false);
         $this->actionFlag = $this->getMock('Magento\Framework\App\ActionFlag', ['get'], [], '', false);
         $this->helper = $this->getMock('\Magento\Backend\Helper\Data', ['getUrl'], [], '', false);
-        $this->resultRedirect = $this->getMock('Magento\Framework\Controller\Result\Redirect', [], [], '', false);
+        $this->resultRedirect = $this->getMock('Magento\Backend\Model\View\Result\Redirect', [], [], '', false);
         $this->resultRedirectFactory = $this->getMock(
-            'Magento\Framework\Controller\Result\RedirectFactory',
+            'Magento\Backend\Model\View\Result\RedirectFactory',
             ['create'],
             [],
             '',
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rate/Delete.php
@@ -13,7 +13,7 @@ class Delete extends \Magento\Tax\Controller\Adminhtml\Rate
     /**
      * Delete Rate and Data
      *
-     * @return \Magento\Framework\Controller\Result\Redirect|void
+     * @return \Magento\Backend\Model\View\Result\Redirect|void
      */
     public function execute()
     {
@@ -38,7 +38,7 @@ public function execute()
     /**
      * @inheritdoc
      *
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function getDefaultRedirect()
     {
diff --git a/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php b/app/code/Magento/Tax/Controller/Adminhtml/Rule/Delete.php
@@ -6,11 +6,10 @@
  */
 namespace Magento\Tax\Controller\Adminhtml\Rule;
 
-
 class Delete extends \Magento\Tax\Controller\Adminhtml\Rule
 {
     /**
-     * @return \Magento\Framework\Controller\Result\Redirect|void
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
     {
@@ -31,7 +30,7 @@ public function execute()
     /**
      * @inheritdoc
      *
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function getDefaultRedirect()
     {
diff --git a/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php b/app/code/Magento/Theme/Controller/Adminhtml/System/Design/Theme/Delete.php
@@ -11,7 +11,7 @@ class Delete extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme
     /**
      * Delete action
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
     {
@@ -36,7 +36,7 @@ public function execute()
     /**
      * @inheritdoc
      *
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function getDefaultRedirect()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/Delete.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/Delete.php
@@ -11,7 +11,7 @@ class Delete extends \Magento\User\Controller\Adminhtml\User\Role
     /**
      * Remove role action
      *
-     * @return void
+     * @return \Magento\Backend\Model\View\Result\Redirect|void
      */
     public function execute()
     {
@@ -33,7 +33,7 @@ public function execute()
     /**
      * @inheritdoc
      *
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function getDefaultRedirect()
     {
diff --git a/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php b/app/code/Magento/User/Controller/Adminhtml/User/Role/SaveRole.php
@@ -52,7 +52,7 @@ protected function _deleteUserFromRole($userId, $roleId)
     /**
      * Role form submit action to save or create new role
      *
-     * @return \Magento\Framework\Controller\Result\Redirect|void
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function execute()
     {
@@ -104,7 +104,7 @@ public function execute()
     /**
      * @inheritdoc
      *
-     * @return \Magento\Framework\Controller\Result\Redirect
+     * @return \Magento\Backend\Model\View\Result\Redirect
      */
     public function getDefaultRedirect()
     {
diff --git a/app/code/Magento/Wishlist/Controller/Index/Fromcart.php b/app/code/Magento/Wishlist/Controller/Index/Fromcart.php
@@ -30,6 +30,8 @@ public function __construct(
     }
 
     /**
+     * Add cart item to wishlist and remove from cart
+     *
      * @return \Magento\Framework\Controller\Result\Redirect
      * @throws NotFoundException
      * @throws \Magento\Framework\Exception\LocalizedException

Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,13 @@`
`7`	`7`	`namespace Magento\Sales\Controller\Adminhtml\Transactions;`
`8`	`8`
`9`	`9`	`use Magento\Backend\App\Action;`
`10`		`-use Magento\Backend\Model\View\Result\Redirect;`
`11`	`10`
`12`	`11`	`class Fetch extends \Magento\Sales\Controller\Adminhtml\Transactions`
`13`	`12`	`{`
`14`	`13`	`/**`
`15`	`14`	`* Fetch transaction details action`
`16`	`15`	`*`
`17`		`- * @return Redirect`
	`16`	`+ * @return \Magento\Backend\Model\View\Result\Redirect`
`18`	`17`	`*/`
`19`	`18`	`public function execute()`
`20`	`19`	`{`
`@@ -31,7 +30,7 @@ public function execute()`
`31`	`30`	`}`
`32`	`31`
`33`	`32`	`/**`
`34`		`- * @return Redirect`
	`33`	`+ * @return \Magento\Backend\Model\View\Result\Redirect`
`35`	`34`	`*/`
`36`	`35`	`public function getDefaultRedirect()`
`37`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ protected function _isAllowed()`
`45`	`45`	`/**`
`46`	`46`	`* Send email with shipment data to customer`
`47`	`47`	`*`
`48`		`- * @return \Magento\Framework\Controller\Result\Redirect`
	`48`	`+ * @return \Magento\Backend\Model\View\Result\Redirect`
`49`	`49`	`*/`
`50`	`50`	`public function execute()`
`51`	`51`	`{`
`@@ -66,7 +66,7 @@ public function execute()`
`66`	`66`	`/**`
`67`	`67`	`* @inheritdoc`
`68`	`68`	`*`
`69`		`- * @return \Magento\Framework\Controller\Result\Redirect`
	`69`	`+ * @return \Magento\Backend\Model\View\Result\Redirect`
`70`	`70`	`*/`
`71`	`71`	`public function getDefaultRedirect()`
`72`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class Delete extends \Magento\Tax\Controller\Adminhtml\Rate`
`13`	`13`	`/**`
`14`	`14`	`* Delete Rate and Data`
`15`	`15`	`*`
`16`		`- * @return \Magento\Framework\Controller\Result\Redirect\|void`
	`16`	`+ * @return \Magento\Backend\Model\View\Result\Redirect\|void`
`17`	`17`	`*/`
`18`	`18`	`public function execute()`
`19`	`19`	`{`
`@@ -38,7 +38,7 @@ public function execute()`
`38`	`38`	`/**`
`39`	`39`	`* @inheritdoc`
`40`	`40`	`*`
`41`		`- * @return \Magento\Framework\Controller\Result\Redirect`
	`41`	`+ * @return \Magento\Backend\Model\View\Result\Redirect`
`42`	`42`	`*/`
`43`	`43`	`public function getDefaultRedirect()`
`44`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,10 @@`
`6`	`6`	`*/`
`7`	`7`	`namespace Magento\Tax\Controller\Adminhtml\Rule;`
`8`	`8`
`9`		`-`
`10`	`9`	`class Delete extends \Magento\Tax\Controller\Adminhtml\Rule`
`11`	`10`	`{`
`12`	`11`	`/**`
`13`		`- * @return \Magento\Framework\Controller\Result\Redirect\|void`
	`12`	`+ * @return \Magento\Backend\Model\View\Result\Redirect`
`14`	`13`	`*/`
`15`	`14`	`public function execute()`
`16`	`15`	`{`
`@@ -31,7 +30,7 @@ public function execute()`
`31`	`30`	`/**`
`32`	`31`	`* @inheritdoc`
`33`	`32`	`*`
`34`		`- * @return \Magento\Framework\Controller\Result\Redirect`
	`33`	`+ * @return \Magento\Backend\Model\View\Result\Redirect`
`35`	`34`	`*/`
`36`	`35`	`public function getDefaultRedirect()`
`37`	`36`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class Delete extends \Magento\Theme\Controller\Adminhtml\System\Design\Theme`
`11`	`11`	`/**`
`12`	`12`	`* Delete action`
`13`	`13`	`*`
`14`		`- * @return void`
	`14`	`+ * @return \Magento\Backend\Model\View\Result\Redirect`
`15`	`15`	`*/`
`16`	`16`	`public function execute()`
`17`	`17`	`{`
`@@ -36,7 +36,7 @@ public function execute()`
`36`	`36`	`/**`
`37`	`37`	`* @inheritdoc`
`38`	`38`	`*`
`39`		`- * @return \Magento\Framework\Controller\Result\Redirect`
	`39`	`+ * @return \Magento\Backend\Model\View\Result\Redirect`
`40`	`40`	`*/`
`41`	`41`	`public function getDefaultRedirect()`
`42`	`42`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ protected function _deleteUserFromRole($userId, $roleId)`
`52`	`52`	`/**`
`53`	`53`	`* Role form submit action to save or create new role`
`54`	`54`	`*`
`55`		`- * @return \Magento\Framework\Controller\Result\Redirect\|void`
	`55`	`+ * @return \Magento\Backend\Model\View\Result\Redirect`
`56`	`56`	`*/`
`57`	`57`	`public function execute()`
`58`	`58`	`{`
`@@ -104,7 +104,7 @@ public function execute()`
`104`	`104`	`/**`
`105`	`105`	`* @inheritdoc`
`106`	`106`	`*`
`107`		`- * @return \Magento\Framework\Controller\Result\Redirect`
	`107`	`+ * @return \Magento\Backend\Model\View\Result\Redirect`
`108`	`108`	`*/`
`109`	`109`	`public function getDefaultRedirect()`
`110`	`110`	`{`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ public function __construct(`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/**`
	`33`	`+ * Add cart item to wishlist and remove from cart`
	`34`	`+ *`
`33`	`35`	`* @return \Magento\Framework\Controller\Result\Redirect`
`34`	`36`	`* @throws NotFoundException`
`35`	`37`	`* @throws \Magento\Framework\Exception\LocalizedException`