cvs: pear /PHP_CodeSniffer package.xml /PHP_CodeSniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions UpperCaseConstantNameSniff.php /PHP_CodeSniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions UpperCaseConstantNameUnitTest.inc

squiz		Wed May  7 23:13:49 2008 UTC

  Modified files:              
    /pear/PHP_CodeSniffer	package.xml 
    /pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions	
                                                                                	UpperCaseConstantNameSniff.php 
    /pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions	
                                                                               	UpperCaseConstantNameUnitTest.inc 
  Log:
  Generic UpperCaseConstantSniff no longer throws errors for delcare(ticks = ...)
  
http://cvs.php.net/viewvc.cgi/pear/PHP_CodeSniffer/package.xml?r1=1.266&r2=1.267&diff_format=u
Index: pear/PHP_CodeSniffer/package.xml
diff -u pear/PHP_CodeSniffer/package.xml:1.266 pear/PHP_CodeSniffer/package.xml:1.267
--- pear/PHP_CodeSniffer/package.xml:1.266	Mon May  5 23:54:46 2008
+++ pear/PHP_CodeSniffer/package.xml	Wed May  7 23:13:49 2008
@@ -38,6 +38,8 @@
   - Squiz OutputBufferingIndentSniff now ignores the indentation of inline HTML
   - MySource IncludeSystemSniff now ignores usage of ZipArchive
   - Removed "function" from error messages for Generic function brace sniffs (feature request #13820)
+  - Generic UpperCaseConstantSniff no longer throws errors for delcare(ticks = ...)
+    - Thanks to Josh Snyder for the patch
  </notes>
  <contents>
   <dir name="/">
http://cvs.php.net/viewvc.cgi/pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php?r1=1.9&r2=1.10&diff_format=u
Index: pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php
diff -u pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php:1.9 pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php:1.10
--- pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php:1.9	Fri Feb  1 03:19:54 2008
+++ pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Sniffs/NamingConventions/UpperCaseConstantNameSniff.php	Wed May  7 23:13:49 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: UpperCaseConstantNameSniff.php,v 1.9 2008/02/01 03:19:54 squiz Exp $
+ * @version   CVS: $Id: UpperCaseConstantNameSniff.php,v 1.10 2008/05/07 23:13:49 squiz Exp $
  * @link      http://pear.php.net/package/PHP_CodeSniffer
  */
 
@@ -112,6 +112,12 @@
                 return;
             }
 
+            // Is this an instance of declare()
+            $prevPtr = $phpcsFile->findPrevious(array(T_WHITESPACE, T_OPEN_PARENTHESIS), ($stackPtr - 1), null, true);
+            if ($tokens[$prevPtr]['code'] === T_DECLARE) {
+                return;
+            }
+
             // This is a real constant.
             if (strtoupper($constName) !== $constName) {
                 $error = 'Constants must be uppercase; expected '.strtoupper($constName)." but found $constName";
http://cvs.php.net/viewvc.cgi/pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc?r1=1.3&r2=1.4&diff_format=u
Index: pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc
diff -u pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc:1.3 pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc:1.4
--- pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc:1.3	Thu Mar  1 01:04:45 2007
+++ pear/PHP_CodeSniffer/CodeSniffer/Standards/Generic/Tests/NamingConventions/UpperCaseConstantNameUnitTest.inc	Wed May  7 23:13:49 2008
@@ -73,4 +73,9 @@
 
 throw new InvalidSomethingException;
 
+declare(ticks = 1) {
+    foreach ($var as $bit) {
+        echo $bit;
+    }
+}
 ?>
\ No newline at end of file