Merge remote-tracking branch 'upstream/develop' into simplify-install…

…-instructions
magento · Feb 14, 2023 · e51c908 · e51c908
2 parents a2cb670 + 5f4cb84
commit e51c908
Show file tree

Hide file tree

Showing 4 changed files with 129 additions and 3 deletions.
diff --git a/Magento2/Sniffs/Less/ClassNamingSniff.php b/Magento2/Sniffs/Less/ClassNamingSniff.php
@@ -66,7 +66,10 @@ public function process(File $phpcsFile, $stackPtr)
                 [implode("", $matches[0])]
             );
         }
-        if (strpos($className, self::STRING_HELPER_CLASSES_PREFIX, 2) !== false) {
+
+        if (strpos($className, self::STRING_HELPER_CLASSES_PREFIX, 2) !== false
+            && !str_starts_with($className, 'admin__')
+        ) {
             $phpcsFile->addError(
                 'CSS class names should be separated with "-" (dash) instead of "_" (underscore)',
                 $stackPtr,

diff --git a/Magento2/Tests/Less/ClassNamingUnitTest.less b/Magento2/Tests/Less/ClassNamingUnitTest.less
@@ -30,3 +30,8 @@
 .category-title {
   background: green;
 }
+
+// @see https://github.com/magento/magento-coding-standard/issues/409
+.admin__allowed {
+  background: green;
+}
diff --git a/composer.json b/composer.json
@@ -15,7 +15,8 @@
         "ext-dom": "*",
         "phpcompatibility/php-compatibility": "^9.3",
         "squizlabs/php_codesniffer": "^3.6.1",
-        "rector/rector": "^0.15.10"
+        "rector/rector": "^0.15.10",
+        "symfony/polyfill": "^1.16"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5.8"

diff --git a/composer.lock b/composer.lock