Merge branch '2.2-develop' of github.com:magento/magento2ce into MAGETWO-90362

Author: slopukhov

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

@@ -160,7 +160,7 @@ public function getCacheKeyInfo()
 
         return [
             'CATALOG_PRODUCTS_LIST_WIDGET',
-            $this->getPriceCurrency()->getCurrencySymbol(),
+            $this->getPriceCurrency()->getCurrency()->getCode(),
             $this->_storeManager->getStore()->getId(),
             $this->_design->getDesignTheme()->getId(),
             $this->httpContext->getValue(\Magento\Customer\Model\Context::CONTEXT_GROUP),

app/code/Magento/CatalogWidget/Test/Unit/Block/Product/ProductsListTest.php

@@ -147,7 +147,9 @@ public function testGetCacheKeyInfo()
         $this->request->expects($this->once())->method('getParam')->with('page_number')->willReturn(1);
 
         $this->request->expects($this->once())->method('getParams')->willReturn('request_params');
-        $this->priceCurrency->expects($this->once())->method('getCurrencySymbol')->willReturn('$');
+        $currency = $this->createMock(\Magento\Directory\Model\Currency::class);
+        $currency->expects($this->once())->method('getCode')->willReturn('USD');
+        $this->priceCurrency->expects($this->once())->method('getCurrency')->willReturn($currency);
 
         $this->serializer->expects($this->any())
             ->method('serialize')
@@ -157,7 +159,7 @@ public function testGetCacheKeyInfo()
 
         $cacheKey = [
             'CATALOG_PRODUCTS_LIST_WIDGET',
-            '$',
+            'USD',
             1,
             'blank',
             'context_group',

app/code/Magento/Eav/Model/ResourceModel/Entity/Attribute/Option/Collection.php

@@ -78,7 +78,7 @@ protected function _construct()
      */
     public function setAttributeFilter($setId)
     {
-        return $this->addFieldToFilter('attribute_id', $setId);
+        return $this->addFieldToFilter('main_table.attribute_id', $setId);
     }
 
     /**

lib/internal/Magento/Framework/Data/Form/Element/Date.php

@@ -167,6 +167,8 @@ public function getElementHtml()
                         'buttonImage' => $this->getImage(),
                         'buttonText' => 'Select Date',
                         'disabled' => $this->getDisabled(),
+                        'minDate' => $this->getMinDate(),
+                        'maxDate' => $this->getMaxDate(),
                     ],
                 ]
             )