cvs: pear /PHP_CodeSniffer package.xml /PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions ValidClassNameSniff.php /PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions ValidClassNameUnitTest.inc ValidClassNameUnitTest.php

http://cvs.php.net/viewvc.cgi/pear/PHP_CodeSniffer/package.xml?r1=1.261&r2=1.262&diff_format=u
Index: pear/PHP_CodeSniffer/package.xml
diff -u pear/PHP_CodeSniffer/package.xml:1.261 pear/PHP_CodeSniffer/package.xml:1.262
--- pear/PHP_CodeSniffer/package.xml:1.261	Mon Apr 21 01:32:33 2008
+++ pear/PHP_CodeSniffer/package.xml	Mon Apr 28 01:02:28 2008
@@ -23,74 +23,16 @@
  <date>2008-04-21</date>
  <time>10:44:00</time>
  <version>
-  <release>1.1.0a1</release>
-  <api>1.1.0a1</api>
+  <release>1.1.0RC1</release>
+  <api>1.1.0RC1</api>
  </version>
  <stability>
-  <release>alpha</release>
-  <api>alpha</api>
+  <release>beta</release>
+  <api>beta</api>
  </stability>
  <license uri="http://matrix.squiz.net/developer/tools/php_cs/licence">BSD License</license>
  <notes>
