From 678228709141057d1f1bee4c0386d63418b55890 Mon Sep 17 00:00:00 2001 From: "Baptiste \"Talus\" Clavie" Date: Thu, 22 Mar 2012 11:12:30 +0100 Subject: [PATCH 1/2] [ClassLoader] Got an if-condition out of a unnecessary loop --- src/Composer/Autoload/ClassLoader.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Composer/Autoload/ClassLoader.php b/src/Composer/Autoload/ClassLoader.php index 94fc76ac1..88b4c3fb7 100644 --- a/src/Composer/Autoload/ClassLoader.php +++ b/src/Composer/Autoload/ClassLoader.php @@ -181,8 +181,8 @@ class ClassLoader $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php'; foreach ($this->prefixes as $prefix => $dirs) { - foreach ($dirs as $dir) { - if (0 === strpos($class, $prefix)) { + if (0 === strpos($class, $prefix)) { + foreach ($dirs as $dir) { if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) { return $dir . DIRECTORY_SEPARATOR . $classPath; } From 6957743aee8f6ab22ff241f340f665b0580a103d Mon Sep 17 00:00:00 2001 From: "Baptiste \"Talus\" Clavie" Date: Thu, 22 Mar 2012 11:19:01 +0100 Subject: [PATCH 2/2] [ClassLoader] Corrected indentation --- src/Composer/Autoload/ClassLoader.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Composer/Autoload/ClassLoader.php b/src/Composer/Autoload/ClassLoader.php index 88b4c3fb7..ae1cb9731 100644 --- a/src/Composer/Autoload/ClassLoader.php +++ b/src/Composer/Autoload/ClassLoader.php @@ -180,9 +180,9 @@ class ClassLoader $classPath .= str_replace('_', DIRECTORY_SEPARATOR, $className) . '.php'; - foreach ($this->prefixes as $prefix => $dirs) { - if (0 === strpos($class, $prefix)) { - foreach ($dirs as $dir) { + foreach ($this->prefixes as $prefix => $dirs) { + if (0 === strpos($class, $prefix)) { + foreach ($dirs as $dir) { if (file_exists($dir . DIRECTORY_SEPARATOR . $classPath)) { return $dir . DIRECTORY_SEPARATOR . $classPath; }