Two uppercase characters can now be placed side-by-side in class name…

…s in Squiz ValidClassNameSniff

git-svn-id: http://svn.php.net/repository/pear/packages/PHP_CodeSniffer/trunk@236198 c90b9560-bf6c-de11-be94-00142212c4b1

CodeSniffer/Standards/Squiz/Sniffs/Classes/ValidClassNameSniff.php

@@ -71,7 +71,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
         $name      = trim($phpcsFile->getTokensAsString($nameStart, ($nameEnd - $nameStart)));
 
         // Check for camel caps format.
-        $valid = PHP_CodeSniffer::isCamelCaps($name, true, true, true);
+        $valid = PHP_CodeSniffer::isCamelCaps($name, true, true, false);
         if ($valid === false) {
             $type  = ucfirst($tokens[$stackPtr]['content']);
             $error = "$type name \"$name\" is not in camel caps format";

CodeSniffer/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.inc

@@ -16,12 +16,12 @@ class invalid_lowercase_class_with_underscores extends MyClass {}
 
 
 // All uppercase.
-class INVALIDUPPERCASECLASS extends MyClass {}
+class VALIDUPPERCASECLASS extends MyClass {}
 class INVALID_UPPERCASE_CLASS_WITH_UNDERSCORES extends MyClass {}
 
 
 // Mix camel case with uppercase.
-class InvalidCamelCaseClassWithUPPERCASE extends MyClass {}
+class ValidCamelCaseClassWithUPPERCASE extends MyClass {}
 
 
 // Invalid usage of numeric characters.

CodeSniffer/Standards/Squiz/Tests/Classes/ValidClassNameUnitTest.php

@@ -48,9 +48,7 @@ public function getErrorList()
                 10 => 1,
                 14 => 1,
                 15 => 1,
-                19 => 1,
                 20 => 1,
-                24 => 1,
                 28 => 1,
                 29 => 1,
                 30 => 1,

package.xml

@@ -34,6 +34,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <notes>
   - Fixed error where including a directory of sniffs in a coding standard class did not work
   - Coding standard classes can now specify a list of sniffs to exclude as well as include (feature request #11056)
+  - Two uppercase characters can now be placed side-by-side in class names in Squiz ValidClassNameSniff
  </notes>
  <contents>
   <dir name="/">