MAGETWO-60246: [Backport] - [Github]Magento 2.1.1 Problem with change currency #6746 - for 2.1.x

Author: dhorytskyi

app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php

@@ -11,16 +11,13 @@
 
 /**
  * Test for \Magento\CatalogSearch\Model\Layer\Filter\Price
- * @SuppressWarnings(PHPMD.UnusedPrivateField)
  */
 class PriceTest extends \PHPUnit_Framework_TestCase
 {
-    private $itemDataBuilder;
-
     /**
-     * @var \Magento\Catalog\Model\Price|MockObject
+     * @var \Magento\Catalog\Model\Layer\Filter\Item\DataBuilder|MockObject
      */
-    private $price;
+    private $itemDataBuilder;
 
     /**
      * @var \Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection|MockObject
@@ -54,63 +51,49 @@ class PriceTest extends \PHPUnit_Framework_TestCase
     protected function setUp()
     {
         $this->request = $this->getMockBuilder('\Magento\Framework\App\RequestInterface')
-            ->disableOriginalConstructor()
-            ->setMethods(['getParam'])
             ->getMockForAbstractClass();
 
         $dataProviderFactory = $this->getMockBuilder('\Magento\Catalog\Model\Layer\Filter\DataProvider\PriceFactory')
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
-
         $this->dataProvider = $this->getMockBuilder('\Magento\Catalog\Model\Layer\Filter\DataProvider\Price')
             ->disableOriginalConstructor()
             ->setMethods(['setPriceId', 'getPrice'])
             ->getMock();
-
         $dataProviderFactory->expects($this->once())
             ->method('create')
             ->will($this->returnValue($this->dataProvider));
 
         $this->layer = $this->getMockBuilder('\Magento\Catalog\Model\Layer')
             ->disableOriginalConstructor()
-            ->setMethods(['getState', 'getProductCollection'])
             ->getMock();
 
         $this->state = $this->getMockBuilder('\Magento\Catalog\Model\Layer\State')
             ->disableOriginalConstructor()
-            ->setMethods(['addFilter'])
             ->getMock();
         $this->layer->expects($this->any())
             ->method('getState')
             ->will($this->returnValue($this->state));
 
-        $this->fulltextCollection = $this->fulltextCollection = $this->getMockBuilder(
+        $this->fulltextCollection = $this->getMockBuilder(
             '\Magento\CatalogSearch\Model\ResourceModel\Fulltext\Collection'
-        )
-            ->disableOriginalConstructor()
-            ->setMethods(['addFieldToFilter', 'getFacetedData'])
+        )->disableOriginalConstructor()
             ->getMock();
-
         $this->layer->expects($this->any())
             ->method('getProductCollection')
             ->will($this->returnValue($this->fulltextCollection));
 
         $this->itemDataBuilder = $this->getMockBuilder('\Magento\Catalog\Model\Layer\Filter\Item\DataBuilder')
             ->disableOriginalConstructor()
-            ->setMethods(['addItemData', 'build'])
             ->getMock();
 
-        $this->filterItemFactory = $this->getMockBuilder(
-            '\Magento\Catalog\Model\Layer\Filter\ItemFactory'
-        )
+        $this->filterItemFactory = $this->getMockBuilder('\Magento\Catalog\Model\Layer\Filter\ItemFactory')
             ->disableOriginalConstructor()
             ->setMethods(['create'])
             ->getMock();
 
-        $filterItem = $this->getMockBuilder(
-            '\Magento\Catalog\Model\Layer\Filter\Item'
-        )
+        $filterItem = $this->getMockBuilder('\Magento\Catalog\Model\Layer\Filter\Item')
             ->disableOriginalConstructor()
             ->setMethods(['setFilter', 'setLabel', 'setValue', 'setCount'])
             ->getMock();
@@ -123,7 +106,6 @@ protected function setUp()
 
         $escaper = $this->getMockBuilder('\Magento\Framework\Escaper')
             ->disableOriginalConstructor()
-            ->setMethods(['escapeHtml'])
             ->getMock();
         $escaper->expects($this->any())
             ->method('escapeHtml')
@@ -162,7 +144,6 @@ protected function setUp()
     /**
      * @param $requestValue
      * @param $idValue
-     * @param $isIdUsed
      * @dataProvider applyWithEmptyRequestDataProvider
      */
     public function testApplyWithEmptyRequest($requestValue, $idValue)

lib/internal/Magento/Framework/Search/Adapter/Mysql/Aggregation/Interval.php

@@ -36,24 +36,36 @@ private function getValueFiled()
     {
         $field = $this->select->getPart(Select::COLUMNS)[0];
 
-        return $field[1];
+        return (string) $field[1];
+    }
+
+    /**
+     * Get value alias
+     *
+     * @return string
+     */
+    private function getValueAlias()
+    {
+        $field = $this->select->getPart(Select::COLUMNS)[0];
+
+        return $field[2];
     }
 
     /**
      * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function load($limit, $offset = null, $lower = null, $upper = null)
     {
         $select = clone $this->select;
-        $value = $this->getValueFiled();
+        $valueFiled = $this->getValueFiled();
+        $valueAlias = $this->getValueAlias();
         if ($lower !== null) {
-            $select->where("${value} >= ?", $lower - self::DELTA);
+            $select->where("${valueFiled} >= ?", $lower - self::DELTA);
         }
         if ($upper !== null) {
-            $select->where("${value} < ?", $upper - self::DELTA);
+            $select->where("${valueFiled} < ?", $upper - self::DELTA);
         }
-        $select->order("value ASC")
+        $select->order("${valueAlias} ASC")
             ->limit($limit, $offset);
 
         return $this->arrayValuesToFloat(
@@ -64,16 +76,15 @@ public function load($limit, $offset = null, $lower = null, $upper = null)
 
     /**
      * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function loadPrevious($data, $index, $lower = null)
     {
         $select = clone $this->select;
-        $value = $this->getValueFiled();
+        $valueFiled = $this->getValueFiled();
         $select->columns(['count' => 'COUNT(*)'])
-            ->where("${value} <  ?", $data - self::DELTA);
+            ->where("${valueFiled} <  ?", $data - self::DELTA);
         if ($lower !== null) {
-            $select->where("${value} >= ?", $lower - self::DELTA);
+            $select->where("${valueFiled} >= ?", $lower - self::DELTA);
         }
         $offset = $this->select->getConnection()
             ->fetchRow($select)['count'];
@@ -86,17 +97,17 @@ public function loadPrevious($data, $index, $lower = null)
 
     /**
      * {@inheritdoc}
-     * @SuppressWarnings(PHPMD.UnusedLocalVariable)
      */
     public function loadNext($data, $rightIndex, $upper = null)
     {
         $select = clone $this->select;
-        $value = $this->getValueFiled();
+        $valueFiled = $this->getValueFiled();
+        $valueAlias = $this->getValueAlias();
         $select->columns(['count' => 'COUNT(*)'])
-            ->where("${value} > ?", $data + self::DELTA);
+            ->where("${valueFiled} > ?", $data + self::DELTA);
 
         if ($upper !== null) {
-            $select->where("${value} < ? ", $data - self::DELTA);
+            $select->where("${valueFiled} < ? ", $data - self::DELTA);
         }
 
         $offset = $this->select->getConnection()
@@ -107,11 +118,11 @@ public function loadNext($data, $rightIndex, $upper = null)
         }
 
         $select = clone $this->select;
-        $select->where("${value} >= ?", $data - self::DELTA);
+        $select->where("${valueFiled} >= ?", $data - self::DELTA);
         if ($upper !== null) {
-            $select->where("${value} < ? ", $data - self::DELTA);
+            $select->where("${valueFiled} < ? ", $data - self::DELTA);
         }
-        $select->order("${value} DESC")
+        $select->order("${valueAlias} DESC")
             ->limit($rightIndex - $offset + 1, $offset - 1);
 
         return $this->arrayValuesToFloat(