🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - magento/magento2#15274: [Forwardport] Fixed typo in method name (by @dmytro-ch)
 - magento/magento2#15263: [Forwardport] Fix \Magento\Customer\Model\Customer\NotificationStorage class (by @adrian-martinez-interactiv4)
 - magento/magento2#14975: Fix for displaying a negative price for a custom option.  (by @dverkade)
 - magento/magento2#14395: Fix for not working LESS extends  (by @Igloczek)

Author: Stanislav Idolov

app/code/Magento/Catalog/view/base/web/js/price-options.js

@@ -20,8 +20,10 @@ define([
         optionConfig: {},
         optionHandlers: {},
         optionTemplate: '<%= data.label %>' +
-        '<% if (data.finalPrice.value) { %>' +
+        '<% if (data.finalPrice.value > 0) { %>' +
         ' +<%- data.finalPrice.formatted %>' +
+        '<% } else if (data.finalPrice.value < 0) { %>' +
+        ' <%- data.finalPrice.formatted %>' +
         '<% } %>',
         controlContainer: 'dd'
     };

app/code/Magento/Customer/Model/Customer/NotificationStorage.php

@@ -5,6 +5,7 @@
  */
 namespace Magento\Customer\Model\Customer;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Cache\FrontendInterface;
 use Magento\Framework\Serialize\SerializerInterface;
 
@@ -18,21 +19,21 @@ class NotificationStorage
     private $cache;
 
     /**
-     * @param FrontendInterface $cache
-     */
-
-    /**
-     * @param FrontendInterface $cache
+     * @var SerializerInterface
      */
     private $serializer;
 
     /**
      * NotificationStorage constructor.
      * @param FrontendInterface $cache
+     * @param SerializerInterface $serializer
      */
-    public function __construct(FrontendInterface $cache)
-    {
+    public function __construct(
+        FrontendInterface $cache,
+        SerializerInterface $serializer = null
+    ) {
         $this->cache = $cache;
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(SerializerInterface::class);
     }
 
     /**
@@ -45,7 +46,7 @@ public function __construct(FrontendInterface $cache)
     public function add($notificationType, $customerId)
     {
         $this->cache->save(
-            $this->getSerializer()->serialize([
+            $this->serializer->serialize([
                 'customer_id' => $customerId,
                 'notification_type' => $notificationType
             ]),
@@ -88,19 +89,4 @@ private function getCacheKey($notificationType, $customerId)
     {
         return 'notification_' . $notificationType . '_' . $customerId;
     }
-
-    /**
-     * Get serializer
-     *
-     * @return SerializerInterface
-     * @deprecated 100.2.0
-     */
-    private function getSerializer()
-    {
-        if ($this->serializer === null) {
-            $this->serializer = \Magento\Framework\App\ObjectManager::getInstance()
-                ->get(SerializerInterface::class);
-        }
-        return $this->serializer;
-    }
 }

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_tooltip.less

@@ -8,7 +8,6 @@
 //  _____________________________________________
 
 @checkout-tooltip__hover__z-index: @tooltip__z-index;
-@checkout-tooltip-breakpoint__screen-m: @modal-popup-breakpoint-screen__m;
 
 @checkout-tooltip-icon-arrow__font-size: 10px;
 @checkout-tooltip-icon-arrow__left: -( @checkout-tooltip-content__padding + @checkout-tooltip-icon-arrow__font-size - @checkout-tooltip-content__border-width);
@@ -138,7 +137,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @checkout-tooltip-breakpoint__screen-m) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .field-tooltip {
         .field-tooltip-content {
             &:extend(.abs-checkout-tooltip-content-position-top-mobile all);

app/design/frontend/Magento/blank/Magento_Sales/web/css/source/_module.less

@@ -262,7 +262,7 @@
         }
 
         .toolbar {
-            &:extend(.abs-add-clearfix-desktop all);
+            &:extend(.abs-add-clearfix-mobile all);
 
             .pages {
                 float: right;

app/design/frontend/Magento/blank/web/css/source/components/_modals_extend.less

@@ -16,7 +16,6 @@
 
 @modal-popup-title__font-size: 26px;
 @modal-popup-title-mobile__font-size: @font-size__base;
-@modal-popup-breakpoint-screen__m: @screen__m;
 
 @modal-slide__first__indent-left: 44px;
 @modal-slide-mobile__background-color: @color-gray-light01;
@@ -149,7 +148,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .modal-popup {
         &.modal-slide {
             .modal-inner-wrap[class] {
@@ -180,7 +179,7 @@
 //  Desktop
 //  _____________________________________________
 
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .modal-popup {
         &.modal-slide {
             .modal-footer {

app/design/frontend/Magento/luma/web/css/source/components/_modals_extend.less

@@ -16,7 +16,6 @@
 
 @modal-popup-title__font-size: 26px;
 @modal-popup-title-mobile__font-size: @font-size__base;
-@modal-popup-breakpoint-screen__m: @screen__m;
 
 @modal-slide__first__indent-left: 44px;
 @modal-slide-mobile__background-color: @color-gray-light01;
@@ -148,7 +147,7 @@
     }
 }
 
-.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
     .modal-popup {
         &.modal-slide {
             .modal-inner-wrap[class] {
@@ -179,7 +178,7 @@
 //  Desktop
 //  _____________________________________________
 
-.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @modal-popup-breakpoint-screen__m) {
+.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .modal-popup {
         &.modal-slide {
             .modal-footer {

lib/internal/Magento/Framework/App/Request/Http.php

@@ -149,7 +149,7 @@ public function setPathInfo($pathInfo = null)
                 return $this;
             }
 
-            $requestUri = $this->removeRepitedSlashes($requestUri);
+            $requestUri = $this->removeRepeatedSlashes($requestUri);
             $parsedRequestUri = explode('?', $requestUri, 2);
             $queryString = !isset($parsedRequestUri[1]) ? '' : '?' . $parsedRequestUri[1];
             $baseUrl = $this->getBaseUrl();
@@ -172,7 +172,7 @@ public function setPathInfo($pathInfo = null)
      * @param string $pathInfo
      * @return string
      */
-    private function removeRepitedSlashes($pathInfo)
+    private function removeRepeatedSlashes($pathInfo)
     {
         $firstChar = (string)substr($pathInfo, 0, 1);
         if ($firstChar == '/') {