Merge branch 'master' of https://github.com/rhorber/PHP_CodeSniffer

squizlabs · Oct 30, 2019 · 216455e · 216455e
2 parents 62f5001 + 32d11c7
commit 216455e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/src/Standards/Squiz/Sniffs/CSS/DuplicateClassDefinitionSniff.php b/src/Standards/Squiz/Sniffs/CSS/DuplicateClassDefinitionSniff.php
@@ -88,6 +88,7 @@ public function process(File $phpcsFile, $stackPtr)
             $name = trim($name);
             $name = str_replace("\n", ' ', $name);
             $name = preg_replace('|[\s]+|', ' ', $name);
+            $name = preg_replace('|\s*/\*.*\*/\s*|', '', $name);
             $name = str_replace(', ', ',', $name);
 
             $names = explode(',', $name);

diff --git a/src/Standards/Squiz/Tests/CSS/DuplicateClassDefinitionUnitTest.css b/src/Standards/Squiz/Tests/CSS/DuplicateClassDefinitionUnitTest.css
@@ -71,3 +71,33 @@
 
 .foo /* any comment */
 { color: red; }
+
+/* print comment */
+@media print {
+    /* any comment */
+    td {
+    }
+
+    /* any comment */
+    img {
+    }
+
+    /* any comment */
+    td {
+    }
+}
+
+@media handheld /* handheld comment */
+{
+    td /* any comment */
+    {
+    }
+
+    img /* any comment */
+    {
+    }
+
+    td /* any comment */
+    {
+    }
+}
diff --git a/src/Standards/Squiz/Tests/CSS/DuplicateClassDefinitionUnitTest.php b/src/Standards/Squiz/Tests/CSS/DuplicateClassDefinitionUnitTest.php
@@ -26,9 +26,11 @@ class DuplicateClassDefinitionUnitTest extends AbstractSniffUnitTest
     public function getErrorList()
     {
         return [
-            9  => 1,
-            29 => 1,
-            57 => 1,
+            9   => 1,
+            29  => 1,
+            57  => 1,
+            86  => 1,
+            101 => 1,
         ];
 
     }//end getErrorList()