Merge pull request #9359 from magento-gl/comprs_nov

[Bluetooth] Community Pull Requests delivery Nov-2

Author: sidolov

app/code/Magento/Backend/Console/Command/MaintenanceAllowIpsCommand.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Backend\Console\Command;
 
@@ -22,9 +22,10 @@ class MaintenanceAllowIpsCommand extends AbstractSetupCommand
     /**
      * Names of input arguments or options
      */
-    const INPUT_KEY_IP = 'ip';
-    const INPUT_KEY_NONE = 'none';
-    const INPUT_KEY_ADD = 'add';
+    public const INPUT_KEY_IP = 'ip';
+    public const INPUT_KEY_NONE = 'none';
+    public const INPUT_KEY_ADD = 'add';
+    public const NAME = 'maintenance:allow-ips';
 
     /**
      * @var MaintenanceMode
@@ -76,7 +77,7 @@ protected function configure(): void
                 'Add the IP address to existing list'
             ),
         ];
-        $this->setName('maintenance:allow-ips')
+        $this->setName(self::NAME)
             ->setDescription('Sets maintenance mode exempt IPs')
             ->setDefinition(array_merge($arguments, $options));
 

app/code/Magento/Backend/Console/Command/MaintenanceDisableCommand.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Backend\Console\Command;
 
@@ -10,14 +10,16 @@
  */
 class MaintenanceDisableCommand extends AbstractMaintenanceCommand
 {
+    public const NAME = 'maintenance:disable';
+
     /**
      * Initialization of the command
      *
      * @return void
      */
     protected function configure()
     {
-        $this->setName('maintenance:disable')->setDescription('Disables maintenance mode');
+        $this->setName(self::NAME)->setDescription('Disables maintenance mode');
 
         parent::configure();
     }

app/code/Magento/Backend/Console/Command/MaintenanceEnableCommand.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Backend\Console\Command;
 
@@ -10,14 +10,16 @@
  */
 class MaintenanceEnableCommand extends AbstractMaintenanceCommand
 {
+    public const NAME = 'maintenance:enable';
+
     /**
      * Initialization of the command
      *
      * @return void
      */
     protected function configure(): void
     {
-        $this->setName('maintenance:enable')->setDescription('Enables maintenance mode');
+        $this->setName(self::NAME)->setDescription('Enables maintenance mode');
 
         parent::configure();
     }

app/code/Magento/Backend/Console/Command/MaintenanceStatusCommand.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Backend\Console\Command;
 
@@ -16,6 +16,8 @@
  */
 class MaintenanceStatusCommand extends AbstractSetupCommand
 {
+    public const NAME = 'maintenance:status';
+
     /**
      * @var MaintenanceMode $maintenanceMode
      */
@@ -40,7 +42,7 @@ public function __construct(MaintenanceMode $maintenanceMode)
      */
     protected function configure(): void
     {
-        $this->setName('maintenance:status')
+        $this->setName(self::NAME)
             ->setDescription('Displays maintenance mode status');
 
         parent::configure();

app/code/Magento/Catalog/etc/di.xml

@@ -554,6 +554,11 @@
     <type name="Magento\Catalog\Model\ResourceModel\Config">
         <plugin name="productListingAttributesCaching" type="Magento\Catalog\Plugin\Model\ResourceModel\Config" />
     </type>
+    <type name="Magento\Catalog\Plugin\Model\ResourceModel\Config">
+        <arguments>
+            <argument name="cache" xsi:type="object">configured_eav_cache</argument>
+        </arguments>
+    </type>
     <preference for="Magento\Catalog\Api\ProductLinkTypeListInterface" type="Magento\Catalog\Model\Product\LinkTypeProvider" />
     <preference for="Magento\Catalog\Api\Data\ProductLinkAttributeInterface" type="Magento\Catalog\Model\ProductLink\Attribute" />
     <preference for="Magento\Catalog\Api\Data\ProductLinkTypeInterface" type="Magento\Catalog\Model\ProductLink\Type" />

app/code/Magento/SalesRule/Model/Validator.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\SalesRule\Model;
@@ -745,8 +745,9 @@ public function sortItemsByPriority($items, Address $address = null)
         $itemsSorted = [];
         /** @var $rule Rule */
         foreach ($this->getRules($address) as $rule) {
+            $actions = $rule->getActions();
             foreach ($items as $itemKey => $itemValue) {
-                if ($rule->getActions()->validate($itemValue)) {
+                if ($actions->validate($itemValue)) {
                     unset($items[$itemKey]);
                     $itemsSorted[] = $itemValue;
                 }

app/code/Magento/Ui/view/base/web/js/core/renderer/layout.js

@@ -118,9 +118,10 @@ define([
                 component: node.component
             });
             loaded.resolve(node, constr);
-        }, function () {
+        }, function (err) {
             consoleLogger.error('componentLoadingFail', {
-                component: node.component
+                component: node.component,
+                errorMsg: err
             });
         });
 

app/code/Magento/Ui/view/base/web/js/lib/logger/formatter.js

@@ -18,7 +18,7 @@ define([
          * @protected
          * @type {String}
          */
-        this.dateFormat_ = 'YYYY-MM-DD hh:mm:ss';
+        this.dateFormat_ = 'YYYY-MM-DD HH:mm:ssZ';
 
         /**
          * @protected

app/code/Magento/Ui/view/base/web/js/lib/logger/message-pool.js

@@ -18,7 +18,7 @@ define(function () {
             'Component "${$.component}" start initialization with instance name "${$.componentName}".',
         componentStartLoading: ' Started loading the "${$.component}" component.',
         componentFinishLoading: 'The "${$.component}" component was loaded.',
-        componentLoadingFail: 'Failed to load the "${$.component}" component.',
+        componentLoadingFail: 'Failed to load the "${$.component}" component. Due to "${$.errorMsg}"',
         depsLoadingFail: 'Could not get the declared "${$.deps}" dependency for the "${$.component}" instance.',
         depsStartRequesting: 'Requesting the "${$.deps}" dependency for the "${$.component}" instance.',
         depsFinishRequesting: 'The "${$.deps}" dependency for the "${$.component}" instance was received.',

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_progress-bar.less

@@ -10,13 +10,16 @@
 @checkout-progress-bar__font-size: 18px;
 @checkout-progress-bar__font-weight: @font-weight__light;
 @checkout-progress-bar__margin: @indent__base;
+@checkout-progress-bar__margin__mobile: 30px;
 
 @checkout-progress-bar-item__background-color: @color-gray-middle1;
 @checkout-progress-bar-item__border-radius: 6px;
 @checkout-progress-bar-item__color: @color-gray40;
 @checkout-progress-bar-item__margin: @indent__s;
 @checkout-progress-bar-item__transition: background .3s;
 @checkout-progress-bar-item__width: 185px;
+@checkout-progress-bar-item__width__mobile: 165px;
+@checkout-progress-bar-item__width__mobile_small: 125px;
 
 @checkout-progress-bar-item__active__background-color: @active__color;
 @checkout-progress-bar-item__active__color: @primary__color;
@@ -51,13 +54,6 @@
         &:extend(.abs-reset-list all);
         display: none;
     }
-}
-
-//
-//  Desktop
-//  _____________________________________________
-
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
 
     .opc-progress-bar {
         .lib-css(margin, 0 0 @checkout-progress-bar__margin);
@@ -105,12 +101,12 @@
             word-wrap: break-word;
 
             .lib-typography(
-            @_color: @checkout-progress-bar-item__color,
-            @_font-family: false,
-            @_font-size: @checkout-progress-bar__font-size,
-            @_font-style: false,
-            @_font-weight: @checkout-progress-bar__font-weight,
-            @_line-height: false
+                @_color: @checkout-progress-bar-item__color,
+                @_font-family: false,
+                @_font-size: @checkout-progress-bar__font-size,
+                @_font-style: false,
+                @_font-weight: @checkout-progress-bar__font-weight,
+                @_line-height: false
             );
 
             &:before, // Item element
@@ -137,12 +133,12 @@
                 content: counter(i);
                 counter-increment: i;
                 .lib-typography(
-                @_color: @checkout-progress-bar-item-element-inner__color,
-                @_font-family: false,
-                @_font-size: @checkout-progress-bar__font-size,
-                @_font-style: false,
-                @_font-weight: @font-weight__semibold,
-                @_line-height: false
+                    @_color: @checkout-progress-bar-item-element-inner__color,
+                    @_font-family: false,
+                    @_font-size: @checkout-progress-bar__font-size,
+                    @_font-style: false,
+                    @_font-weight: @font-weight__semibold,
+                    @_line-height: false
                 );
             }
         }
@@ -196,3 +192,26 @@
         }
     }
 }
+
+//
+// Mobile normal screen
+//
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__s) {
+    .opc-progress-bar {
+        .lib-css(margin, 0 0 @checkout-progress-bar__margin__mobile);
+        counter-reset: i; display: block; font-size: 0;
+    }
+
+    .opc-progress-bar-item {
+        .lib-css(width, @checkout-progress-bar-item__width__mobile);
+    }
+}
+
+//
+// Mobile with extra small screen size
+//
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__xs) {
+    .opc-progress-bar-item {
+        .lib-css(width, @checkout-progress-bar-item__width__mobile_small);
+    }
+}