MAGETWO-32107: Stabilization and pull request

Author: Vladyslav Shcherbyna

app/code/Magento/Quote/Helper/Data.php

@@ -191,11 +191,11 @@ class Quote extends \Magento\Framework\Model\AbstractModel
     protected $_catalogProduct;
 
     /**
-     * Sales data
+     * Quote validator
      *
-     * @var \Magento\Quote\Helper\Data
+     * @var \Magento\Quote\Model\QuoteValidator
      */
-    protected $quoteDataHelper;
+    protected $quoteValidator;
 
     /**
      * Core store config
@@ -330,7 +330,7 @@ class Quote extends \Magento\Framework\Model\AbstractModel
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
-     * @param \Magento\Quote\Helper\Data $quoteDataHelper
+     * @param \Magento\Quote\Model\QuoteValidator $quoteValidator
      * @param \Magento\Catalog\Helper\Product $catalogProduct
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -363,7 +363,7 @@ class Quote extends \Magento\Framework\Model\AbstractModel
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
-        \Magento\Quote\Helper\Data $quoteDataHelper,
+        \Magento\Quote\Model\QuoteValidator $quoteValidator,
         \Magento\Catalog\Helper\Product $catalogProduct,
         \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -393,7 +393,7 @@ public function __construct(
         \Magento\Framework\Data\Collection\Db $resourceCollection = null,
         array $data = []
     ) {
-        $this->quoteDataHelper = $quoteDataHelper;
+        $this->quoteValidator = $quoteValidator;
         $this->_catalogProduct = $catalogProduct;
         $this->_scopeConfig = $scopeConfig;
         $this->_storeManager = $storeManager;
@@ -1698,8 +1698,8 @@ public function collectTotals()
             $this->setBaseGrandTotal((float)$this->getBaseGrandTotal() + $address->getBaseGrandTotal());
         }
 
-        $this->quoteDataHelper->checkQuoteAmount($this, $this->getGrandTotal());
-        $this->quoteDataHelper->checkQuoteAmount($this, $this->getBaseGrandTotal());
+        $this->quoteValidator->validateQuoteAmount($this, $this->getGrandTotal());
+        $this->quoteValidator->validateQuoteAmount($this, $this->getBaseGrandTotal());
 
         $this->setData('trigger_recollect', 0);
         $this->_validateCouponCode();

app/code/Magento/Quote/Model/Quote.php

@@ -13,16 +13,16 @@ class Subtotal extends \Magento\Quote\Model\Quote\Address\Total\AbstractTotal
     /**
      * Sales data
      *
-     * @var \Magento\Quote\Helper\Data
+     * @var \Magento\Quote\Model\QuoteValidator
      */
-    protected $quoteDataHelper = null;
+    protected $quoteValidator = null;
 
     /**
-     * @param \Magento\Quote\Helper\Data $quoteDataHelper
+     * @param \Magento\Quote\Model\QuoteValidator $quoteValidator
      */
-    public function __construct(\Magento\Quote\Helper\Data $quoteDataHelper)
+    public function __construct(\Magento\Quote\Model\QuoteValidator $quoteValidator)
     {
-        $this->quoteDataHelper = $quoteDataHelper;
+        $this->quoteValidator = $quoteValidator;
     }
 
     /**
@@ -62,8 +62,8 @@ public function collect(Address $address)
         /**
          * Initialize grand totals
          */
-        $this->quoteDataHelper->checkQuoteAmount($address->getQuote(), $address->getSubtotal());
-        $this->quoteDataHelper->checkQuoteAmount($address->getQuote(), $address->getBaseSubtotal());
+        $this->quoteValidator->validateQuoteAmount($address->getQuote(), $address->getSubtotal());
+        $this->quoteValidator->validateQuoteAmount($address->getQuote(), $address->getBaseSubtotal());
         return $this;
     }
 

app/code/Magento/Quote/Model/Quote/Address/Total/Subtotal.php

@@ -9,6 +9,27 @@
 
 class QuoteValidator
 {
+    /**
+     * Maximum available number
+     */
+    const MAXIMUM_AVAILABLE_NUMBER = 99999999;
+
+    /**
+     * Validate quote amount
+     *
+     * @param QuoteEntity $quote
+     * @param float $amount
+     * @return $this
+     */
+    public function validateQuoteAmount(QuoteEntity $quote, $amount)
+    {
+        if (!$quote->getHasError() && $amount >= self::MAXIMUM_AVAILABLE_NUMBER) {
+            $quote->setHasError(true);
+            $quote->addMessage(__('This item price or quantity is not valid for checkout.'));
+        }
+        return $this;
+    }
+
     /**
      * Validate quote before submit
      *

app/code/Magento/Quote/Model/QuoteValidator.php

@@ -2,17 +2,14 @@
 /**
  * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com)
  */
-namespace Magento\Quote\Helper;
+namespace Magento\Quote\Model;
 
-/**
- * Tests For Quote Data checker
- */
-class DataTest extends \PHPUnit_Framework_TestCase
+class QuoteValidatorTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Quote\Helper\Data
+     * @var \Magento\Quote\Model\QuoteValidator
      */
-    protected $helper;
+    protected $quoteValidator;
 
     /**
      * @var \PHPUnit_Framework_MockObject_MockObject | \Magento\Quote\Model\Quote
@@ -24,7 +21,7 @@ class DataTest extends \PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $this->helper = new \Magento\Quote\Helper\Data();
+        $this->quoteValidator = new \Magento\Quote\Model\QuoteValidator();
 
         $this->quoteMock = $this->getMockBuilder('Magento\Quote\Model\Quote')
             ->setMethods(['getHasError', 'setHasError', 'addMessage', '__wakeup'])
@@ -45,8 +42,8 @@ public function testCheckQuoteAmountExistingError()
             ->method('addMessage');
 
         $this->assertSame(
-            $this->helper,
-            $this->helper->checkQuoteAmount($this->quoteMock, Data::MAXIMUM_AVAILABLE_NUMBER + 1)
+            $this->quoteValidator,
+            $this->quoteValidator->validateQuoteAmount($this->quoteMock, QuoteValidator::MAXIMUM_AVAILABLE_NUMBER + 1)
         );
     }
 
@@ -63,8 +60,8 @@ public function testCheckQuoteAmountAmountLessThanAvailable()
             ->method('addMessage');
 
         $this->assertSame(
-            $this->helper,
-            $this->helper->checkQuoteAmount($this->quoteMock, Data::MAXIMUM_AVAILABLE_NUMBER - 1)
+            $this->quoteValidator,
+            $this->quoteValidator->validateQuoteAmount($this->quoteMock, QuoteValidator::MAXIMUM_AVAILABLE_NUMBER - 1)
         );
     }
 
@@ -83,8 +80,8 @@ public function testCheckQuoteAmountAmountGreaterThanAvailable()
             ->with(__('This item price or quantity is not valid for checkout.'));
 
         $this->assertSame(
-            $this->helper,
-            $this->helper->checkQuoteAmount($this->quoteMock, Data::MAXIMUM_AVAILABLE_NUMBER + 1)
+            $this->quoteValidator,
+            $this->quoteValidator->validateQuoteAmount($this->quoteMock, QuoteValidator::MAXIMUM_AVAILABLE_NUMBER + 1)
         );
     }
 }