Merge branch 'master' into report-memory-improvements

Author: gsherwood

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

@@ -69,7 +69,6 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         $tokens = $phpcsFile->getTokens();
 
         $numTokens    = (count($tokens) - 2);
-        $currentLine  = 0;
         $indentLevel  = 0;
         $nestingLevel = 0;
         for ($i = 1; $i < $numTokens; $i++) {
@@ -94,7 +93,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                 $indentLevel--;
             }
 
-            if ($tokens[$i]['line'] === $currentLine) {
+            if ($tokens[$i]['column'] !== 1) {
                 continue;
             }
 
@@ -122,10 +121,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                          );
                 $phpcsFile->addError($error, $i, 'Incorrect', $data);
             }
-
-            $currentLine = $tokens[$i]['line'];
         }//end foreach
-
     }//end process()
 
 }//end class

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

@@ -42,3 +42,7 @@ td {
     }
 
 }
+
+.GUIFileUpload {
+/*     opacity: 0.25; */
+}

package.xml

@@ -64,6 +64,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Squiz LowercaseStyleDefinitionSniff no longer throws errors for class names in nested style definitions
   - Squiz ClassFileNameSniff no longer throws errors when checking STDIN
   - Squiz CSS sniffs no longer generate errors for IE filters
+  - Squiz CSS IndentationSniff no longer sees comments as blank lines
   - Squiz LogicalOperatorSpacingSniff now ignores whitespace at the end of a line
   - Squiz.Scope.MethodScope.Missing error message now mentions 'visibility' instead of 'scope modifier'
     -- Thanks to Renat Akhmedyanov for the patch