Merge branch 'report-memory-improvements' into phpcs-fixer

Author: gsherwood

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

@@ -59,12 +59,30 @@ public function register()
      */
     public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
     {
-        $tokens = $phpcsFile->getTokens();
-        $start  = ($stackPtr + 1);
-        $end    = ($tokens[$stackPtr]['bracket_closer'] - 1);
+        $tokens  = $phpcsFile->getTokens();
+        $start   = ($stackPtr + 1);
+        $end     = ($tokens[$stackPtr]['bracket_closer'] - 1);
+        $inStyle = false;
 
         for ($i = $start; $i <= $end; $i++) {
-            if ($tokens[$i]['code'] === T_STRING || $tokens[$i]['code'] === T_STYLE) {
+            // Skip nested definitions as they are checked individually.
+            if ($tokens[$i]['code'] === T_OPEN_CURLY_BRACKET) {
+                $i = $tokens[$i]['bracket_closer'];
+                continue;
+            }
+
+            if ($tokens[$i]['code'] === T_STYLE) {
+                $inStyle = true;
+            }
+
+            if ($tokens[$i]['code'] === T_SEMICOLON) {
+                $inStyle = false;
+            }
+
+            if ($tokens[$i]['code'] === T_STYLE
+                || ($inStyle === true
+                && $tokens[$i]['code'] === T_STRING)
+            ) {
                 $expected = strtolower($tokens[$i]['content']);
                 if ($expected !== $tokens[$i]['content']) {
                     $error = 'Style definitions must be lowercase; expected %s but found %s';
@@ -79,7 +97,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
                     }
                 }
             }
-        }
+        }//end for
 
     }//end process()
 

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

@@ -4,3 +4,10 @@
     background-color: #DA9393;
     BACKGROUND-IMAGE: URL(Warning_Close.png);
 }
+
+@media screen and (max-device-width: 769px) {
+
+    .SettingsTabPaneWidgetType-tab-mid {
+        Font-Family: arial;
+    }
+}

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

@@ -40,9 +40,10 @@ class Squiz_Tests_CSS_LowercaseStyleDefinitionUnitTest extends AbstractSniffUnit
     public function getErrorList()
     {
         return array(
-                2 => 1,
-                3 => 1,
-                5 => 2,
+                2  => 1,
+                3  => 1,
+                5  => 2,
+                11 => 1,
                );
 
     }//end getErrorList()

package.xml

@@ -48,6 +48,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Szabolcs Sulik for the patch
   - Squiz and MySource File and Function comment sniffs now allow all tags and don't require a particular licence
   - Squiz standard now allows lines to be 120 characters long before warning; up from 85
+  - Squiz LowercaseStyleDefinitionSniff no longer throws errors for class names in nested style definitions
   - Fixed bug #20026 : Check for multi-line arrays that should be single-line is slightly wrong
     -- Adds new error message for single-line arrays that end with a comma
   - Fixed bug #20029 : ForbiddenFunction sniff incorrectly recognizes methods in USE clauses