Merge branch '2.4-develop' into AC-15165-updated

Author: admanesachin

app/code/Magento/Customer/Model/Validator/City.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -20,10 +20,17 @@ class City extends AbstractValidator
      *
      * \p{L}: Unicode letters.
      * \p{M}: Unicode marks (diacritic marks, accents, etc.).
-     * ': Apostrophe mark.
+     * \d: Digits (0-9).
      * \s: Whitespace characters (spaces, tabs, newlines, etc.).
+     * -: Hyphen.
+     * _: Underscore.
+     * ', ’: Apostrophes (straight and typographical).
+     * .: Period/full stop.
+     * ,: Comma.
+     * &: Ampersand.
+     * (): Parentheses.
      */
-    private const PATTERN_CITY = '/(?:[\p{L}\p{M}\s\-\']{1,100})/u';
+    private const PATTERN_CITY = '/^[\p{L}\p{M}\d\s\-_\'’\.,&\(\)]{1,100}$/u';
 
     /**
      * Validate city fields.
@@ -35,7 +42,8 @@ public function isValid($customer)
     {
         if (!$this->isValidCity($customer->getCity())) {
             parent::_addMessages([[
-                'city' => "Invalid City. Please use A-Z, a-z, 0-9, -, ', spaces"
+                'city' => "Invalid City. Please use letters, numbers, spaces,
+                and the following characters: - _ ' ’ . , & ( )"
             ]]);
         }
 

app/code/Magento/Customer/Test/Unit/Model/Validator/CityTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -79,6 +79,38 @@ public static function expectedPunctuationInNamesDataProvider(): array
             [
                 'city' => ' Moscow Moscow',
                 'message' => 'Whitespace characters must be allowed in city'
+            ],
+            [
+                'city' => 'O\'Higgins',
+                'message' => 'Straight apostrophe must be allowed in city names'
+            ],
+            [
+                'city' => 'O’Higgins',
+                'message' => 'Typographical apostrophe must be allowed in city names'
+            ],
+            [
+                'city' => 'Saint_Petersburg',
+                'message' => 'Underscore must be allowed in city names'
+            ],
+            [
+                'city' => 'Stratford-upon-Avon',
+                'message' => 'Hyphens must be allowed in city names'
+            ],
+            [
+                'city' => 'St. Petersburg',
+                'message' => 'Periods must be allowed in city names'
+            ],
+            [
+                'city' => 'Trinidad & Tobago',
+                'message' => 'Ampersand must be allowed in city names'
+            ],
+            [
+                'city' => 'Winston-Salem (NC)',
+                'message' => 'Parentheses must be allowed in city names'
+            ],
+            [
+                'city' => 'Rostov-on-Don, Russia',
+                'message' => 'Commas must be allowed in city names'
             ]
         ];
     }

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

@@ -1,7 +1,7 @@
-// /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+/**
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
+ */
 
 //
 //  Variables
@@ -32,7 +32,7 @@
 @checkout-shipping-item-mobile__active__padding: 15px (@indent__l + 5px) 15px 18px;
 
 @checkout-shipping-item-before__border-color: @color-gray80;
-@checkout-shipping-item-before__height: calc(~'100% - 20px');
+@checkout-shipping-item-before__height: ~"calc(100% - 20px)";
 
 @checkout-shipping-method__border: @checkout-step-title__border;
 @checkout-shipping-method__padding: @indent__base;

app/design/frontend/Magento/luma/Magento_Checkout/web/css/source/module/checkout/_shipping.less

@@ -1,7 +1,7 @@
-// /**
-//  * Copyright © Magento, Inc. All rights reserved.
-//  * See COPYING.txt for license details.
-//  */
+/**
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
+ */
 
 //
 //  Variables
@@ -32,7 +32,7 @@
 @checkout-shipping-item-mobile__active__padding: 15px (@indent__l + 5px) 15px 18px;
 
 @checkout-shipping-item-before__border-color: @color-gray80;
-@checkout-shipping-item-before__height: calc(~'100% - 20px');
+@checkout-shipping-item-before__height: ~"calc(100% - 20px)";
 
 @checkout-shipping-method__border: @checkout-step-title__border;
 @checkout-shipping-method__padding: @indent__base;

lib/web/css/source/lib/_responsive.less

@@ -74,6 +74,11 @@
         .media-width('max', @screen__l);
     }
 
+    @media all and (min-width: (@screen__l)),
+    print {
+        .media-width('min', @screen__l);
+    }
+
     @media all and (min-width: @screen__xl),
     print {
         .media-width('min', @screen__xl);