-  - Added support for multiple tokenizers so PHP_CodeSniffer can check more than just PHP files
-    -- PHP_CodeSniffer now has a JS tokenizer for checking JavaScript files
-    -- Sniffs need to be updated to work with additional tokenizers, or new sniffs written for them
-  - phpcs now exits with status 2 if the tokenier extension has been disabled (feature request #13269)
-  - Added scripts/phpcs-svn-pre-commit that can be used as an SVN pre-commit hook
-    - Also reworked the way the phpcs script works to make it easier to wrap it with other functionality
-    - Thanks to Jack Bates for the contribution
-  - Fixed error in phpcs error message when a supplied file does not exist
-  - Fixed a cosmetic error in AbstractPatternSniff where the "found" string was missing some content
-  - Added sniffs that implement part of the PMD rule catalog to the Generic standard
-    -- Thanks to Manuel Pichler for the contribution of all these sniffs.
-  - Squiz FunctionCommentThrowTagSniff no longer throws errors for function that only throw variables
-  - Generic ScopeIndentSniff now has private member to enforce exact indent matching
-  - Replaced Squiz DisallowCountInLoopsSniff with Squiz DisallowSizeFunctionsInLoopsSniff
-    -- Thanks to Jan Miczaika for the sniff
-  - Squiz BlockCommentSniff now checks inline doc block comments
-  - Squiz InlineCommentSniff now checks inline doc block comments
-  - Squiz BlockCommentSniff now checks for no blank line before first comment in a function
-  - Squiz DocCommentAlignmentSniff now ignores inline doc block comments
-  - Squiz ControlStructureSpacingSniff now ensures no blank lines at the start of control structures
-  - Squiz ControlStructureSpacingSniff now ensures no blank lines between control structure closing braces
-  - Squiz IncrementDecrementUsageSniff now ensures inc/dec ops are bracketed in string concats
-  - Squiz IncrementDecrementUsageSniff now ensures inc/dec ops are not used in arithmetic operations
-  - Squiz FunctionCommentSniff no longer throws errors if return value is mixed but function returns void somewhere
-  - Squiz OperatorBracketSniff no allows function call brackets to count as operator brackets
-  - Squiz DoubleQuoteUsageSniff now supports \x \f and \v (feature request #13365)
-  - Squiz ComparisonOperatorUsageSniff now supports JS files
-  - Squiz ControlSignatureSniff now supports JS files
-  - Squiz ForLoopDeclarationSniff now supports JS files
-  - Squiz OperatorBracketSniff now supports JS files
-  - Squiz InlineControlStructureSniff now supports JS files
-  - Generic LowerCaseConstantSniff now supports JS files
-  - Generic DisallowTabIndentSniff now supports JS files
-  - Generic MultipleStatementAlignmentSniff now supports JS files
-  - Added Squiz ObjectMemberCommaSniff to ensure the last member of a JS object is not followed by a comma
-  - Added Squiz ConstantCaseSniff to ensure the PHP constants are uppercase and JS lowercase
-  - Added Squiz JavaScriptLintSniff to check JS files with JSL
-    -- Set path using phpcs --config-set jsl_path /path/to/jsl
-  - Added MySource FirebugConsoleSniff to ban the use of "console" for JS variable and function names
-  - Added MySource JoinStringsSniff to enforce the use of join() to concatenate JS strings
-  - Added MySource AssignThisSniff to ensure this is only assigned to a var called self
-  - Added MySource DisallowNewWidgetSniff to ban manual creation of widget objects
-  - Removed warning shown in Zend CodeAnalyzerSniff when the ZCA path is not set
-  - Fixed error in Squiz ValidVariableNameSniff when checking vars in the form $obj->$var
-  - Fixed error in Squiz DisallowMultipleAssignmentsSniff when checking vars in the form $obj->$var
-  - Fixed error in Squiz InlineCommentSniff where comments for class constants were seen as inline
-  - Fixed error in Squiz BlockCommentSniff where comments for class constants were not ignored
-  - Fixed error in Squiz OperatorBracketSniff where negative numbers were ignored during comparisons
-  - Fixed error in Squiz FunctionSpacingSniff where functions after member vars reported incorrect spacing
-  - Fixed bug #13062 : Interface comments aren't handled in PEAR standard
-    -- Thanks to Manuel Pichler for the path
-  - Fixed bug #13119 : php minimum requirement need to be fix
-  - Fixed bug #13156 : Bug in Squiz_Sniffs_PHP_NonExecutableCodeSniff
-  - Fixed bug #13158 : Strange behaviour in AbstractPatternSniff
-  - Fixed bug #13169 : Undefined variables
-  - Fixed bug #13178 : Catch exception in File.php
-  - Fixed bug #13254 : Notices output in checkstyle report causes XML issues
-  - Fixed bug #13446 : crash with src of phpMyAdmin
-    -- Thanks to Manuel Pichler for the path
+  - Fixed error in PEAR ValidClassNameSniff when checking class names with double underscores
  </notes>
  <contents>
   <dir name="/">
http://cvs.php.net/viewvc.cgi/pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php?r1=1.9&r2=1.10&diff_format=u
Index: pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php
diff -u pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php:1.9 pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php:1.10
--- pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php:1.9	Thu Feb 28 22:01:17 2008
+++ pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Sniffs/NamingConventions/ValidClassNameSniff.php	Mon Apr 28 01:02:28 2008
@@ -10,7 +10,7 @@
  * @author    Marc McIntyre <[email protected]>
  * @copyright 2006 Squiz Pty Ltd (ABN 77 084 670 600)
  * @license   http://matrix.squiz.net/developer/tools/php_cs/licence BSD Licence
- * @version   CVS: $Id: ValidClassNameSniff.php,v 1.9 2008/02/28 22:01:17 squiz Exp $
+ * @version   CVS: $Id: ValidClassNameSniff.php,v 1.10 2008/04/28 01:02:28 squiz Exp $
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
@@ -92,7 +92,9 @@
             } else {
                 $newName = strtoupper($firstBit{0}).substr($firstBit, 1).'_';
                 foreach ($nameBits as $bit) {
-                    $newName .= strtoupper($bit{0}).substr($bit, 1).'_';
+                    if ($bit !== '') {
+                        $newName .= strtoupper($bit{0}).substr($bit, 1).'_';
+                    }
                 }
 
                 $newName = rtrim($newName, '_');
http://cvs.php.net/viewvc.cgi/pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.inc?r1=1.2&r2=1.3&diff_format=u
Index: pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.inc
diff -u pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.inc:1.2 pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.inc:1.3
--- pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.inc:1.2	Thu Feb 28 22:01:17 2008
+++ pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.inc	Mon Apr 28 01:02:28 2008
@@ -41,4 +41,8 @@
 
 interface ___ {}
 
+class Invalid__Name {}
+
+interface Invalid__Name {}
+
 ?>
http://cvs.php.net/viewvc.cgi/pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php?r1=1.4&r2=1.5&diff_format=u
Index: pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php
diff -u pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php:1.4 pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php:1.5
--- pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php:1.4	Thu Feb 28 22:01:17 2008
+++ pear/PHP_CodeSniffer/CodeSniffer/Standards/PEAR/Tests/NamingConventions/ValidClassNameUnitTest.php	Mon Apr 28 01:02:28 2008
@@ -10,7 +10,7 @@
  * @author    Marc McIntyre <[email protected]>
  * @copyright 2006 Squiz Pty Ltd (ABN 77 084 670 600)
  * @license   http://matrix.squiz.net/developer/tools/php_cs/licence BSD Licence
- * @version   CVS: $Id: ValidClassNameUnitTest.php,v 1.4 2008/02/28 22:01:17 squiz Exp $
+ * @version   CVS: $Id: ValidClassNameUnitTest.php,v 1.5 2008/04/28 01:02:28 squiz Exp $
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
@@ -54,6 +54,8 @@
                 38 => 1,
                 40 => 2,
                 42 => 2,
+                44 => 1,
+                46 => 1,
                );
 
     }//end getErrorList()