Merge remote-tracking branch 'origin/MAGETWO-21349' into MAGETWO-21349

Author: Sergey Semenov

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

@@ -5,55 +5,47 @@
  */
 namespace Magento\Checkout\Controller\Sidebar;
 
-use Magento\Checkout\Controller\Cart;
-use Magento\Checkout\Model\Cart as CustomerCart;
-use Magento\Checkout\Model\Session;
 use Magento\Checkout\Model\Sidebar;
+use Magento\Framework\App\Action\Action;
 use Magento\Framework\App\Action\Context;
-use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Response\Http;
-use Magento\Framework\Controller\Result\RedirectFactory;
-use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Exception\LocalizedException;
-use Magento\Store\Model\StoreManagerInterface;
+use Magento\Framework\Json\Helper\Data;
+use Psr\Log\LoggerInterface;
 
-class UpdateItemQty extends Cart
+class UpdateItemQty extends Action
 {
     /**
      * @var Sidebar
      */
     protected $sidebar;
 
+    /**
+     * @var LoggerInterface
+     */
+    protected $logger;
+
+    /**
+     * @var Data
+     */
+    protected $jsonHelper;
+
     /**
      * @param Context $context
-     * @param ScopeConfigInterface $scopeConfig
-     * @param Session $checkoutSession
-     * @param StoreManagerInterface $storeManager
-     * @param Validator $formKeyValidator
-     * @param CustomerCart $cart
-     * @param RedirectFactory $resultRedirectFactory
      * @param Sidebar $sidebar
+     * @param LoggerInterface $logger
+     * @param Data $jsonHelper
      */
     public function __construct(
         Context $context,
-        ScopeConfigInterface $scopeConfig,
-        Session $checkoutSession,
-        StoreManagerInterface $storeManager,
-        Validator $formKeyValidator,
-        CustomerCart $cart,
-        RedirectFactory $resultRedirectFactory,
-        Sidebar $sidebar
+        Sidebar $sidebar,
+        LoggerInterface $logger,
+        Data $jsonHelper
     ) {
         $this->sidebar = $sidebar;
-        parent::__construct(
-            $context,
-            $scopeConfig,
-            $checkoutSession,
-            $storeManager,
-            $formKeyValidator,
-            $cart,
-            $resultRedirectFactory
-        );
+        $this->logger = $logger;
+        $this->jsonHelper = $jsonHelper;
+        parent::__construct($context);
     }
 
     /**
@@ -71,7 +63,7 @@ public function execute()
         } catch (LocalizedException $e) {
             return $this->jsonResponse($e->getMessage());
         } catch (\Exception $e) {
-            $this->_objectManager->get('Psr\Log\LoggerInterface')->critical($e);
+            $this->logger->critical($e);
             return $this->jsonResponse($e->getMessage());
         }
     }
@@ -82,11 +74,10 @@ public function execute()
      * @param string $error
      * @return Http
      */
-    public function jsonResponse($error = '')
+    protected function jsonResponse($error = '')
     {
         return $this->getResponse()->representJson(
-            $this->_objectManager->get('Magento\Framework\Json\Helper\Data')
-                ->jsonEncode($this->sidebar->getResponseData($error))
+            $this->jsonHelper->jsonEncode($this->sidebar->getResponseData($error))
         );
     }
 }

app/code/Magento/Checkout/Model/Sidebar.php

@@ -115,14 +115,8 @@ public function removeQuoteItem($itemId)
      */
     public function updateQuoteItem($itemId, $itemQty)
     {
-        $item = $this->cart->updateItem($itemId, $this->normalize($itemQty));
-        if (is_string($item)) {
-            throw new LocalizedException(__($item));
-        }
-        if ($item->getHasError()) {
-            throw new LocalizedException(__($item->getMessage()));
-        }
-        $this->cart->save();
+        $itemData = [$itemId => ['qty' => $this->normalize($itemQty)]];
+        $this->cart->updateItems($itemData)->save();
         return $this;
     }