Skip to content

Commit 0d28972

Browse files
author
Yurii Torbyk
committed
MAGETWO-33058: Refactor Checkout module
1 parent 1e2f5ea commit 0d28972

File tree

7 files changed

+19
-92
lines changed

7 files changed

+19
-92
lines changed

‎app/code/Magento/Checkout/Controller/Cart/Add.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
use Magento\Checkout\Model\Cart as CustomerCart;
1414
use Magento\Framework\Exception\NoSuchEntityException;
1515

16+
/**
17+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
18+
*/
1619
class Add extends \Magento\Checkout\Controller\Cart
1720
{
1821
/**

‎app/code/Magento/Checkout/Controller/Cart/Configure.php

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -6,45 +6,8 @@
66
*/
77
namespace Magento\Checkout\Controller\Cart;
88

9-
class Configure extends \Magento\Checkout\Controller\Cart
9+
class Configure extends \Magento\Checkout\Controller\Cart\Index
1010
{
11-
/**
12-
* @var \Magento\Framework\View\Result\PageFactory
13-
*/
14-
protected $resultPageFactory;
15-
16-
/**
17-
* @param \Magento\Framework\App\Action\Context $context
18-
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
19-
* @param \Magento\Checkout\Model\Session $checkoutSession
20-
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
21-
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
22-
* @param \Magento\Checkout\Model\Cart $cart
23-
* @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
24-
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
25-
*/
26-
public function __construct(
27-
\Magento\Framework\App\Action\Context $context,
28-
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
29-
\Magento\Checkout\Model\Session $checkoutSession,
30-
\Magento\Store\Model\StoreManagerInterface $storeManager,
31-
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
32-
\Magento\Checkout\Model\Cart $cart,
33-
\Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
34-
\Magento\Framework\View\Result\PageFactory $resultPageFactory
35-
) {
36-
parent::__construct(
37-
$context,
38-
$scopeConfig,
39-
$checkoutSession,
40-
$storeManager,
41-
$formKeyValidator,
42-
$cart,
43-
$resultRedirectFactory
44-
);
45-
$this->resultPageFactory = $resultPageFactory;
46-
}
47-
4811
/**
4912
* Action to reconfigure cart item
5013
*

‎app/code/Magento/Checkout/Controller/Cart/CouponPost.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Checkout\Controller\Cart;
87

9-
use Magento\Checkout\Model\Cart as CustomerCart;
10-
118
class CouponPost extends \Magento\Checkout\Controller\Cart
129
{
1310
/**
@@ -23,7 +20,7 @@ class CouponPost extends \Magento\Checkout\Controller\Cart
2320
* @param \Magento\Checkout\Model\Session $checkoutSession
2421
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
2522
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
26-
* @param CustomerCart $cart
23+
* @param \Magento\Checkout\Model\Cart $cart
2724
* @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
2825
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
2926
*/
@@ -33,7 +30,7 @@ public function __construct(
3330
\Magento\Checkout\Model\Session $checkoutSession,
3431
\Magento\Store\Model\StoreManagerInterface $storeManager,
3532
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
36-
CustomerCart $cart,
33+
\Magento\Checkout\Model\Cart $cart,
3734
\Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
3835
\Magento\Quote\Model\QuoteRepository $quoteRepository
3936
) {

‎app/code/Magento/Checkout/Controller/Cart/EstimatePost.php

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,14 @@
11
<?php
22
/**
3-
*
43
* Copyright © 2015 Magento. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Checkout\Controller\Cart;
87

98
use Magento\Checkout\Model\Cart as CustomerCart;
109

11-
class EstimatePost extends \Magento\Checkout\Controller\Cart
10+
class EstimatePost extends \Magento\Checkout\Controller\Cart\CouponPost
1211
{
13-
/**
14-
* @var \Magento\Quote\Model\QuoteRepository
15-
*/
16-
protected $quoteRepository;
17-
18-
/**
19-
* @param \Magento\Framework\App\Action\Context $context
20-
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
21-
* @param \Magento\Checkout\Model\Session $checkoutSession
22-
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
23-
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
24-
* @param CustomerCart $cart
25-
* @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
26-
* @param \Magento\Quote\Model\QuoteRepository $quoteRepository
27-
*/
28-
public function __construct(
29-
\Magento\Framework\App\Action\Context $context,
30-
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
31-
\Magento\Checkout\Model\Session $checkoutSession,
32-
\Magento\Store\Model\StoreManagerInterface $storeManager,
33-
\Magento\Core\App\Action\FormKeyValidator $formKeyValidator,
34-
CustomerCart $cart,
35-
\Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory,
36-
\Magento\Quote\Model\QuoteRepository $quoteRepository
37-
) {
38-
$this->quoteRepository = $quoteRepository;
39-
parent::__construct(
40-
$context,
41-
$scopeConfig,
42-
$checkoutSession,
43-
$storeManager,
44-
$formKeyValidator,
45-
$cart,
46-
$resultRedirectFactory
47-
);
48-
}
49-
5012
/**
5113
* Initialize shipping information
5214
*

‎app/code/Magento/Checkout/Controller/Cart/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class Index extends \Magento\Checkout\Controller\Cart
2222
* @param \Magento\Checkout\Model\Session $checkoutSession
2323
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
2424
* @param \Magento\Core\App\Action\FormKeyValidator $formKeyValidator
25-
* @param CustomerCart $cart
25+
* @param \Magento\Checkout\Model\Cart $cart
2626
* @param \Magento\Framework\Controller\Result\RedirectFactory $resultRedirectFactory
2727
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
2828
*/

‎app/code/Magento/Checkout/Controller/Onepage/ShippingMethod.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ public function execute()
1717
return $this->_ajaxRedirectResponse();
1818
}
1919

20-
$this->resultLayoutFactory->create();
20+
return $this->resultLayoutFactory->create();
2121
}
2222
}

‎dev/tests/unit/testsuite/Magento/Checkout/Controller/Cart/ConfigureTest.php

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,14 +80,16 @@ public function setUp()
8080

8181
$objectManagerHelper = new \Magento\TestFramework\Helper\ObjectManager($this);
8282

83-
$this->configureController = $objectManagerHelper->getObject('Magento\Checkout\Controller\Cart\Configure', [
84-
'request' => $this->requestMock,
85-
'response' => $this->responseMock,
86-
'objectManager' => $this->objectManagerMock,
87-
'messageManager' => $this->messageManagerMock,
88-
'cart' => $this->cartMock,
89-
'resultPageFactory' => $this->resultPageFactoryMock,
90-
'resultRedirectFactory' => $resultRedirectFactoryMock
83+
$this->configureController = $objectManagerHelper->getObject(
84+
'Magento\Checkout\Controller\Cart\Configure',
85+
[
86+
'request' => $this->requestMock,
87+
'response' => $this->responseMock,
88+
'objectManager' => $this->objectManagerMock,
89+
'messageManager' => $this->messageManagerMock,
90+
'cart' => $this->cartMock,
91+
'resultPageFactory' => $this->resultPageFactoryMock,
92+
'resultRedirectFactory' => $resultRedirectFactoryMock
9193
]
9294
);
9395
}

0 commit comments

Comments
 (0)