Merge remote-tracking branch 'mainline/2.0' into perf-configurable

Author: kandy

app/code/Magento/Catalog/Pricing/Render/FinalPriceBox.php

@@ -118,4 +118,16 @@ public function showMinimalPrice()
         && $minimalPriceAValue
         && $minimalPriceAValue < $finalPriceValue;
     }
+
+    /**
+     * {@inheritdoc}
+     *
+     * @return array
+     */
+    public function getCacheKeyInfo()
+    {
+        $cacheKeys = parent::getCacheKeyInfo();
+        $cacheKeys['display_minimal_price'] = $this->getDisplayMinimalPrice();
+        return $cacheKeys;
+    }
 }

app/code/Magento/Catalog/Test/Unit/Pricing/Render/FinalPriceBoxTest.php

@@ -81,6 +81,22 @@ protected function setUp()
             ->method('getBlock')
             ->will($this->returnValue($this->priceBox));
 
+        $storeManager = $this->getMockBuilder('\Magento\Store\Model\StoreManagerInterface')
+            ->setMethods(['getStore', 'getCode'])
+            ->getMockForAbstractClass();
+        $storeManager->expects($this->any())->method('getStore')->willReturnSelf();
+
+        $appState = $this->getMockBuilder('\Magento\Framework\App\State')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $resolver = $this->getMockBuilder('\Magento\Framework\View\Element\Template\File\Resolver')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $urlBuilder = $this->getMockBuilder('\Magento\Framework\UrlInterface')
+            ->getMockForAbstractClass();
+
         $scopeConfigMock = $this->getMockForAbstractClass('Magento\Framework\App\Config\ScopeConfigInterface');
         $context = $this->getMock('Magento\Framework\View\Element\Template\Context', [], [], '', false);
         $context->expects($this->any())
@@ -98,6 +114,17 @@ protected function setUp()
         $context->expects($this->any())
             ->method('getScopeConfig')
             ->will($this->returnValue($scopeConfigMock));
+        $context->expects($this->any())
+            ->method('getStoreManager')
+            ->will($this->returnValue($storeManager));
+        $context->expects($this->any())
+            ->method('getAppState')
+            ->will($this->returnValue($appState));
+        $context->expects($this->any())
+            ->method('getResolver')
+            ->will($this->returnValue($resolver));
+        $context->expects($this->any())
+            ->method('getUrlBuilder')->will($this->returnValue($urlBuilder));
 
         $this->rendererPool = $this->getMockBuilder('Magento\Framework\Pricing\Render\RendererPool')
             ->disableOriginalConstructor()
@@ -332,4 +359,9 @@ public function testHidePrice()
 
         $this->assertEmpty($this->object->toHtml());
     }
+
+    public function testGetCacheKeyInfo()
+    {
+        $this->assertArrayHasKey('display_minimal_price', $this->object->getCacheKeyInfo());
+    }
 }

app/code/Magento/Catalog/composer.json

@@ -34,7 +34,7 @@
         "magento/module-catalog-sample-data": "Sample Data version:100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.7",
+    "version": "100.0.8",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Catalog/i18n/en_US.csv

@@ -689,7 +689,7 @@ Storefront,Storefront
 "Special Price From Date","Special Price From Date"
 "Special Price To Date","Special Price To Date"
 Cost,Cost
-"Tier Price","Tier Price"
+"Tier Price","Customer Group Price"
 "Advanced Pricing","Advanced Pricing"
 Autosettings,Autosettings
 "Short Description","Short Description"

app/code/Magento/CatalogImportExport/composer.json

@@ -16,7 +16,7 @@
         "ext-ctype": "*"
     },
     "type": "magento2-module",
-    "version": "100.0.6",
+    "version": "100.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/CatalogUrlRewrite/composer.json

@@ -13,7 +13,7 @@
         "magento/framework": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.5",
+    "version": "100.0.6",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Checkout/Block/Cart/Sidebar.php

@@ -13,7 +13,7 @@
 class Sidebar extends AbstractCart
 {
     /**
-     * Xml pah to checkout sidebar count value
+     * Xml pah to checkout sidebar display value
      */
     const XML_PATH_CHECKOUT_SIDEBAR_DISPLAY = 'checkout/sidebar/display';
 
@@ -63,7 +63,8 @@ public function getConfig()
             'updateItemQtyUrl' => $this->getUpdateItemQtyUrl(),
             'removeItemUrl' => $this->getRemoveItemUrl(),
             'imageTemplate' => $this->getImageHtmlTemplate(),
-            'baseUrl' => $this->getBaseUrl()
+            'baseUrl' => $this->getBaseUrl(),
+            'minicartMaxItemsVisible' => $this->getMiniCartMaxItemsCount()
         ];
     }
 
@@ -171,4 +172,14 @@ public function getBaseUrl()
     {
         return $this->_storeManager->getStore()->getBaseUrl();
     }
+
+    /**
+     * Return max visible item count for minicart
+     *
+     * @return int
+     */
+    private function getMiniCartMaxItemsCount()
+    {
+        return (int)$this->_scopeConfig->getValue('checkout/sidebar/count', ScopeInterface::SCOPE_STORE);
+    }
 }

app/code/Magento/Checkout/Test/Unit/Block/Cart/SidebarTest.php

@@ -138,7 +138,8 @@ public function testGetConfig()
             'updateItemQtyUrl' => $updateItemQtyUrl,
             'removeItemUrl' => $removeItemUrl,
             'imageTemplate' => $imageTemplate,
-            'baseUrl' => $baseUrl
+            'baseUrl' => $baseUrl,
+            'minicartMaxItemsVisible' => 3
         ];
 
         $valueMap = [
@@ -159,6 +160,13 @@ public function testGetConfig()
         $storeMock->expects($this->once())->method('getBaseUrl')->willReturn($baseUrl);
         $this->imageHelper->expects($this->once())->method('getFrame')->willReturn(false);
 
+        $this->scopeConfigMock->expects($this->once())
+            ->method('getValue')
+            ->with(
+                'checkout/sidebar/count',
+                \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+            )->willReturn(3);
+
         $this->assertEquals($expectedResult, $this->model->getConfig());
     }
 

app/code/Magento/Checkout/composer.json

@@ -27,7 +27,7 @@
         "magento/module-cookie": "100.0.*"
     },
     "type": "magento2-module",
-    "version": "100.0.6",
+    "version": "100.0.7",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Checkout/view/frontend/layout/checkout_cart_index.xml

@@ -62,6 +62,9 @@
                                                 <item name="component" xsi:type="string">Magento_Checkout/js/view/cart/shipping-estimation</item>
                                                 <item name="provider" xsi:type="string">checkoutProvider</item>
                                                 <item name="sortOrder" xsi:type="string">1</item>
+                                                <item name="deps" xsi:type="array">
+                                                    <item name="0" xsi:type="string">block-summary.block-shipping.address-fieldsets</item>
+                                                </item>
                                                 <item name="children" xsi:type="array">
                                                     <item name="address-fieldsets" xsi:type="array">
                                                         <item name="component" xsi:type="string">uiComponent</item>