Browse Source

got an if-condition out of unnecessary loops in Symfony\Component\ClassLoader\UniversalClassLoader

Baptiste Clavié 13 years ago
parent
commit
7ec533eb93
1 changed files with 4 additions and 4 deletions
  1. 4 4
      src/Symfony/Component/ClassLoader/UniversalClassLoader.php

+ 4 - 4
src/Symfony/Component/ClassLoader/UniversalClassLoader.php

@@ -220,8 +220,8 @@ class UniversalClassLoader
             // namespaced class name
             $namespace = substr($class, 0, $pos);
             foreach ($this->namespaces as $ns => $dirs) {
-                foreach ($dirs as $dir) {
-                    if (0 === strpos($namespace, $ns)) {
+                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)) {
@@ -240,8 +240,8 @@ class UniversalClassLoader
         } else {
             // PEAR-like class name
             foreach ($this->prefixes as $prefix => $dirs) {
-                foreach ($dirs as $dir) {
-                    if (0 === strpos($class, $prefix)) {
+                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;