kenjis / ci-phpunit-test

application/tests/Bootstrap.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
  * NOTE: If you change these, also change the error_reporting() code below
  */
 // This `if` statemant is needed for @runInSeparateProcess
-if (! defined('ENVIRONMENT'))
+if ( ! defined('ENVIRONMENT'))
 {
 	define('ENVIRONMENT', 'testing');
 }
@@ -357,7 +357,7 @@ 
  *  Added for ci-phpunit-test
  * -------------------------------------------------------------------
  */
-require __DIR__ . '/_ci_phpunit_test/CIPHPUnitTest.php';
+require __DIR__.'/_ci_phpunit_test/CIPHPUnitTest.php';
 CIPHPUnitTest::init();
 /*
  * Or you can set directories for autoloading

application/tests/_ci_phpunit_test/replacing/core/Loader.php

Spacing +25 added lines, -25 removed lines

@@ -63,63 +63,63 @@ 
 	 *
 	 * @var	array
 	 */
-	protected $_ci_view_paths =	array(VIEWPATH	=> TRUE);
+	protected $_ci_view_paths = array(VIEWPATH	=> TRUE);
 
 	/**
 	 * List of paths to load libraries from
 	 *
 	 * @var	array
 	 */
-	protected $_ci_library_paths =	array(APPPATH, BASEPATH);
+	protected $_ci_library_paths = array(APPPATH, BASEPATH);
 
 	/**
 	 * List of paths to load models from
 	 *
 	 * @var	array
 	 */
-	protected $_ci_model_paths =	array(APPPATH);
+	protected $_ci_model_paths = array(APPPATH);
 
 	/**
 	 * List of paths to load helpers from
 	 *
 	 * @var	array
 	 */
-	protected $_ci_helper_paths =	array(APPPATH, BASEPATH);
+	protected $_ci_helper_paths = array(APPPATH, BASEPATH);
 
 	/**
 	 * List of cached variables
 	 *
 	 * @var	array
 	 */
-	protected $_ci_cached_vars =	array();
+	protected $_ci_cached_vars = array();
 
 	/**
 	 * List of loaded classes
 	 *
 	 * @var	array
 	 */
-	protected $_ci_classes =	array();
+	protected $_ci_classes = array();
 
 	/**
 	 * List of loaded models
 	 *
 	 * @var	array
 	 */
-	protected $_ci_models =	array();
+	protected $_ci_models = array();
 
 	/**
 	 * List of loaded helpers
 	 *
 	 * @var	array
 	 */
-	protected $_ci_helpers =	array();
+	protected $_ci_helpers = array();
 
 	/**
 	 * List of class name mappings
 	 *
 	 * @var	array
 	 */
-	protected $_ci_varmap =	array(
+	protected $_ci_varmap = array(
 		'unit_test' => 'unit',
 		'user_agent' => 'agent'
 	);
@@ -138,7 +138,7 @@ 
 	public function __construct()
 	{
 		$this->_ci_ob_level = ob_get_level();
-		$this->_ci_classes =& is_loaded();
+		$this->_ci_classes = & is_loaded();
 
 		log_message('info', 'Loader Class Initialized');
 	}
@@ -279,7 +279,7 @@ 
 			return $this;
 		}
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$name))
 		{
 			throw new RuntimeException('The model name you are loading is the name of a resource that is already being used: '.$name);
@@ -382,7 +382,7 @@ 
 	public function database($params = '', $return = FALSE, $query_builder = NULL)
 	{
 		// Grab the super object
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		// Do we even need to load the database class?
 		if ($return === FALSE && $query_builder === NULL && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id))
@@ -402,7 +402,7 @@ 
 		$CI->db = '';
 
 		// Load the DB class
-		$CI->db =& DB($params, $query_builder);
+		$CI->db = & DB($params, $query_builder);
 		return $this;
 	}
 
@@ -419,12 +419,12 @@ 
 	 */
 	public function dbutil($db = NULL, $return = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
 		{
 			class_exists('CI_DB', FALSE) OR $this->database();
-			$db =& $CI->db;
+			$db = & $CI->db;
 		}
 
 		require_once(BASEPATH.'database/DB_utility.php');
@@ -453,11 +453,11 @@ 
 	 */
 	public function dbforge($db = NULL, $return = FALSE)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
 		{
 			class_exists('CI_DB', FALSE) OR $this->database();
-			$db =& $CI->db;
+			$db = & $CI->db;
 		}
 
 		require_once(BASEPATH.'database/DB_forge.php');
@@ -821,7 +821,7 @@ 
 		$this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths;
 
 		// Add config file path
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 		$config->_config_paths[] = $path;
 
 		return $this;
@@ -860,7 +860,7 @@ 
 	 */
 	public function remove_package_path($path = '')
 	{
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 
 		if ($path === '')
 		{
@@ -963,12 +963,12 @@ 
 
 		// This allows anything loaded using $this->load (views, files, etc.)
 		// to become accessible from within the Controller and Model functions.
-		$_ci_CI =& get_instance();
+		$_ci_CI = & get_instance();
 		foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var)
 		{
 			if ( ! isset($this->$_ci_key))
 			{
-				$this->$_ci_key =& $_ci_CI->$_ci_key;
+				$this->$_ci_key = & $_ci_CI->$_ci_key;
 			}
 		}
 
@@ -1110,7 +1110,7 @@ 
 				// return a new instance of the object
 				if ($object_name !== NULL)
 				{
-					$CI =& get_instance();
+					$CI = & get_instance();
 					if ( ! isset($CI->$object_name))
 					{
 						return $this->_ci_init_library($class, '', $params, $object_name);
@@ -1173,7 +1173,7 @@ 
 			// return a new instance of the object
 			if ($object_name !== NULL)
 			{
-				$CI =& get_instance();
+				$CI = & get_instance();
 				if ( ! isset($CI->$object_name))
 				{
 					return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
@@ -1326,7 +1326,7 @@ 
 		}
 
 		// Don't overwrite existing properties
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$object_name))
 		{
 			if ($CI->$object_name instanceof $class_name)
@@ -1477,7 +1477,7 @@ 
 	 */
 	protected function &_ci_get_component($component)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$component;
 	}
 }