Fixed bug #19283 : CSS @media rules cause false positives

Author: gsherwood

CodeSniffer/Standards/Squiz/Sniffs/CSS/IndentationSniff.php

@@ -72,7 +72,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
             if ($tokens[$i]['code'] === T_OPEN_CURLY_BRACKET) {
                 $indentLevel++;
-            } else if ($tokens[$i]['code'] === T_CLOSE_CURLY_BRACKET) {
+            } else if ($tokens[($i + 1)]['code'] === T_CLOSE_CURLY_BRACKET) {
                 $indentLevel--;
             }
 

CodeSniffer/Standards/Squiz/Sniffs/CSS/MissingColonSniff.php

@@ -64,6 +64,12 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         $end      = $tokens[$stackPtr]['bracket_closer'];
         $endLine  = $tokens[$end]['line'];
 
+        // Do not check nested style definitions as, for example, in @media style rules.
+        $nested = $phpcsFile->findNext(T_OPEN_CURLY_BRACKET, ($stackPtr + 1), $end);
+        if ($nested !== false) {
+            return;
+        }
+
         $foundColon  = false;
         $foundString = false;
         for ($i = ($stackPtr + 1); $i <= $end; $i++) {

CodeSniffer/Standards/Squiz/Tests/CSS/IndentationUnitTest.css

@@ -21,3 +21,11 @@ td {
     background: transparent url(images/ScreenImages/tab_on_right.png) no-repeat;
 }
 */
+
+@media screen and (max-device-width: 769px) {
+    header #logo img {
+    max-width: 100%;
+        padding: 20px;
+         margin: 40px;
+    }
+}

CodeSniffer/Standards/Squiz/Tests/CSS/IndentationUnitTest.php

@@ -46,6 +46,8 @@ public function getErrorList()
                 6  => 1,
                 7  => 1,
                 12 => 1,
+                27 => 1,
+                29 => 1,
                );
 
     }//end getErrorList()

CodeSniffer/Standards/Squiz/Tests/CSS/MissingColonUnitTest.css

@@ -5,3 +5,10 @@
     margin-top: 15px;
     margin-bottom 15px;
 }
+
+@media screen and (max-device-width: 769px) {
+    header #logo img {
+        max-width: 100%;
+        margin-bottom 15px;
+    }
+}

CodeSniffer/Standards/Squiz/Tests/CSS/MissingColonUnitTest.php

@@ -43,6 +43,7 @@ public function getErrorList()
                 2  => 1,
                 4  => 1,
                 6  => 1,
+                12 => 1,
                );
 
     }//end getErrorList()

package.xml

@@ -47,6 +47,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Klaus Purer for the patch
   - Fixed bug #19264 : Squiz.PHP.NonExecutableCode does not handle RETURN in CASE without BREAK
   - Fixed bug #19270 : DuplicateClassName does not handle namespaces correctly
+  - Fixed bug #19283 : CSS @media rules cause false positives
+    -- Thanks to Klaus Purer for the patch
  </notes>
  <contents>
   <dir name="/">