From 60d100f0fde3fba4fa4015f44f490b7ecac16138 Mon Sep 17 00:00:00 2001 From: dchill42 Date: Wed, 29 Aug 2012 12:58:26 -0400 Subject: Added autoloader unit test with minor supporting change in Loader Signed-off-by: dchill42 --- system/core/Loader.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'system') diff --git a/system/core/Loader.php b/system/core/Loader.php index 0d05649ca..638c7932c 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -74,6 +74,14 @@ class CI_Loader { */ protected $_ci_helper_paths = array(); + /** + * Path to autoloader config file + * This lets us override it in unit testing + * + * @var string + */ + protected $_ci_autoloader_path = APPPATH; + /** * List of loaded base classes * @@ -1140,13 +1148,13 @@ class CI_Loader { */ protected function _ci_autoloader() { - if (defined('ENVIRONMENT') && file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload.php')) + if (defined('ENVIRONMENT') && file_exists($this->_ci_autoloader_path.'config/'.ENVIRONMENT.'/autoload.php')) { - include(APPPATH.'config/'.ENVIRONMENT.'/autoload.php'); + include($this->_ci_autoloader_path.'config/'.ENVIRONMENT.'/autoload.php'); } else { - include(APPPATH.'config/autoload.php'); + include($this->_ci_autoloader_path.'config/autoload.php'); } if ( ! isset($autoload)) -- cgit v1.2.3-24-g4f1b