Browse Source

Refactoring ClassLoader::add() to return early

Joe Holdcroft 12 years ago
parent
commit
6510ee5c4c
1 changed files with 15 additions and 14 deletions
  1. 15 14
      src/Composer/Autoload/ClassLoader.php

+ 15 - 14
src/Composer/Autoload/ClassLoader.php

@@ -90,21 +90,22 @@ class ClassLoader
 
             return;
         }
-        if (isset($this->prefixes[$prefix])) {
-            if ($prepend) {
-                $this->prefixes[$prefix] = array_merge(
-                    (array) $paths,
-                    $this->prefixes[$prefix]
-                );
-            }
-            else {
-                $this->prefixes[$prefix] = array_merge(
-                    $this->prefixes[$prefix],
-                    (array) $paths
-                );
-            }
-        } else {
+        if (!isset($this->prefixes[$prefix])) {
             $this->prefixes[$prefix] = (array) $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixes[$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixes[$prefix]
+            );
+        }
+        else {
+            $this->prefixes[$prefix] = array_merge(
+                $this->prefixes[$prefix],
+                (array) $paths
+            );
         }
     }