public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Bug fix & changing loop + array_unshift to array_merge

pull/1324/head
Joe Holdcroft 2013-01-17 14:12:03 +00:00
parent 538cdc914b
commit 7d5e4f76fb
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Composer/Autoload/ClassLoader.php
View File

@ -84,12 +84,17 @@ class ClassLoader
public function add($prefix, $paths, $prepend = false) public function add($prefix, $paths, $prepend = false)
{ {
if (!$prefix) { if (!$prefix) {
foreach ((array) $paths as $path) {
if ($prepend) { if ($prepend) {
array_unshift($this->fallbackDirs, $path); $this->fallbackDirs = array_merge(
} else { (array) $paths,
$this->fallbackDirs[] = $path; $this->fallbackDirs
);
} }
else {
$this->fallbackDirs = array_merge(
$this->fallbackDirs,
(array) $paths
);
} }
return; return;
@ -121,7 +126,7 @@ class ClassLoader
public function set($prefix, $paths) public function set($prefix, $paths)
{ {
if (!$prefix) { if (!$prefix) {
$this->fallbackDirs = (array) $path; $this->fallbackDirs = (array) $paths;
return; return;
} }