diff options
author | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:34:05 +0200 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2012-04-26 23:34:05 +0200 |
commit | f59bb1ac944dfaed23150ffd452ce5bca9f5f5c0 (patch) | |
tree | d48f5d570c9f1696997aabb863507d5854e8af50 /tests/mocks/autoloader.php | |
parent | 96ddee29ef2d2deac9bfb91f7d508efca09ee70f (diff) | |
parent | 8ebd1b7a21dec212be7ba0be51ce671f45b389ca (diff) |
Merge branch 'develop' of git://github.com/EllisLab/CodeIgniter into patch
Diffstat (limited to 'tests/mocks/autoloader.php')
-rw-r--r-- | tests/mocks/autoloader.php | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tests/mocks/autoloader.php b/tests/mocks/autoloader.php index dd5929206..f1bdb5d6f 100644 --- a/tests/mocks/autoloader.php +++ b/tests/mocks/autoloader.php @@ -53,13 +53,24 @@ function autoload($class) $dir = BASEPATH.'libraries'.DIRECTORY_SEPARATOR; $class = $subclass; } + elseif (preg_match('/^CI_DB_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) == 3) + { + $driver_path = BASEPATH.'database'.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR; + $dir = $driver_path.$m[1].DIRECTORY_SEPARATOR; + $file = $dir.$m[1].'_'.$m[2].'.php'; + } + elseif (strpos($class, 'CI_DB') === 0) + { + $dir = BASEPATH.'database'.DIRECTORY_SEPARATOR; + $file = $dir.str_replace(array('CI_DB','active_record'), array('DB', 'active_rec'), $subclass).'.php'; + } else { $class = strtolower($class); } } - $file = $dir.$class.'.php'; + $file = (isset($file)) ? $file : $dir.$class.'.php'; if ( ! file_exists($file)) { @@ -71,7 +82,7 @@ function autoload($class) { return FALSE; } - + throw new InvalidArgumentException("Unable to load $class."); } |