🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - magento/magento2#15539: FIX fo rissue #15510 - First PDF download / export after login (by @phoenix128)
 - magento/magento2#15791: Removed unused class from forms less file. (by @chirag-wagento)
 - magento/magento2#15795: Remove double semicolon from the style sheets. (by @namratachangani)
 - magento/magento2#15734: [Resolved : Styling <select> by changing less variables in Luma theme� (by @hitesh-wagento)
 - magento/magento2#15694: [Backport 2.2] Fix minor issues in ui export converter classes (by @dmytro-ch)
 - magento/magento2#12314: Prevent layout cache corruption in edge case (by @scottsb)
 - magento/magento2#15871: chore: remove unused less import (by @DanielRuf)
 - magento/magento2#15854: [Backport 2.2] Fixed return type hinting in DocBlocks for Wishlist module (by @rogyar)
 - magento/magento2#15840: [Backport] Fix for issue 911 found on MSI project - Cannot read property source_� #14 (by @chirag-wagento)
 - magento/magento2#15825: Fixed set template syntax issue (by @namratachangani)
 - magento/magento2#15789: Removed unnecessary css. (by @chirag-wagento)
 - magento/magento2#15782: [Backport 2.2]Fix translations (by @VitaliyBoyko)


Fixed GitHub Issues:
 - magento/magento2#15510: First PDF download / export after login (reported by @anthony-jullien) has been fixed in magento/magento2#15539 by @phoenix128 in 2.2-develop branch
   Related commits:
     1. 59e03c1

 - magento/magento2#15608: Styling <select> by changing less variables in Luma theme doesn't work as expected (reported by @denistrator) has been fixed in magento/magento2#15734 by @hitesh-wagento in 2.2-develop branch
   Related commits:
     1. 67778cd

app/code/Magento/Backend/App/AbstractAction.php

@@ -217,6 +217,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
             $this->_view->loadLayout(['default', 'adminhtml_denied'], true, true, false);
             $this->_view->renderLayout();
             $this->_request->setDispatched(true);
+
             return $this->_response;
         }
 
@@ -226,6 +227,11 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
 
         $this->_processLocaleSettings();
 
+        // Need to preload isFirstPageAfterLogin (see https://github.com/magento/magento2/issues/15510)
+        if ($this->_auth->isLoggedIn()) {
+            $this->_auth->getAuthStorage()->isFirstPageAfterLogin();
+        }
+
         return parent::dispatch($request);
     }
 

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Checkbox.php

@@ -17,7 +17,7 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
     /**
      * @var string
      */
-    protected $_template = 'product/composite/fieldset/options/type/checkbox.phtml';
+    protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/checkbox.phtml';
 
     /**
      * @param  string $elementId

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Multi.php

@@ -17,7 +17,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @var string
      */
-    protected $_template = 'product/composite/fieldset/options/type/multi.phtml';
+    protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/multi.phtml';
 
     /**
      * @param  string $elementId

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Radio.php

@@ -17,7 +17,7 @@ class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @var string
      */
-    protected $_template = 'product/composite/fieldset/options/type/radio.phtml';
+    protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/radio.phtml';
 
     /**
      * @param  string $elementId

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Options/Type/Select.php

@@ -17,7 +17,7 @@ class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Opti
     /**
      * @var string
      */
-    protected $_template = 'product/composite/fieldset/options/type/select.phtml';
+    protected $_template = 'Magento_Bundle::product/composite/fieldset/options/type/select.phtml';
 
     /**
      * @param  string $elementId

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

@@ -20,7 +20,7 @@ class Bundle extends \Magento\Backend\Block\Widget implements \Magento\Backend\B
     /**
      * @var string
      */
-    protected $_template = 'product/edit/bundle.phtml';
+    protected $_template = 'Magento_Bundle::product/edit/bundle.phtml';
 
     /**
      * Core registry

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option.php

@@ -26,7 +26,7 @@ class Option extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'product/edit/bundle/option.phtml';
+    protected $_template = 'Magento_Bundle::product/edit/bundle/option.phtml';
 
     /**
      * Core registry

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

@@ -15,7 +15,7 @@ class Search extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'product/edit/bundle/option/search.phtml';
+    protected $_template = 'Magento_Bundle::product/edit/bundle/option/search.phtml';
 
     /**
      * @return void

app/code/Magento/Bundle/Block/Adminhtml/Catalog/Product/Edit/Tab/Bundle/Option/Selection.php

@@ -15,7 +15,7 @@ class Selection extends \Magento\Backend\Block\Widget
     /**
      * @var string
      */
