cvs: pear /PHP_CodeSniffer CodeSniffer.php package.xml

squiz Thu May 17 00:42:17 2007 UTC

Modified files:
/pear/PHP_CodeSniffer CodeSniffer.php package.xml
Log:
Fixed error where including a directory of sniffs in a coding standard class did not work

http://cvs.php.net/viewvc.cgi/pear/P...&diff_format=u
Index: pear/PHP_CodeSniffer/CodeSniffer.php
diff -u pear/PHP_CodeSniffer/CodeSniffer.php:1.29 pear/PHP_CodeSniffer/CodeSniffer.php:1.30
--- pear/PHP_CodeSniffer/CodeSniffer.php:1.29 Wed May 9 06:44:12 2007
+++ pear/PHP_CodeSniffer/CodeSniffer.php Thu May 17 00:42:17 2007
@@ -11,7 +11,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: CodeSniffer.php,v 1.29 2007/05/09 06:44:12 squiz Exp $
+ * @version CVS: $Id: CodeSniffer.php,v 1.30 2007/05/17 00:42:17 squiz Exp $
* @link http://pear.php.net/package/PHP_CodeSniffer
*/

@@ -295,10 +295,10 @@
if (is_dir($sniffDir) === true) {
if (PHP_CodeSniffer::isInstalledStandard($sniff) === true) {
// We are including a whole coding standard.
- $files += $this->_getSniffFiles($sniffDir, $sniff);
+ $files = array_merge($files, $this->_getSniffFiles($sniffDir, $sniff));
} else {
// We are including a whole directory of sniffs.
- $files += $this->_getSniffFiles($sniffDir);
+ $files = array_merge($files, $this->_getSniffFiles($sniffDir));
}
} else {
if (substr($sniffDir, -5) !== 'Sniff') {
http://cvs.php.net/viewvc.cgi/pear/P...&diff_format=u
Index: pear/PHP_CodeSniffer/package.xml
diff -u pear/PHP_CodeSniffer/package.xml:1.63 pear/PHP_CodeSniffer/package.xml:1.64
--- pear/PHP_CodeSniffer/package.xml:1.63 Tue May 15 03:53:34 2007
+++ pear/PHP_CodeSniffer/package.xml Thu May 17 00:42:17 2007
@@ -23,8 +23,8 @@
<date>2007-05-15</date>
<time>13:45:00</time>
<version>
- <release>0.6.0</release>
- <api>0.6.0</api>
+ <release>0.6.1</release>
+ <api>0.6.1</api>
</version>
<stability>
<release>beta</release>
@@ -32,18 +32,7 @@
</stability>
<license uri="http://matrix.squiz.net/developer/tools/php_cs/licence">BSD License</license>
<notes>
- - The number of errors and warnings found is now shown for each file while checking the file if verbosity is enabled
- - Now using PHP_EOL instead of hard-coded \n so output looks good on Windows (feature request #10761)
- - Thanks to Carsten Wiedmann for the patch.
- - phpcs now exits with status 0 (no errors) or 1 (errors found) (feature request #10348)
- - Added new -l command line argument to stop recursion into directories (feature request #10979)
- - Fixed variable name error causing incorrect error message in Squiz ValidVariableNameSniff
- - Fixed bug #10757 : Error in ControlSignatureSniff
- - Fixed bugs #10751, #10777 : Sniffer class paths handled incorrectly in Windows
- - Thanks to Carsten Wiedmann for the patch.
- - Fixed bug #10961 : Error "Last parameter comment requires a blank newline after it" thrown
- - Fixed bug #10983 : phpcs outputs notices when checking invalid PHP
- - Fixed bug #10980 : Incorrect warnings for equals sign
+ - Fixed error where including a directory of sniffs in a coding standard class did not work
</notes>
<contents>
<dir name="/">