ENGCOM-7779: Implement ActionInterface for wishlist/shared #27494

Author: sidolov

app/code/Magento/Wishlist/Controller/Shared/Allcart.php

@@ -3,21 +3,32 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Wishlist\Controller\Shared;
 
+use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
-use Magento\Wishlist\Model\ItemCarrier;
+use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Controller\Result\Forward;
+use Magento\Framework\Controller\Result\Redirect;
 use Magento\Framework\Controller\ResultFactory;
+use Magento\Wishlist\Model\ItemCarrier;
 
-class Allcart extends \Magento\Framework\App\Action\Action
+/**
+ * Wishlist Allcart Controller
+ */
+class Allcart extends Action implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var WishlistProvider
      */
     protected $wishlistProvider;
 
     /**
-     * @var \Magento\Wishlist\Model\ItemCarrier
+     * @var ItemCarrier
      */
     protected $itemCarrier;
 
@@ -39,21 +50,22 @@ public function __construct(
     /**
      * Add all items from wishlist to shopping cart
      *
-     * @return \Magento\Framework\Controller\ResultInterface
+     * {@inheritDoc}
      */
     public function execute()
     {
         $wishlist = $this->wishlistProvider->getWishlist();
         if (!$wishlist) {
-            /** @var \Magento\Framework\Controller\Result\Forward $resultForward */
+            /** @var Forward $resultForward */
             $resultForward = $this->resultFactory->create(ResultFactory::TYPE_FORWARD);
             $resultForward->forward('noroute');
             return $resultForward;
         }
         $redirectUrl = $this->itemCarrier->moveAllToCart($wishlist, $this->getRequest()->getParam('qty'));
-        /** @var \Magento\Framework\Controller\Result\Redirect $resultRedirect */
+        /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setUrl($redirectUrl);
+
         return $resultRedirect;
     }
 }

app/code/Magento/Wishlist/Controller/Shared/Cart.php

@@ -13,7 +13,7 @@
 use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context as ActionContext;
 use Magento\Framework\App\Action\HttpPostActionInterface;
-use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Escaper;
 use Magento\Framework\Exception\LocalizedException;
@@ -124,9 +124,11 @@ public function execute()
         } catch (\Exception $e) {
             $this->messageManager->addExceptionMessage($e, __('We can\'t add the item to the cart right now.'));
         }
-        /** @var Redirect $resultRedirect */
+
+        /** @var ResultRedirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setUrl($redirectUrl);
+
         return $resultRedirect;
     }
 }

app/code/Magento/Wishlist/Test/Unit/Controller/Shared/AllcartTest.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 declare(strict_types=1);
 
 namespace Magento\Wishlist\Test\Unit\Controller\Shared;
@@ -20,83 +21,60 @@
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * Test for \Magento\Wishlist\Controller\Shared\Allcart.
+ */
 class AllcartTest extends TestCase
 {
     /**
      * @var Allcart
      */
-    protected $allcartController;
-
-    /**
-     * @var \Magento\Framework\TestFramework\Unit\Helper\ObjectManager
-     */
-    protected $objectManagerHelper;
-
-    /**
-     * @var Context
-     */
-    protected $context;
+    private $allcartController;
 
     /**
      * @var WishlistProvider|MockObject
      */
-    protected $wishlistProviderMock;
+    private $wishlistProviderMock;
 
     /**
      * @var ItemCarrier|MockObject
      */
-    protected $itemCarrierMock;
+    private $itemCarrierMock;
 
     /**
      * @var Wishlist|MockObject
      */
-    protected $wishlistMock;
+    private $wishlistMock;
 
     /**
      * @var Http|MockObject
      */
-    protected $requestMock;
-
-    /**
-     * @var ResultFactory|MockObject
-     */
-    protected $resultFactoryMock;
+    private $requestMock;
 
     /**
      * @var Redirect|MockObject
      */
-    protected $resultRedirectMock;
+    private $resultRedirectMock;
 
     /**
      * @var Forward|MockObject
      */
-    protected $resultForwardMock;
+    private $resultForwardMock;
 
+    /**
+     * @inheritDoc
+     */
     protected function setUp(): void
     {
-        $this->wishlistProviderMock = $this->getMockBuilder(WishlistProvider::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->itemCarrierMock = $this->getMockBuilder(ItemCarrier::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->wishlistMock = $this->getMockBuilder(Wishlist::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->requestMock = $this->getMockBuilder(Http::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->resultFactoryMock = $this->getMockBuilder(ResultFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->resultRedirectMock = $this->getMockBuilder(Redirect::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->resultForwardMock = $this->getMockBuilder(Forward::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-
-        $this->resultFactoryMock->expects($this->any())
+        $this->wishlistProviderMock = $this->createMock(WishlistProvider::class);
+        $this->itemCarrierMock = $this->createMock(ItemCarrier::class);
+        $this->wishlistMock = $this->createMock(Wishlist::class);
+        $this->requestMock = $this->createMock(Http::class);
+        $resultFactoryMock = $this->createMock(ResultFactory::class);
+        $this->resultRedirectMock = $this->createMock(Redirect::class);
+        $this->resultForwardMock = $this->createMock(Forward::class);
+
+        $resultFactoryMock->expects($this->any())
             ->method('create')
             ->willReturnMap(
                 [
@@ -105,18 +83,18 @@ protected function setUp(): void
                 ]
             );
 
-        $this->objectManagerHelper = new ObjectManagerHelper($this);
-        $this->context = $this->objectManagerHelper->getObject(
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $context = $objectManagerHelper->getObject(
             Context::class,
             [
                 'request' => $this->requestMock,
-                'resultFactory' => $this->resultFactoryMock
+                'resultFactory' => $resultFactoryMock
             ]
         );
-        $this->allcartController = $this->objectManagerHelper->getObject(
+        $this->allcartController = $objectManagerHelper->getObject(
             Allcart::class,
             [
-                'context' => $this->context,
+                'context' => $context,
                 'wishlistProvider' => $this->wishlistProviderMock,
                 'itemCarrier' => $this->itemCarrierMock
             ]