cvs: pear /PHP_CodeSniffer package.xml /PHP_CodeSniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays ArrayDeclarationSniff.php

squiz Mon Dec 10 04:01:23 2007 UTC Modified files: /pear/PHP_CodeSniffer package.xml /pear/PHP_CodeSniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays ArrayDeclarationSniff.php Log: Fixed bug #12645 : error message is wrong http://cvs.php.net/viewvc.cgi/pear/PHP_CodeSniffer/package.xml?r1=1.188&r2=1.189&diff_format=u Index: pear/PHP_CodeSniffer/package.xml diff -u pear/PHP_CodeSniffer/package.xml:1.188 pear/PHP_CodeSniffer/package.xml:1.189 --- pear/PHP_CodeSniffer/package.xml:1.188 Mon Dec 10 03:30:14 2007 +++ pear/PHP_CodeSniffer/package.xml Mon Dec 10 04:01:22 2007 @@ -42,6 +42,8 @@ - Squiz ClassDeclarationSniff now throws errors for a missing end PHP tag after the end class tag - Fixed bug #12621 : "space after AS" check is wrong -- Thanks to Satoshi Oikawa for the patch + - Fixed bug #12645 : error message is wrong + -- Thanks to Renoiv for the patch </notes> <contents> <dir name="/"> http://cvs.php.net/viewvc.cgi/pear/PHP_CodeSniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php?r1=1.12&r2=1.13&diff_format=u Index: pear/PHP_CodeSniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php diff -u pear/PHP_CodeSniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php:1.12 pear/PHP_CodeSniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php:1.13 --- pear/PHP_CodeSniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php:1.12 Tue Oct 23 06:05:14 2007 +++ pear/PHP_CodeSniffer/CodeSniffer/Standards/Squiz/Sniffs/Arrays/ArrayDeclarationSniff.php Mon Dec 10 04:01:23 2007 @@ -10,7 +10,7 @@ * @author Marc McIntyre <mmcintyre@squiz.net> * @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: ArrayDeclarationSniff.php,v 1.12 2007/10/23 06:05:14 squiz Exp $ + * @version CVS: $Id: ArrayDeclarationSniff.php,v 1.13 2007/12/10 04:01:23 squiz Exp $ * @link http://pear.php.net/package/PHP_CodeSniffer */ @@ -146,7 +146,7 @@ if ($tokens[($comma - 1)]['code'] === T_WHITESPACE) { $content = $tokens[($comma - 2)]['content']; $spaceLength = strlen($tokens[($comma - 1)]['content']); - $error = "Expected 1 space between \"$content\" and comma; $spaceLength found"; + $error = "Expected 0 spaces between \"$content\" and comma; $spaceLength found"; $phpcsFile->addError($error, $comma); } }//end foreach