Skip to content

Commit 98478af

Browse files
author
Oleksii Korshenko
committed
MAGETWO-69683: Bugfix > Adding Success Message > Recent Ordered #9852
- fixed backward compatibility issue
1 parent f42f550 commit 98478af

File tree

3 files changed

+36
-16
lines changed

3 files changed

+36
-16
lines changed

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,13 @@ abstract class Cart extends \Magento\Framework\App\Action\Action implements View
3838
*/
3939
protected $cart;
4040

41-
/**
42-
* @var \Magento\Framework\Escaper
43-
*/
44-
protected $escaper;
45-
4641
/**
4742
* @param \Magento\Framework\App\Action\Context $context
4843
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
4944
* @param \Magento\Checkout\Model\Session $checkoutSession
5045
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
5146
* @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
5247
* @param CustomerCart $cart
53-
* @param \Magento\Framework\Escaper $escaper
5448
* @codeCoverageIgnore
5549
*/
5650
public function __construct(
@@ -59,15 +53,13 @@ public function __construct(
5953
\Magento\Checkout\Model\Session $checkoutSession,
6054
\Magento\Store\Model\StoreManagerInterface $storeManager,
6155
\Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
62-
CustomerCart $cart,
63-
\Magento\Framework\Escaper $escaper = null
56+
CustomerCart $cart
6457
) {
6558
$this->_formKeyValidator = $formKeyValidator;
6659
$this->_scopeConfig = $scopeConfig;
6760
$this->_checkoutSession = $checkoutSession;
6861
$this->_storeManager = $storeManager;
69-
$this->cart = $cart;
70-
$this->escaper = $escaper ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Framework\Escaper::class);
62+
$this->cart = $cart;
7163
parent::__construct($context);
7264
}
7365

@@ -85,7 +77,7 @@ protected function _goBack($backUrl = null)
8577
if ($backUrl || $backUrl = $this->getBackUrl($this->_redirect->getRefererUrl())) {
8678
$resultRedirect->setUrl($backUrl);
8779
}
88-
80+
8981
return $resultRedirect;
9082
}
9183

app/code/Magento/Checkout/Controller/Cart/Addgroup.php

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,39 @@
66
*/
77
namespace Magento\Checkout\Controller\Cart;
88

9+
use Magento\Checkout\Model\Cart as CustomerCart;
10+
use Magento\Framework\Escaper;
11+
use Magento\Framework\App\ObjectManager;
12+
913
class Addgroup extends \Magento\Checkout\Controller\Cart
1014
{
15+
/**
16+
* @var Escaper
17+
*/
18+
private $escaper;
19+
20+
/**
21+
* @param \Magento\Framework\App\Action\Context $context
22+
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
23+
* @param \Magento\Checkout\Model\Session $checkoutSession
24+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
25+
* @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
26+
* @param CustomerCart $cart
27+
* @param Escaper|null $escaper
28+
*/
29+
public function __construct(
30+
\Magento\Framework\App\Action\Context $context,
31+
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
32+
\Magento\Checkout\Model\Session $checkoutSession,
33+
\Magento\Store\Model\StoreManagerInterface $storeManager,
34+
\Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
35+
CustomerCart $cart,
36+
Escaper $escaper = null
37+
) {
38+
$this->escaper = $escaper ?: ObjectManager::getInstance()->get(\Magento\Framework\Escaper::class);
39+
parent::__construct($context, $scopeConfig, $checkoutSession, $storeManager, $formKeyValidator, $cart);
40+
}
41+
1142
/**
1243
* @return \Magento\Framework\Controller\Result\Redirect
1344
*/
@@ -25,7 +56,7 @@ public function execute()
2556
$this->cart->addOrderItem($item, 1);
2657
if (!$this->cart->getQuote()->getHasError()) {
2758
$message = __(
28-
'You added %1 to your shopping cart.',
59+
'You added %1 to your shopping cart.',
2960
$this->escaper->escapeHtml($item->getName())
3061
);
3162
$this->messageManager->addSuccessMessage($message);

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class Index extends \Magento\Checkout\Controller\Cart
2121
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
2222
* @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
2323
* @param \Magento\Checkout\Model\Cart $cart
24-
* @param \Magento\Framework\Escaper $escaper
2524
* @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
2625
* @codeCoverageIgnore
2726
*/
@@ -32,7 +31,6 @@ public function __construct(
3231
\Magento\Store\Model\StoreManagerInterface $storeManager,
3332
\Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
3433
\Magento\Checkout\Model\Cart $cart,
35-
\Magento\Framework\Escaper $escaper,
3634
\Magento\Framework\View\Result\PageFactory $resultPageFactory
3735
) {
3836
parent::__construct(
@@ -41,8 +39,7 @@ public function __construct(
4139
$checkoutSession,
4240
$storeManager,
4341
$formKeyValidator,
44-
$cart,
45-
$escaper
42+
$cart
4643
);
4744
$this->resultPageFactory = $resultPageFactory;
4845
}

0 commit comments

Comments
 (0)