ENGCOM-5790: fix issue #24366 - Updating cart quantity #24380

 - Merge Pull Request #24380 from GDauer/magento2:bugfix
 - Merged commits:
   1. 48ae1fc
   2. cc78567
   3. 0a67f76
   4. d2a09d3
   5. 720799b
   6. 57a3546
   7. 650c215

Author: magento-engcom-team

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

@@ -8,16 +8,25 @@
 namespace Magento\Checkout\Controller\Cart;
 
 use Magento\Checkout\Model\Cart\RequestQuantityProcessor;
+use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Checkout\Model\Session as CheckoutSession;
+use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Serialize\Serializer\Json;
-use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
 use Magento\Quote\Model\Quote\Item;
 use Psr\Log\LoggerInterface;
 
-class UpdateItemQty extends \Magento\Framework\App\Action\Action
+/**
+ * UpdateItemQty ajax request
+ *
+ * @package Magento\Checkout\Controller\Cart
+ */
+class UpdateItemQty extends Action implements HttpPostActionInterface
 {
+
     /**
      * @var RequestQuantityProcessor
      */
@@ -44,13 +53,16 @@ class UpdateItemQty extends \Magento\Framework\App\Action\Action
     private $logger;
 
     /**
-     * @param Context $context,
+     * UpdateItemQty constructor
+     *
+     * @param Context $context
      * @param RequestQuantityProcessor $quantityProcessor
      * @param FormKeyValidator $formKeyValidator
      * @param CheckoutSession $checkoutSession
      * @param Json $json
      * @param LoggerInterface $logger
      */
+
     public function __construct(
         Context $context,
         RequestQuantityProcessor $quantityProcessor,
@@ -68,30 +80,26 @@ public function __construct(
     }
 
     /**
+     * Controller execute method
+     *
      * @return void
      */
     public function execute()
     {
         try {
-            if (!$this->formKeyValidator->validate($this->getRequest())) {
-                throw new LocalizedException(
-                    __('Something went wrong while saving the page. Please refresh the page and try again.')
-                );
-            }
+            $this->validateRequest();
+            $this->validateFormKey();
 
             $cartData = $this->getRequest()->getParam('cart');
-            if (!is_array($cartData)) {
-                throw new LocalizedException(
-                    __('Something went wrong while saving the page. Please refresh the page and try again.')
-                );
-            }
+
+            $this->validateCartData($cartData);
 
             $cartData = $this->quantityProcessor->process($cartData);
             $quote = $this->checkoutSession->getQuote();
 
             foreach ($cartData as $itemId => $itemInfo) {
                 $item = $quote->getItemById($itemId);
-                $qty = isset($itemInfo['qty']) ? (double)$itemInfo['qty'] : 0;
+                $qty = isset($itemInfo['qty']) ? (double) $itemInfo['qty'] : 0;
                 if ($item) {
                     $this->updateItemQuantity($item, $qty);
                 }
@@ -111,11 +119,13 @@ public function execute()
      *
      * @param Item $item
      * @param float $qty
+     * @return void
      * @throws LocalizedException
      */
     private function updateItemQuantity(Item $item, float $qty)
     {
         if ($qty > 0) {
+            $item->clearMessage();
             $item->setQty($qty);
 
             if ($item->getHasError()) {
@@ -145,9 +155,7 @@ private function jsonResponse(string $error = '')
      */
     private function getResponseData(string $error = ''): array
     {
-        $response = [
-            'success' => true,
-        ];
+        $response = ['success' => true];
 
         if (!empty($error)) {
             $response = [
@@ -158,4 +166,48 @@ private function getResponseData(string $error = ''): array
 
         return $response;
     }
+
+    /**
+     * Validates the Request HTTP method
+     *
+     * @return void
+     * @throws NotFoundException
+     */
+    private function validateRequest()
+    {
+        if ($this->getRequest()->isPost() === false) {
+            throw new NotFoundException(__('Page Not Found'));
+        }
+    }
+
+    /**
+     * Validates form key
+     *
+     * @return void
+     * @throws LocalizedException
+     */
+    private function validateFormKey()
+    {
+        if (!$this->formKeyValidator->validate($this->getRequest())) {
+            throw new LocalizedException(
+                __('Something went wrong while saving the page. Please refresh the page and try again.')
+            );
+        }
+    }
+
+    /**
+     * Validates cart data
+     *
+     * @param array|null $cartData
+     * @return void
+     * @throws LocalizedException
+     */
+    private function validateCartData($cartData = null)
+    {
+        if (!is_array($cartData)) {
+            throw new LocalizedException(
+                __('Something went wrong while saving the page. Please refresh the page and try again.')
+            );
+        }
+    }
 }

dev/tests/integration/testsuite/Magento/Checkout/Controller/Cart/UpdateItemQtyTest.php

@@ -10,6 +10,7 @@
 use Magento\Catalog\Model\Product;
 use Magento\Checkout\Model\Session;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\App\Request\Http as HttpRequest;
 use Magento\Framework\Data\Form\FormKey;
 use Magento\Framework\Serialize\Serializer\Json;
 
@@ -81,6 +82,7 @@ public function testExecute($requestQuantity, $expectedResponse)
             ];
         }
 
+        $this->getRequest()->setMethod(HttpRequest::METHOD_POST);
         $this->getRequest()->setPostValue($request);
         $this->dispatch('checkout/cart/updateItemQty');
         $response = $this->getResponse()->getBody();