diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ClassLoader] fixed CS

Browse Source
This commit is contained in:
Fabien Potencier 2011-08-13 10:30:20 +02:00
parent 4dd599ce06
commit 7f3b6baf3a
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Symfony/Component/ClassLoader/UniversalClassLoader.php
View File

@ -220,13 +220,15 @@ class UniversalClassLoader
// namespaced class name // namespaced class name
$namespace = substr($class, 0, $pos); $namespace = substr($class, 0, $pos);
foreach ($this->namespaces as $ns => $dirs) { foreach ($this->namespaces as $ns => $dirs) {
if (0 === strpos($namespace, $ns)) { if (0 !== strpos($namespace, $ns)) {
foreach ($dirs as $dir) { continue;
$className = substr($class, $pos + 1); }
$file = $dir.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
if (file_exists($file)) { foreach ($dirs as $dir) {
return $file; $className = substr($class, $pos + 1);
} $file = $dir.DIRECTORY_SEPARATOR.str_replace('\\', DIRECTORY_SEPARATOR, $namespace).DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $className).'.php';
if (file_exists($file)) {
return $file;
} }
} }
} }
@ -240,12 +242,14 @@ class UniversalClassLoader
} else { } else {
// PEAR-like class name // PEAR-like class name
foreach ($this->prefixes as $prefix => $dirs) { foreach ($this->prefixes as $prefix => $dirs) {
if (0 === strpos($class, $prefix)) { if (0 !== strpos($class, $prefix)) {
foreach ($dirs as $dir) { continue;
$file = $dir.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $class).'.php'; }
if (file_exists($file)) {
return $file; foreach ($dirs as $dir) {
} $file = $dir.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $class).'.php';
if (file_exists($file)) {
return $file;
} }
} }
} }