Skip to content

Commit bae8e07

Browse files
committed
Merge branch 'master' into report-memory-improvements
2 parents 8043283 + 4ba76ba commit bae8e07

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

CodeSniffer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ public static function autoload($className)
273273
$newClassName = $className;
274274
}
275275

276-
$path = str_replace('_', '/', $newClassName).'.php';
276+
$path = str_replace(array('_', '\\'), '/', $newClassName).'.php';
277277

278278
if (is_file(dirname(__FILE__).'/'.$path) === true) {
279279
// Check standard file locations based on class name.

package.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
3232
- Added support for the PHP 5.5 T_FINALLY token to detect try/catch/finally statements
3333
- Added empty CodeSniffer.conf to enable config settings for Composer installs
3434
- Added Generic EndFileNoNewlineSniff to ensure there is no newline at the end of a file
35+
- Autoloader can now load PSR-0 compliant classes
36+
-- Thanks to Maik Penz for the patch
3537
- Squiz NonExecutableCodeSniff no longer throws error for multi-line RETURNs inside CASE statements
3638
-- Thanks to Marc Ypes for the patch
3739
- Squiz OperatorSpacingSniff no longer reports errors for negative numbers inside inline THEN statements

0 commit comments

Comments
 (0)