-    protected $_template = 'product/edit/bundle/option/selection.phtml';
+    protected $_template = 'Magento_Bundle::product/edit/bundle/option/selection.phtml';
 
     /**
      * Catalog data

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php

@@ -16,5 +16,5 @@ class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Op
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/view/type/bundle/option/checkbox.phtml';
+    protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/checkbox.phtml';
 }

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php

@@ -16,7 +16,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/view/type/bundle/option/multi.phtml';
+    protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/multi.phtml';
 
     /**
      * @inheritdoc

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php

@@ -16,5 +16,5 @@ class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/view/type/bundle/option/radio.phtml';
+    protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/radio.phtml';
 }

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php

@@ -16,5 +16,5 @@ class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Opti
     /**
      * @var string
      */
-    protected $_template = 'catalog/product/view/type/bundle/option/select.phtml';
+    protected $_template = 'Magento_Bundle::catalog/product/view/type/bundle/option/select.phtml';
 }

app/code/Magento/Checkout/view/frontend/web/template/minicart/content.html

@@ -30,8 +30,12 @@
             <span class="count" if="maxItemsToDisplay < getCartLineItemsCount()" text="maxItemsToDisplay"/>
             <translate args="'of'" if="maxItemsToDisplay < getCartLineItemsCount()"/>
             <span class="count" text="getCartLineItemsCount()"/>
-            <translate args="'Item in Cart'" if="getCartLineItemsCount() === 1"/>
-            <translate args="'Items in Cart'" if="getCartLineItemsCount() > 1"/>
+                <!-- ko if: (getCartLineItemsCount() === 1) -->
+                    <span translate="'Item in Cart'"/>
+                <!--/ko-->
+                <!-- ko if: (getCartLineItemsCount() > 1) -->
+                    <span translate="'Items in Cart'"/>
+                <!--/ko-->
         </div>
 
         <each args="getRegion('subtotalContainer')" render=""/>

app/code/Magento/Ui/Model/Export/ConvertToCsv.php

@@ -6,6 +6,7 @@
 namespace Magento\Ui\Model\Export;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
@@ -31,11 +32,17 @@ class ConvertToCsv
      */
     protected $pageSize = null;
 
