Backport footer responsive

app/code/Magento/Backend/Block/Widget/Form/Element/Dependence.php

@@ -120,14 +120,17 @@ protected function _toHtml()
         if (!$this->_depends) {
             return '';
         }
-        return '<script>
-            require(["mage/adminhtml/form"], function(){
-        new FormElementDependenceController(' .
-            $this->_getDependsJson() .
-            ($this->_configOptions ? ', ' .
-            $this->_jsonEncoder->encode(
-                $this->_configOptions
-            ) : '') . '); });</script>';
+
+        $dependsJson = $this->_getDependsJson();
+        $configOptions = $this->_configOptions ? $this->_jsonEncoder->encode($this->_configOptions) : null;
+        $configOptionsStr = $configOptions ? ', ' . $configOptions : '';
+        $paramsStr = $dependsJson . $configOptionsStr;
+
+        return "<script>
+    require(['mage/adminhtml/form'], function(){
+    new FormElementDependenceController({$paramsStr});
+});
+</script>";
     }
 
     /**

app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

@@ -70,10 +70,7 @@ public function __construct(
         $this->_storeManager = $storeManager;
         $this->_currencyLocator = $currencyLocator;
         $this->_localeCurrency = $localeCurrency;
-        $defaultBaseCurrencyCode = $this->_scopeConfig->getValue(
-            \Magento\Directory\Model\Currency::XML_PATH_CURRENCY_BASE,
-            'default'
-        );
+        $defaultBaseCurrencyCode = $currencyLocator->getDefaultCurrency($this->_request);
         $this->_defaultBaseCurrency = $currencyFactory->create()->load($defaultBaseCurrencyCode);
     }
 

app/code/Magento/Catalog/Block/Adminhtml/Category/Tree.php

@@ -325,7 +325,7 @@ public function getBreadcrumbsJavascript($path, $javascriptVarName)
      *
      * @param Node|array $node
      * @param int $level
-     * @return string
+     * @return array
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */

app/code/Magento/Catalog/Block/Adminhtml/Category/Widget/Chooser.php

@@ -144,7 +144,7 @@ function (node, e) {
      *
      * @param \Magento\Framework\Data\Tree\Node|array $node
      * @param int $level
-     * @return string
+     * @return array
      */
     protected function _getNodeJson($node, $level = 0)
     {

app/code/Magento/Catalog/Block/Adminhtml/Form/Renderer/Fieldset/Element.php

@@ -21,7 +21,7 @@ class Element extends \Magento\Backend\Block\Widget\Form\Renderer\Fieldset\Eleme
     /**
      * Retrieve data object related with form
      *
-     * @return \Magento\Catalog\Model\Product || \Magento\Catalog\Model\Category
+     * @return \Magento\Catalog\Model\Product|\Magento\Catalog\Model\Category
      */
     public function getDataObject()
     {

app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Grid.php

@@ -101,8 +101,7 @@ protected function _prepareColumns()
                 'type' => 'options',
                 'options' => ['1' => __('Yes'), '0' => __('No')],
                 'align' => 'center'
-            ],
-            'is_user_defined'
+            ]
         );
 
         $this->_eventManager->dispatch('product_attribute_grid_build', ['grid' => $this]);

app/code/Magento/Catalog/Block/Adminhtml/Product/Edit/Tab/Attributes/Search.php

@@ -81,7 +81,7 @@ public function getSelectorOptions()
      *
      * @param string $labelPart
      * @param int $templateId
-     * @return \Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection
+     * @return array
      */
     public function getSuggestedAttributes($labelPart, $templateId = null)
     {

app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php

@@ -69,7 +69,7 @@ public function isRssAllowed()
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {

app/code/Magento/Catalog/Block/Category/Rss/Link.php

@@ -60,7 +60,7 @@ public function getLabel()
     }
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {

app/code/Magento/Catalog/Block/Product/AbstractProduct.php

@@ -186,7 +186,7 @@ public function getAddToCompareUrl()
      * Gets minimal sales quantity
      *
      * @param \Magento\Catalog\Model\Product $product
-     * @return int|null
+     * @return float|null
      */
     public function getMinimalQty($product)
     {

app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php

@@ -174,7 +174,7 @@ public function getPrice($price, $includingTax = null)
      * Returns price converted to current currency rate
      *
      * @param float $price
-     * @return float
+     * @return float|string
      */
     public function getCurrencyPrice($price)
     {

app/code/Magento/Catalog/Block/Rss/Product/Special.php

@@ -107,7 +107,7 @@ protected function _construct()
     }
 
     /**
-     * @return string
+     * @return array
      */
     public function getRssData()
     {

app/code/Magento/Catalog/Model/Indexer/Product/Flat/Action/Indexer.php

@@ -169,6 +169,7 @@ public function write($storeId, $productId, $valueFieldSuffix = '')
 
         if (!empty($updateData)) {
             $updateData += ['entity_id' => $productId];
+            $updateData += ['row_id' => $productId];
             $updateFields = [];
             foreach ($updateData as $key => $value) {
                 $updateFields[$key] = $key;

app/code/Magento/SalesInventory/Model/Order/ReturnProcessor.php

@@ -11,6 +11,8 @@
 
 /**
  * Class ReturnProcessor
+ *
+ * @api
  */
 class ReturnProcessor
 {

app/code/Magento/Wishlist/CustomerData/Wishlist.php

@@ -154,12 +154,8 @@ protected function getImageData($product)
         $template = $helper->getFrame()
             ? 'Magento_Catalog/product/image'
             : 'Magento_Catalog/product/image_with_borders';
-
-        try {
-            $imagesize = $helper->getResizedImageInfo();
-        } catch (NotLoadInfoImageException $exception) {
-            $imagesize = [$helper->getWidth(), $helper->getHeight()];
-        }
+
+        $imagesize = [$helper->getWidth(), $helper->getHeight()];
 
         $width = $helper->getFrame()
             ? $helper->getWidth()

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_estimated-total.less

@@ -35,7 +35,11 @@
             .action {
                 &.showcart {
                     &:before {
-                        .lib-css(color, @primary__color);
+                        .lib-css(color, @button__color);
+                    }
+
+                    &:hover:before {
+                        .lib-css(color, @button__hover__color);
                     }
                 }
             }

app/design/frontend/Magento/blank/web/css/source/_extends.less

@@ -1401,7 +1401,7 @@
         &.active {
             > .title {
                 .lib-icon-font-symbol(
-                @_icon-font-content: @icon-prev,
+                @_icon-font-content: @icon-up,
                 @_icon-font-position: after
                 );
             }

app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less

@@ -352,6 +352,29 @@
 //  _____________________________________________
 
 .media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
+    html,
+    body {
+        height: 100%; // Stretch screen area for sticky footer
+    }
+
+    header,
+    main,
+    footer {
+        flex-shrink: 0;
+    }
+
+    .page-wrapper {
+        .lib-vendor-prefix-display(flex);
+        .lib-vendor-prefix-flex-direction(column);
+        align-items: stretch;
+        -webkit-align-items: stretch;
+        min-height: 100%; // Stretch content area for sticky footer
+        .page-main {
+            flex-grow: 1;
+            -webkit-flex-grow: 1;
+        }
+    }
+
     .customer-name,
     .customer-welcome + .authorization-link {
         display: none;

dev/tests/integration/testsuite/Magento/Catalog/Model/Indexer/Product/Flat/Action/RowTest.php

@@ -61,12 +61,13 @@ public function testProductUpdate()
             $this->_processor->getIndexer()->isScheduled(),
             'Indexer is in scheduled mode when turned to update on save mode'
         );
-        $this->_processor->reindexAll();
 
         $this->_product->load(1);
         $this->_product->setName('Updated Product');
         $this->_product->save();
 
+        $this->_processor->reindexAll();
+
         $category = $categoryFactory->create()->load(9);
         $layer = $listProduct->getLayer();
         $layer->setCurrentCategory($category);

dev/tests/integration/testsuite/Magento/Sales/_files/order_with_shipping_and_invoice.php

@@ -3,6 +3,9 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+use Magento\Sales\Model\Order\ShipmentFactory;
+
 require 'order.php';
 
 $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -36,4 +39,10 @@
 
 $order->setIsInProcess(true);
 
-$transaction->addObject($invoice)->addObject($order)->save();
+$items = [];
+foreach ($order->getItems() as $orderItem) {
+    $items[$orderItem->getId()] = $orderItem->getQtyOrdered();
+}
+$shipment = $objectManager->get(ShipmentFactory::class)->create($order, $items);
+
+$transaction->addObject($invoice)->addObject($shipment)->addObject($order)->save();

lib/web/css/source/lib/_buttons.less

@@ -277,6 +277,9 @@
 //  ---------------------------------------------
 
 .lib-button-primary(
+    @_button-font-family: @button-primary__font-family,
+    @_button-font-size: @button-primary__font-size,
+    @_button-font-weight: @button-primary__font-weight,
     @_button-line-height: @button-primary__line-height,
     @_button-width: @button-primary__width,
     @_button-margin: @button-primary__margin,
@@ -300,6 +303,9 @@
     @_button-gradient-direction: @button-primary__gradient-direction
 ) {
     .lib-button(
+        @_button-font-family: @_button-font-family,
+        @_button-font-size: @_button-font-size,
+        @_button-font-weight: @_button-font-weight,
         @_button-line-height: @_button-line-height,
         @_button-width: @_button-width,
         @_button-margin: @_button-margin,

lib/web/css/source/lib/_forms.less

@@ -465,11 +465,9 @@
     .lib-css(margin, @_margin);
     .lib-css(padding, @_padding);
     letter-spacing: -.31em;
-    //word-spacing: -.43em;
 
     > * {
         letter-spacing: normal;
-        //word-spacing: normal;
     }
 
     > .legend {

lib/web/css/source/lib/variables/_buttons.less

@@ -47,6 +47,9 @@
 @button__active__gradient-color-end: false;
 
 //  Primary button
+@button-primary__font-family: @button__font-family;
+@button-primary__font-size: @button__font-size;
+@button-primary__font-weight: @button__font-weight;
 @button-primary__line-height: false;
 @button-primary__width: false;
 @button-primary__margin: false;