Skip to content

Commit 4a85364

Browse files
author
Rudolf Vince
committed
added extend Action back, updated tests
1 parent 2ce3982 commit 4a85364

File tree

4 files changed

+24
-9
lines changed

4 files changed

+24
-9
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@
88

99
namespace Magento\Wishlist\Controller\Shared;
1010

11+
use Magento\Framework\App\Action\Action;
12+
use Magento\Framework\App\Action\Context;
1113
use Magento\Framework\App\Action\HttpGetActionInterface;
1214
use Magento\Framework\App\RequestInterface;
13-
use Magento\Framework\Controller\ResultFactory;
1415
use Magento\Framework\Controller\Result\Forward;
1516
use Magento\Framework\Controller\Result\Redirect;
17+
use Magento\Framework\Controller\ResultFactory;
1618
use Magento\Wishlist\Model\ItemCarrier;
1719

18-
class Allcart implements HttpGetActionInterface
20+
class Allcart extends Action implements HttpGetActionInterface
1921
{
2022
/**
2123
* @var ItemCarrier
@@ -38,12 +40,14 @@ class Allcart implements HttpGetActionInterface
3840
private $resultFactory;
3941

4042
/**
43+
* @param Context $context
4144
* @param ItemCarrier $itemCarrier
4245
* @param RequestInterface $request
4346
* @param ResultFactory $resultFactory
4447
* @param WishlistProvider $wishlistProvider
4548
*/
4649
public function __construct(
50+
Context $context,
4751
ItemCarrier $itemCarrier,
4852
RequestInterface $request,
4953
ResultFactory $resultFactory,
@@ -53,6 +57,7 @@ public function __construct(
5357
$this->request = $request;
5458
$this->resultFactory = $resultFactory;
5559
$this->wishlistProvider = $wishlistProvider;
60+
parent::__construct($context);
5661
}
5762

5863
/**

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@
1111
use Magento\Catalog\Model\Product\Exception as ProductException;
1212
use Magento\Checkout\Helper\Cart as CartHelper;
1313
use Magento\Checkout\Model\Cart as CustomerCart;
14+
use Magento\Framework\App\Action\Action;
15+
use Magento\Framework\App\Action\Context as ActionContext;
1416
use Magento\Framework\App\Action\HttpGetActionInterface;
1517
use Magento\Framework\App\RequestInterface;
16-
use Magento\Framework\Controller\ResultFactory;
18+
use Magento\Framework\App\Response\RedirectInterface;
1719
use Magento\Framework\Controller\Result\Redirect as ResultRedirect;
20+
use Magento\Framework\Controller\ResultFactory;
1821
use Magento\Framework\Escaper;
1922
use Magento\Framework\Exception\LocalizedException;
2023
use Magento\Framework\Message\ManagerInterface as MessageManagerInterface;
21-
use Magento\Framework\App\Response\RedirectInterface;
2224
use Magento\Wishlist\Model\Item;
2325
use Magento\Wishlist\Model\Item\OptionFactory;
2426
use Magento\Wishlist\Model\ItemFactory;
@@ -29,7 +31,7 @@
2931
*
3032
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
3133
*/
32-
class Cart implements HttpGetActionInterface
34+
class Cart extends Action implements HttpGetActionInterface
3335
{
3436
/**
3537
* @var CustomerCart
@@ -77,6 +79,7 @@ class Cart implements HttpGetActionInterface
7779
private $resultFactory;
7880

7981
/**
82+
* @param ActionContext $context
8083
* @param CustomerCart $cart
8184
* @param OptionFactory $optionFactory
8285
* @param ItemFactory $itemFactory
@@ -88,6 +91,7 @@ class Cart implements HttpGetActionInterface
8891
* @param ResultFactory $resultFactory
8992
*/
9093
public function __construct(
94+
ActionContext $context,
9195
CustomerCart $cart,
9296
OptionFactory $optionFactory,
9397
ItemFactory $itemFactory,
@@ -107,6 +111,7 @@ public function __construct(
107111
$this->redirect = $redirect;
108112
$this->messageManager = $messageManager;
109113
$this->resultFactory = $resultFactory;
114+
parent::__construct($context);
110115
}
111116

112117
/**

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ class AllcartTest extends TestCase
2727
protected $allcartController;
2828

2929
/**
30-
* @var Context
30+
* @var WishlistProvider|MockObject
3131
*/
32-
protected $context;
32+
protected $wishlistProviderMock;
3333

3434
/**
35-
* @var WishlistProvider|MockObject
35+
* @var Context|MockObject
3636
*/
37-
protected $wishlistProviderMock;
37+
protected $contextMock;
3838

3939
/**
4040
* @var ItemCarrier|MockObject
@@ -74,6 +74,9 @@ protected function setUp(): void
7474
$this->itemCarrierMock = $this->getMockBuilder(ItemCarrier::class)
7575
->disableOriginalConstructor()
7676
->getMock();
77+
$this->contextMock = $this->getMockBuilder(Context::class)
78+
->disableOriginalConstructor()
79+
->getMock();
7780
$this->wishlistMock = $this->getMockBuilder(Wishlist::class)
7881
->disableOriginalConstructor()
7982
->getMock();
@@ -100,6 +103,7 @@ protected function setUp(): void
100103
);
101104

102105
$this->allcartController = new Allcart(
106+
$this->contextMock,
103107
$this->itemCarrierMock,
104108
$this->requestMock,
105109
$this->resultFactoryMock,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ protected function setUp(): void
178178
->getMock();
179179

180180
$this->model = new SharedCart(
181+
$this->context,
181182
$this->cart,
182183
$this->optionFactory,
183184
$this->itemFactory,

0 commit comments

Comments
 (0)