+    /**
+     * @var Filter
+     */
+    protected $filter;
+
     /**
      * @param Filesystem $filesystem
      * @param Filter $filter
      * @param MetadataProvider $metadataProvider
      * @param int $pageSize
+     * @throws FileSystemException
      */
     public function __construct(
         Filesystem $filesystem,

app/code/Magento/Ui/Model/Export/ConvertToXml.php

@@ -10,6 +10,7 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Magento\Framework\Convert\Excel;
 use Magento\Framework\Convert\ExcelFactory;
+use Magento\Framework\Exception\FileSystemException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\Directory\WriteInterface;
@@ -50,12 +51,18 @@ class ConvertToXml
      */
     protected $fields;
 
+    /**
+     * @var Filter
+     */
+    protected $filter;
+
     /**
      * @param Filesystem $filesystem
      * @param Filter $filter
      * @param MetadataProvider $metadataProvider
      * @param ExcelFactory $excelFactory
      * @param SearchResultIteratorFactory $iteratorFactory
+     * @throws FileSystemException
      */
     public function __construct(
         Filesystem $filesystem,
@@ -88,6 +95,7 @@ protected function getOptions()
      * Returns DB fields list
      *
      * @return array
+     * @throws LocalizedException
      */
     protected function getFields()
     {
@@ -103,6 +111,7 @@ protected function getFields()
      *
      * @param DocumentInterface $document
      * @return array
+     * @throws LocalizedException
      */
     public function getRowData(DocumentInterface $document)
     {

app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows-grid.js

@@ -109,9 +109,8 @@ define([
          * @param {String|Number} recordId
          */
         deleteRecord: function (index, recordId) {
-            this._super();
-
             this.updateInsertData(recordId);
+            this._super();
         },
 
         /**

app/code/Magento/Wishlist/Block/Rss/EmailLink.php

@@ -24,7 +24,7 @@ class EmailLink extends Link
     protected $_template = 'rss/email.phtml';
 
     /**
-     * @return string
+     * @return array
      */
     protected function getLinkParams()
     {

app/code/Magento/Wishlist/Block/Rss/Link.php

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

app/code/Magento/Wishlist/Helper/Data.php

@@ -503,7 +503,7 @@ public function isAllowInCart()
     /**
      * Retrieve customer name
      *
-     * @return string|void
+     * @return string|null
      */
     public function getCustomerName()
     {

app/code/Magento/Wishlist/Plugin/Ui/DataProvider/WishlistSettings.php

@@ -32,7 +32,7 @@ public function __construct(Data $helper)
     /**
      * Add tax data to result
      *
-     * @param \Magento\Checkout\CustomerData\Cart $subject
+     * @param \Magento\Catalog\Ui\DataProvider\Product\Listing\DataProvider $subject
      * @param array $result
      * @return array
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)

app/design/frontend/Magento/luma/web/css/source/_actions-toolbar.less

@@ -22,10 +22,6 @@
                 &:last-child {
                     margin-bottom: 0;
                 }
-
-                &.primary {
-                    //  &:extend(.abs-button-l all);
-                }
             }
 
             &:last-child {

app/design/frontend/Magento/luma/web/css/source/_forms.less

@@ -91,11 +91,7 @@
     .select-styling() {
         .lib-css(appearance, none, 1);
         appearance: none;
-        background: @select__background url('../images/select-bg.svg') no-repeat 100% 45%;
         background-size: 30px 60px;
-        border: 1px solid @border-color__base;
-        height: 32px;
-        padding-right: 25px;
         text-indent: .01em;
         text-overflow: '';
 

app/design/frontend/Magento/luma/web/css/source/_theme.less

@@ -166,6 +166,13 @@
 //  Forms
 //  ---------------------------------------------
 
+
+//  Select
+@select__background: @form-element-input__background url('../images/select-bg.svg') no-repeat 100% 45%;
+@select__border: 1px solid @border-color__base;
+@select__height: 32px;
+@select__padding: 4px 25px @indent__xs @indent__s;
+
 //  Form fieldset
 @form-fieldset-legend__font-size: 18px;
 @form-fieldset-legend__font-weight: @font-weight__light;

dev/tests/integration/testsuite/Magento/Framework/View/_files/Magento/ModuleA/view/adminhtml/product/product.css

@@ -13,7 +13,7 @@
     overflow: hidden;
     padding: 5px 6px 3px;
     margin-left: 12px;
-    color: #7a7976;;
+    color: #7a7976;
 }
 
 [class^=" catalog-product-"] .page-actions .action-back:hover,

dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php

@@ -100,6 +100,14 @@ public function process(File $phpcsFile, $stackPtr)
      */
     private function validatePropertiesSorting(File $phpcsFile, $stackPtr, array $properties)
     {
+        // Fix needed for cases when incorrect properties passed for validation due to bug in PHP tokens.
+        $symbolsForSkip = ['(', 'block', 'field'];
+        $properties = array_filter(
+            $properties,
+            function ($var) use ($symbolsForSkip) {
+                return !in_array($var, $symbolsForSkip);
+            }
+        );
 
         $originalProperties = $properties;
         sort($properties);

lib/internal/Magento/Framework/View/Model/Layout/Merge.php

@@ -431,6 +431,9 @@ public function load($handles = [])
         if ($result) {
             $this->addUpdate($result);
             $this->pageLayout = $this->_loadCache($cacheIdPageLayout);
+            foreach ($this->getHandles() as $handle) {
+                $this->allHandles[$handle] = $this->handleProcessed;
+            }
             return $this;
         }
 

lib/web/css/docs/source/docs.less

@@ -21,7 +21,6 @@
 @import '_icons.less';
 @import '_loaders.less';
 @import '_messages.less';
-//@import 'navigation.less';
 @import '_layout.less';
 @import '_pages.less';
 @import '_popups.less';

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/_forms.less

@@ -121,7 +121,7 @@
 @select__disabled__font-style: @form-element-input__disabled__font-style;
 
 //  Focus state
-@select__focus__background: @form-element-input__focus__background;
+@select__focus__background: false;
 @select__focus__border: @form-element-input__focus__border;
 @select__focus__color: @form-element-input__focus__color;
 @select__focus__font-style: @form-element-input__focus__font-style;

lib/web/extjs/resources/css/ytheme-magento.css

@@ -15,7 +15,7 @@
     background:url(../images/magento/loading_bg.gif) no-repeat #eae2ca;
     padding:85px 15px 15px 15px;
     font-size:14px;
-        font-weight:bold;;
+        font-weight:bold;
     color:#611B06;
     width:206px;
     text-align:center;