MAGETWO-69683: Bugfix > Adding Success Message > Recent Ordered #9852

- fixed backward compatibility issue
magento · Jul 7, 2017 · 98478af · 98478af
1 parent f42f550
commit 98478af
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 16 deletions.
diff --git a/app/code/Magento/Checkout/Controller/Cart.php b/app/code/Magento/Checkout/Controller/Cart.php
@@ -38,19 +38,13 @@ abstract class Cart extends \Magento\Framework\App\Action\Action implements View
      */
     protected $cart;
 
-    /**
-    * @var \Magento\Framework\Escaper
-    */
-    protected $escaper;
-
     /**
      * @param \Magento\Framework\App\Action\Context $context
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param CustomerCart $cart
-     * @param \Magento\Framework\Escaper $escaper
      * @codeCoverageIgnore
      */
     public function __construct(
@@ -59,15 +53,13 @@ public function __construct(
         \Magento\Checkout\Model\Session $checkoutSession,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
-        CustomerCart $cart,
-        \Magento\Framework\Escaper $escaper = null
+        CustomerCart $cart
     ) {
         $this->_formKeyValidator = $formKeyValidator;
         $this->_scopeConfig = $scopeConfig;
         $this->_checkoutSession = $checkoutSession;
         $this->_storeManager = $storeManager;
-        $this->cart = $cart;        
-        $this->escaper = $escaper ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Framework\Escaper::class);
+        $this->cart = $cart;
         parent::__construct($context);
     }
 
@@ -85,7 +77,7 @@ protected function _goBack($backUrl = null)
         if ($backUrl || $backUrl = $this->getBackUrl($this->_redirect->getRefererUrl())) {
             $resultRedirect->setUrl($backUrl);
         }
-        
+
         return $resultRedirect;
     }
 

diff --git a/app/code/Magento/Checkout/Controller/Cart/Addgroup.php b/app/code/Magento/Checkout/Controller/Cart/Addgroup.php
@@ -6,8 +6,39 @@
  */
 namespace Magento\Checkout\Controller\Cart;
 
+use Magento\Checkout\Model\Cart as CustomerCart;
+use Magento\Framework\Escaper;
+use Magento\Framework\App\ObjectManager;
+
 class Addgroup extends \Magento\Checkout\Controller\Cart
 {
+    /**
+     * @var Escaper
+     */
+    private $escaper;
+
+    /**
+     * @param \Magento\Framework\App\Action\Context $context
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+     * @param \Magento\Checkout\Model\Session $checkoutSession
+     * @param \Magento\Store\Model\StoreManagerInterface $storeManager
+     * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
+     * @param CustomerCart $cart
+     * @param Escaper|null $escaper
+     */
+    public function __construct(
+        \Magento\Framework\App\Action\Context $context,
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Checkout\Model\Session $checkoutSession,
+        \Magento\Store\Model\StoreManagerInterface $storeManager,
+        \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
+        CustomerCart $cart,
+        Escaper $escaper = null
+    ) {
+        $this->escaper = $escaper ?: ObjectManager::getInstance()->get(\Magento\Framework\Escaper::class);
+        parent::__construct($context, $scopeConfig, $checkoutSession, $storeManager, $formKeyValidator, $cart);
+    }
+
     /**
      * @return \Magento\Framework\Controller\Result\Redirect
      */
@@ -25,7 +56,7 @@ public function execute()
                     $this->cart->addOrderItem($item, 1);
                     if (!$this->cart->getQuote()->getHasError()) {
                         $message = __(
-                             'You added %1 to your shopping cart.',                             
+                             'You added %1 to your shopping cart.',
                              $this->escaper->escapeHtml($item->getName())
                         );
                         $this->messageManager->addSuccessMessage($message);

diff --git a/app/code/Magento/Checkout/Controller/Cart/Index.php b/app/code/Magento/Checkout/Controller/Cart/Index.php
@@ -21,7 +21,6 @@ class Index extends \Magento\Checkout\Controller\Cart
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator
      * @param \Magento\Checkout\Model\Cart $cart
-     * @param \Magento\Framework\Escaper $escaper
      * @param \Magento\Framework\View\Result\PageFactory $resultPageFactory
      * @codeCoverageIgnore
      */
@@ -32,7 +31,6 @@ public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Framework\Data\Form\FormKey\Validator $formKeyValidator,
         \Magento\Checkout\Model\Cart $cart,
-        \Magento\Framework\Escaper $escaper,
         \Magento\Framework\View\Result\PageFactory $resultPageFactory
     ) {
         parent::__construct(
@@ -41,8 +39,7 @@ public function __construct(
             $checkoutSession,
             $storeManager,
             $formKeyValidator,
-            $cart,            
-            $escaper
+            $cart
         );
         $this->resultPageFactory = $resultPageFactory;
     }