impr

Author: engcom-Charlie

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

@@ -16,30 +16,33 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Wishlist\Model\ItemCarrier;
 
+/**
+ * Wishlist Allcart Controller
+ */
 class Allcart extends Action implements HttpGetActionInterface
 {
     /**
-     * @var ItemCarrier
+     * @var WishlistProvider
      */
-    private $itemCarrier;
+    protected $wishlistProvider;
 
     /**
-     * @var WishlistProvider
+     * @var ItemCarrier
      */
-    private $wishlistProvider;
+    protected $itemCarrier;
 
     /**
      * @param Context $context
-     * @param ItemCarrier $itemCarrier
      * @param WishlistProvider $wishlistProvider
+     * @param ItemCarrier $itemCarrier
      */
     public function __construct(
         Context $context,
-        ItemCarrier $itemCarrier,
-        WishlistProvider $wishlistProvider
+        WishlistProvider $wishlistProvider,
+        ItemCarrier $itemCarrier
     ) {
-        $this->itemCarrier = $itemCarrier;
         $this->wishlistProvider = $wishlistProvider;
+        $this->itemCarrier = $itemCarrier;
         parent::__construct($context);
     }
 
@@ -61,6 +64,7 @@ public function execute()
         /** @var Redirect $resultRedirect */
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         $resultRedirect->setUrl($redirectUrl);
+
         return $resultRedirect;
     }
 }

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

@@ -33,27 +33,27 @@ class Cart extends Action implements HttpGetActionInterface
     /**
      * @var CustomerCart
      */
-    private $cart;
+    protected $cart;
 
     /**
      * @var OptionFactory
      */
-    private $optionFactory;
+    protected $optionFactory;
 
     /**
      * @var ItemFactory
      */
-    private $itemFactory;
+    protected $itemFactory;
 
     /**
      * @var CartHelper
      */
-    private $cartHelper;
+    protected $cartHelper;
 
     /**
      * @var Escaper
      */
-    private $escaper;
+    protected $escaper;
 
     /**
      * @param ActionContext $context
@@ -128,6 +128,7 @@ public function execute()
         /** @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 ObjectManagerHelper
-     */
-    protected $objectManagerHelper;
+    private $allcartController;
 
     /**
      * @var WishlistProvider|MockObject
      */
-    protected $wishlistProviderMock;
-
-    /**
-     * @var Context|MockObject
-     */
-    protected $context;
+    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,19 +83,21 @@ 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 = new Allcart(
-            $this->context,
-            $this->itemCarrierMock,
-            $this->wishlistProviderMock
+        $this->allcartController = $objectManagerHelper->getObject(
+            Allcart::class,
+            [
+                'context' => $context,
+                'wishlistProvider' => $this->wishlistProviderMock,
+                'itemCarrier' => $this->itemCarrierMock
+            ]
         );
     }