Completed
Pull Request — master (#216)
by Kenji
02:19
created
application/tests/_ci_phpunit_test/replacing/core/Loader.php 1 patch
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -63,63 +63,63 @@  discard block
 block discarded – undo
63 63
 	 *
64 64
 	 * @var	array
65 65
 	 */
66
-	protected $_ci_view_paths =	array(VIEWPATH	=> TRUE);
66
+	protected $_ci_view_paths = array(VIEWPATH	=> TRUE);
67 67
 
68 68
 	/**
69 69
 	 * List of paths to load libraries from
70 70
 	 *
71 71
 	 * @var	array
72 72
 	 */
73
-	protected $_ci_library_paths =	array(APPPATH, BASEPATH);
73
+	protected $_ci_library_paths = array(APPPATH, BASEPATH);
74 74
 
75 75
 	/**
76 76
 	 * List of paths to load models from
77 77
 	 *
78 78
 	 * @var	array
79 79
 	 */
80
-	protected $_ci_model_paths =	array(APPPATH);
80
+	protected $_ci_model_paths = array(APPPATH);
81 81
 
82 82
 	/**
83 83
 	 * List of paths to load helpers from
84 84
 	 *
85 85
 	 * @var	array
86 86
 	 */
87
-	protected $_ci_helper_paths =	array(APPPATH, BASEPATH);
87
+	protected $_ci_helper_paths = array(APPPATH, BASEPATH);
88 88
 
89 89
 	/**
90 90
 	 * List of cached variables
91 91
 	 *
92 92
 	 * @var	array
93 93
 	 */
94
-	protected $_ci_cached_vars =	array();
94
+	protected $_ci_cached_vars = array();
95 95
 
96 96
 	/**
97 97
 	 * List of loaded classes
98 98
 	 *
99 99
 	 * @var	array
100 100
 	 */
101
-	protected $_ci_classes =	array();
101
+	protected $_ci_classes = array();
102 102
 
103 103
 	/**
104 104
 	 * List of loaded models
105 105
 	 *
106 106
 	 * @var	array
107 107
 	 */
108
-	protected $_ci_models =	array();
108
+	protected $_ci_models = array();
109 109
 
110 110
 	/**
111 111
 	 * List of loaded helpers
112 112
 	 *
113 113
 	 * @var	array
114 114
 	 */
115
-	protected $_ci_helpers =	array();
115
+	protected $_ci_helpers = array();
116 116
 
117 117
 	/**
118 118
 	 * List of class name mappings
119 119
 	 *
120 120
 	 * @var	array
121 121
 	 */
122
-	protected $_ci_varmap =	array(
122
+	protected $_ci_varmap = array(
123 123
 		'unit_test' => 'unit',
124 124
 		'user_agent' => 'agent'
125 125
 	);
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
138 138
 	public function __construct()
139 139
 	{
140 140
 		$this->_ci_ob_level = ob_get_level();
141
-		$this->_ci_classes =& is_loaded();
141
+		$this->_ci_classes = & is_loaded();
142 142
 
143 143
 		log_message('info', 'Loader Class Initialized');
144 144
 	}
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 			return $this;
280 280
 		}
281 281
 
282
-		$CI =& get_instance();
282
+		$CI = & get_instance();
283 283
 		if (isset($CI->$name))
284 284
 		{
285 285
 			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 @@  discard block
 block discarded – undo
382 382
 	public function database($params = '', $return = FALSE, $query_builder = NULL)
383 383
 	{
384 384
 		// Grab the super object
385
-		$CI =& get_instance();
385
+		$CI = & get_instance();
386 386
 
387 387
 		// Do we even need to load the database class?
388 388
 		if ($return === FALSE && $query_builder === NULL && isset($CI->db) && is_object($CI->db) && ! empty($CI->db->conn_id))
@@ -402,7 +402,7 @@  discard block
 block discarded – undo
402 402
 		$CI->db = '';
403 403
 
404 404
 		// Load the DB class
405
-		$CI->db =& DB($params, $query_builder);
405
+		$CI->db = & DB($params, $query_builder);
406 406
 		return $this;
407 407
 	}
408 408
 
@@ -419,12 +419,12 @@  discard block
 block discarded – undo
419 419
 	 */
420 420
 	public function dbutil($db = NULL, $return = FALSE)
421 421
 	{
422
-		$CI =& get_instance();
422
+		$CI = & get_instance();
423 423
 
424 424
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
425 425
 		{
426 426
 			class_exists('CI_DB', FALSE) OR $this->database();
427
-			$db =& $CI->db;
427
+			$db = & $CI->db;
428 428
 		}
429 429
 
430 430
 		require_once(BASEPATH.'database/DB_utility.php');
@@ -453,11 +453,11 @@  discard block
 block discarded – undo
453 453
 	 */
454 454
 	public function dbforge($db = NULL, $return = FALSE)
455 455
 	{
456
-		$CI =& get_instance();
456
+		$CI = & get_instance();
457 457
 		if ( ! is_object($db) OR ! ($db instanceof CI_DB))
458 458
 		{
459 459
 			class_exists('CI_DB', FALSE) OR $this->database();
460
-			$db =& $CI->db;
460
+			$db = & $CI->db;
461 461
 		}
462 462
 
463 463
 		require_once(BASEPATH.'database/DB_forge.php');
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
 		$this->_ci_view_paths = array($path.'views/' => $view_cascade) + $this->_ci_view_paths;
820 820
 
821 821
 		// Add config file path
822
-		$config =& $this->_ci_get_component('config');
822
+		$config = & $this->_ci_get_component('config');
823 823
 		$config->_config_paths[] = $path;
824 824
 
825 825
 		return $this;
@@ -858,7 +858,7 @@  discard block
 block discarded – undo
858 858
 	 */
859 859
 	public function remove_package_path($path = '')
860 860
 	{
861
-		$config =& $this->_ci_get_component('config');
861
+		$config = & $this->_ci_get_component('config');
862 862
 
863 863
 		if ($path === '')
864 864
 		{
@@ -961,12 +961,12 @@  discard block
 block discarded – undo
961 961
 
962 962
 		// This allows anything loaded using $this->load (views, files, etc.)
963 963
 		// to become accessible from within the Controller and Model functions.
964
-		$_ci_CI =& get_instance();
964
+		$_ci_CI = & get_instance();
965 965
 		foreach (get_object_vars($_ci_CI) as $_ci_key => $_ci_var)
966 966
 		{
967 967
 			if ( ! isset($this->$_ci_key))
968 968
 			{
969
-				$this->$_ci_key =& $_ci_CI->$_ci_key;
969
+				$this->$_ci_key = & $_ci_CI->$_ci_key;
970 970
 			}
971 971
 		}
972 972
 
@@ -1099,7 +1099,7 @@  discard block
 block discarded – undo
1099 1099
 				isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property];
1100 1100
 			}
1101 1101
 
1102
-			$CI =& get_instance();
1102
+			$CI = & get_instance();
1103 1103
 			if (isset($CI->$property))
1104 1104
 			{
1105 1105
 //				log_message('debug', $class.' class already loaded. Second attempt ignored.');
@@ -1174,7 +1174,7 @@  discard block
 block discarded – undo
1174 1174
 				isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property];
1175 1175
 			}
1176 1176
 
1177
-			$CI =& get_instance();
1177
+			$CI = & get_instance();
1178 1178
 			if ( ! isset($CI->$property))
1179 1179
 			{
1180 1180
 				return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
@@ -1322,7 +1322,7 @@  discard block
 block discarded – undo
1322 1322
 		}
1323 1323
 
1324 1324
 		// Don't overwrite existing properties
1325
-		$CI =& get_instance();
1325
+		$CI = & get_instance();
1326 1326
 		if (isset($CI->$object_name))
1327 1327
 		{
1328 1328
 			if ($CI->$object_name instanceof $class_name)
@@ -1473,7 +1473,7 @@  discard block
 block discarded – undo
1473 1473
 	 */
1474 1474
 	protected function &_ci_get_component($component)
1475 1475
 	{
1476
-		$CI =& get_instance();
1476
+		$CI = & get_instance();
1477 1477
 		return $CI->$component;
1478 1478
 	}
1479 1479
 }
Please login to merge, or discard this patch.