From 33066c11cc23498409eb2a699474761b14deca37 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sat, 13 Aug 2011 10:30:20 +0200 Subject: [PATCH] [ClassLoader] fixed CS --- UniversalClassLoader.php | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/UniversalClassLoader.php b/UniversalClassLoader.php index 1aef84d..d296b94 100644 --- a/UniversalClassLoader.php +++ b/UniversalClassLoader.php @@ -220,13 +220,15 @@ public function findFile($class) // namespaced class name $namespace = substr($class, 0, $pos); foreach ($this->namespaces as $ns => $dirs) { - if (0 === strpos($namespace, $ns)) { - foreach ($dirs as $dir) { - $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; - } + if (0 !== strpos($namespace, $ns)) { + continue; + } + + foreach ($dirs as $dir) { + $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 @@ public function findFile($class) } else { // PEAR-like class name foreach ($this->prefixes as $prefix => $dirs) { - if (0 === strpos($class, $prefix)) { - foreach ($dirs as $dir) { - $file = $dir.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $class).'.php'; - if (file_exists($file)) { - return $file; - } + if (0 !== strpos($class, $prefix)) { + continue; + } + + foreach ($dirs as $dir) { + $file = $dir.DIRECTORY_SEPARATOR.str_replace('_', DIRECTORY_SEPARATOR, $class).'.php'; + if (file_exists($file)) { + return $file; } } }