Merge branch 'MAGETWO-39255' of https://github.corp.magento.com/magento-firedrakes/magento2ce into MAGETWO-39255

Author: Dmytro Voskoboinikov

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -1637,7 +1637,7 @@ public function addAttributeToSort($attribute, $dir = self::SORT_ORDER_ASC)
         $storeId = $this->getStoreId();
         if ($attribute == 'price' && $storeId != 0) {
             $this->addPriceData();
-            if ($this->_productLimitationFilters->isUsePriceIndex()) {
+            if ($this->_productLimitationFilters->isUsingPriceIndex()) {
                 $this->getSelect()->order("price_index.min_price {$dir}");
                 return $this;
             }
@@ -1856,7 +1856,7 @@ protected function _productLimitationJoinPrice()
     protected function _productLimitationPrice($joinLeft = false)
     {
         $filters = $this->_productLimitationFilters;
-        if (!$filters->isUsePriceIndex()) {
+        if (!$filters->isUsingPriceIndex()) {
             return $this;
         }
 

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection/ProductLimitation.php

@@ -117,7 +117,7 @@ public function getStoreTable()
      *
      * @return bool
      */
-    public function isUsePriceIndex()
+    public function isUsingPriceIndex()
     {
         return $this->offsetExists('use_price_index') ? (bool)$this->offsetGet('use_price_index') : false;
     }

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/Collection/ProductLimitationTest.php

@@ -26,8 +26,8 @@ protected function setUp()
 
     public function testGetUsePriceIndex()
     {
-        $this->assertFalse($this->productLimitation->isUsePriceIndex());
+        $this->assertFalse($this->productLimitation->isUsingPriceIndex());
         $this->productLimitation->setUsePriceIndex(true);
-        $this->assertTrue($this->productLimitation->isUsePriceIndex());
+        $this->assertTrue($this->productLimitation->isUsingPriceIndex());
     }
 }