kenjis / ci-phpunit-test

application/tests/_ci_phpunit_test/patcher/2.x/Patcher/FunctionPatcher.php

Spacing +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
 
 namespace Kenjis\MonkeyPatch\Patcher;
 
-require __DIR__ . '/FunctionPatcher/NodeVisitor.php';
-require __DIR__ . '/FunctionPatcher/Proxy.php';
+require __DIR__.'/FunctionPatcher/NodeVisitor.php';
+require __DIR__.'/FunctionPatcher/Proxy.php';
 
 use LogicException;
 

application/tests/_ci_phpunit_test/patcher/2.x/Patcher/ConstantPatcher.php

Spacing +2 added lines, -2 removed lines

@@ -10,8 +10,8 @@
 
 namespace Kenjis\MonkeyPatch\Patcher;
 
-require __DIR__ . '/ConstantPatcher/NodeVisitor.php';
-require __DIR__ . '/ConstantPatcher/Proxy.php';
+require __DIR__.'/ConstantPatcher/NodeVisitor.php';
+require __DIR__.'/ConstantPatcher/Proxy.php';
 
 use LogicException;
 

application/tests/_ci_phpunit_test/patcher/2.x/MonkeyPatchManager.php

Spacing +17 added lines, -17 removed lines

@@ -37,7 +37,7 @@ 
 
 	public static function log($message)
 	{
-		if (! self::$debug)
+		if ( ! self::$debug)
 		{
 			return;
 		}
@@ -72,7 +72,7 @@ 
 		}
 		if (self::$debug)
 		{
-			self::$log_file = __DIR__ . '/debug.log';
+			self::$log_file = __DIR__.'/debug.log';
 		}
 	}
 
@@ -85,10 +85,10 @@ 
 		else
 		{
 			// APPPATH is constant in CodeIgniter
-			Cache::setProjectRootDir(APPPATH . '../');
+			Cache::setProjectRootDir(APPPATH.'../');
 		}
 
-		if (! isset($config['cache_dir']))
+		if ( ! isset($config['cache_dir']))
 		{
 			throw new LogicException('You have to set "cache_dir"');
 		}
@@ -97,7 +97,7 @@ 
 
 	protected static function setPaths(array $config)
 	{
-		if (! isset($config['include_paths']))
+		if ( ! isset($config['include_paths']))
 		{
 			throw new LogicException('You have to set "include_paths"');
 		}
@@ -158,7 +158,7 @@ 
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpIncludePaths($current);
 		}
@@ -169,7 +169,7 @@ 
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpExcludePaths($current);
 		}
@@ -182,7 +182,7 @@ 
 		// Updated?
 		if ($cached !== self::$patcher_list)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpPatcherList(self::$patcher_list);
 		}
@@ -196,7 +196,7 @@ 
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpFunctionWhitelist($current);
 		}
@@ -258,7 +258,7 @@ 
 	 */
 	public static function patch($path)
 	{
-		if (! is_readable($path))
+		if ( ! is_readable($path))
 		{
 			throw new LogicException("Can't read '$path'");
 		}
@@ -266,17 +266,17 @@ 
 		// Check cache file
 		if ($cache_file = Cache::getValidSrcCachePath($path))
 		{
-			self::log('cache_hit: ' . $path);
+			self::log('cache_hit: '.$path);
 			return fopen($cache_file, 'r');
 		}
 
-		self::log('cache_miss: ' . $path);
+		self::log('cache_miss: '.$path);
 		$source = file_get_contents($path);
 
 		list($new_source, $patched) = self::execPatchers($source);
 
 		// Write to cache file
-		self::log('write_cache: ' . $path);
+		self::log('write_cache: '.$path);
 		Cache::writeSrcCacheFile($path, $new_source);
 
 		$resource = fopen('php://memory', 'rb+');
@@ -292,12 +292,12 @@ 
 			return;
 		}
 
-		require __DIR__ . '/Patcher/AbstractPatcher.php';
-		require __DIR__ . '/Patcher/Backtrace.php';
+		require __DIR__.'/Patcher/AbstractPatcher.php';
+		require __DIR__.'/Patcher/Backtrace.php';
 
 		foreach (self::$patcher_list as $classname)
 		{
-			require __DIR__ . '/Patcher/' . $classname . '.php';
+			require __DIR__.'/Patcher/'.$classname.'.php';
 		}
 
 		self::$load_patchers = true;
@@ -308,7 +308,7 @@ 
 		$patched = false;
 		foreach (self::$patcher_list as $classname)
 		{
-			$classname = 'Kenjis\MonkeyPatch\Patcher\\' . $classname;
+			$classname = 'Kenjis\MonkeyPatch\Patcher\\'.$classname;
 			$patcher = new $classname;
 			list($source, $patched_this) = $patcher->patch($source);
 			$patched = $patched || $patched_this;

application/tests/_ci_phpunit_test/patcher/bootstrap.php

Spacing +13 added lines, -13 removed lines

@@ -10,34 +10,34 @@
 
 // If you use Composer
 if (class_exists('PhpParser\Autoloader')) {
-	if (method_exists('PhpParser\Node\Name','set')) {
+	if (method_exists('PhpParser\Node\Name', 'set')) {
 		// PHP-Parser 2.x
-		require __DIR__ . '/2.x/MonkeyPatchManager.php';
+		require __DIR__.'/2.x/MonkeyPatchManager.php';
 	} else {
 		// PHP-Parser 3.x
-		require __DIR__ . '/3.x/MonkeyPatchManager.php';
+		require __DIR__.'/3.x/MonkeyPatchManager.php';
 	}
 }
 // If you don't use Composer
 else {
 	if (version_compare(PHP_VERSION, '5.5.0', '>=')) {
 		// Use PHP-Parser 3.x
-		require __DIR__ . '/third_party/PHP-Parser-3.0.3/lib/bootstrap.php';
-		require __DIR__ . '/3.x/MonkeyPatchManager.php';
+		require __DIR__.'/third_party/PHP-Parser-3.0.3/lib/bootstrap.php';
+		require __DIR__.'/3.x/MonkeyPatchManager.php';
 	} else {
 		// Use PHP-Parser 2.x
-		require __DIR__ . '/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
-		require __DIR__ . '/2.x/MonkeyPatchManager.php';
+		require __DIR__.'/third_party/PHP-Parser-2.1.1/lib/bootstrap.php';
+		require __DIR__.'/2.x/MonkeyPatchManager.php';
 	}
 }
 
-require __DIR__ . '/IncludeStream.php';
-require __DIR__ . '/PathChecker.php';
-require __DIR__ . '/MonkeyPatch.php';
-require __DIR__ . '/Cache.php';
-require __DIR__ . '/InvocationVerifier.php';
+require __DIR__.'/IncludeStream.php';
+require __DIR__.'/PathChecker.php';
+require __DIR__.'/MonkeyPatch.php';
+require __DIR__.'/Cache.php';
+require __DIR__.'/InvocationVerifier.php';
 
-require __DIR__ . '/functions/exit__.php';
+require __DIR__.'/functions/exit__.php';
 
 const __GO_TO_ORIG__ = '__GO_TO_ORIG__';
 

application/tests/_ci_phpunit_test/replacing/libraries/old/3.1.2-Upload.php

Spacing +13 added lines, -13 removed lines

@@ -293,8 +293,8 @@ 
 	{
 		empty($config) OR $this->initialize($config, FALSE);
 
-		$this->_mimes =& get_mimes();
-		$this->_CI =& get_instance();
+		$this->_mimes = & get_mimes();
+		$this->_CI = & get_instance();
 
 		log_message('info', 'Upload Class Initialized');
 	}
@@ -480,7 +480,7 @@ 
 			else
 			{
 				// An extension was provided, let's have it!
-				$this->file_ext	= $this->get_extension($this->_file_name_override);
+				$this->file_ext = $this->get_extension($this->_file_name_override);
 			}
 
 			if ( ! $this->is_allowed_filetype(TRUE))
@@ -493,7 +493,7 @@ 
 		// Convert the file size to kilobytes
 		if ($this->file_size > 0)
 		{
-			$this->file_size = round($this->file_size/1024, 2);
+			$this->file_size = round($this->file_size / 1024, 2);
 		}
 
 		// Is the file size within the allowed maximum?
@@ -818,10 +818,10 @@ 
 			{
 				$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
 
-				$this->image_width	= $D[0];
-				$this->image_height	= $D[1];
-				$this->image_type	= isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
-				$this->image_size_str	= $D[3]; // string containing height and width
+				$this->image_width = $D[0];
+				$this->image_height = $D[1];
+				$this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
+				$this->image_size_str = $D[3]; // string containing height and width
 			}
 		}
 
@@ -869,7 +869,7 @@ 
 			$this->file_type = 'image/jpeg';
 		}
 
-		$img_mimes = array('image/gif',	'image/jpeg', 'image/png');
+		$img_mimes = array('image/gif', 'image/jpeg', 'image/png');
 
 		return in_array($this->file_type, $img_mimes, TRUE);
 	}
@@ -1011,7 +1011,7 @@ 
 			return FALSE;
 		}
 
-		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/',  $this->upload_path);
+		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path);
 		return TRUE;
 	}
 
@@ -1055,9 +1055,9 @@ 
 		$ext = '';
 		if (strpos($filename, '.') !== FALSE)
 		{
-			$parts		= explode('.', $filename);
-			$ext		= '.'.array_pop($parts);
-			$filename	= implode('.', $parts);
+			$parts = explode('.', $filename);
+			$ext = '.'.array_pop($parts);
+			$filename = implode('.', $parts);
 		}
 
 		return substr($filename, 0, ($length - strlen($ext))).$ext;

application/tests/_ci_phpunit_test/replacing/core/old/3.0.1-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'
 	);
@@ -136,7 +136,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');
 	}
@@ -271,7 +271,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);
@@ -342,7 +342,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))
@@ -362,7 +362,7 @@ 
 		$CI->db = '';
 
 		// Load the DB class
-		$CI->db =& DB($params, $query_builder);
+		$CI->db = & DB($params, $query_builder);
 		return $this;
 	}
 
@@ -377,12 +377,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');
@@ -409,11 +409,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');
@@ -746,7 +746,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;
@@ -781,7 +781,7 @@ 
 	 */
 	public function remove_package_path($path = '')
 	{
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 
 		if ($path === '')
 		{
@@ -882,12 +882,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;
 			}
 		}
 
@@ -1026,7 +1026,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);
@@ -1089,7 +1089,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);
@@ -1232,7 +1232,7 @@ 
 		}
 
 		// Don't overwrite existing properties
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$object_name))
 		{
 			if ($CI->$object_name instanceof $class_name)
@@ -1365,7 +1365,7 @@ 
 	 */
 	protected function &_ci_get_component($component)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$component;
 	}
 

application/tests/_ci_phpunit_test/replacing/core/old/3.0.0-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'
 	);
@@ -136,7 +136,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');
 	}
@@ -271,7 +271,7 @@ 
 			return $this;
 		}
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$name))
 		{
 			show_error('The model name you are loading is the name of a resource that is already being used: '.$name);
@@ -328,7 +328,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))
@@ -348,7 +348,7 @@ 
 		$CI->db = '';
 
 		// Load the DB class
-		$CI->db =& DB($params, $query_builder);
+		$CI->db = & DB($params, $query_builder);
 		return $this;
 	}
 
@@ -363,12 +363,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');
@@ -395,11 +395,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');
@@ -732,7 +732,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;
@@ -767,7 +767,7 @@ 
 	 */
 	public function remove_package_path($path = '')
 	{
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 
 		if ($path === '')
 		{
@@ -868,12 +868,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;
 			}
 		}
 
@@ -1012,7 +1012,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);
@@ -1075,7 +1075,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);
@@ -1218,7 +1218,7 @@ 
 		}
 
 		// Don't overwrite existing properties
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$object_name))
 		{
 			if ($CI->$object_name instanceof $class_name)
@@ -1354,7 +1354,7 @@ 
 	 */
 	protected function &_ci_get_component($component)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$component;
 	}
 

application/tests/_ci_phpunit_test/replacing/core/old/3.0.3-CodeIgniter.php

Spacing +11 added lines, -11 removed lines

@@ -185,7 +185,7 @@ 
  *  Start the timer... tick tock tick tock...
  * ------------------------------------------------------
  */
-	$BM =& load_class('Benchmark', 'core');
+	$BM = & load_class('Benchmark', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('BM', $BM);
 	$BM->mark('total_execution_time_start');
 	$BM->mark('loading_time:_base_classes_start');
@@ -195,7 +195,7 @@ 
  *  Instantiate the hooks class
  * ------------------------------------------------------
  */
-	$EXT =& load_class('Hooks', 'core');
+	$EXT = & load_class('Hooks', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT);
 
 /*
@@ -215,7 +215,7 @@ 
  * depending on another class that uses it.
  *
  */
-	$CFG =& load_class('Config', 'core');
+	$CFG = & load_class('Config', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG);
 
 	// Do we have any manually set config items in the index.php file?
@@ -294,7 +294,7 @@ 
  *  Instantiate the UTF-8 class
  * ------------------------------------------------------
  */
-	$UNI =& load_class('Utf8', 'core');
+	$UNI = & load_class('Utf8', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI);
 
 /*
@@ -302,7 +302,7 @@ 
  *  Instantiate the URI class
  * ------------------------------------------------------
  */
-	$URI =& load_class('URI', 'core');
+	$URI = & load_class('URI', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('URI', $URI);
 
 /*
@@ -310,7 +310,7 @@ 
  *  Instantiate the routing class and set the routing
  * ------------------------------------------------------
  */
-	$RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL);
+	$RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL);
 	CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR);
 
 /*
@@ -318,7 +318,7 @@ 
  *  Instantiate the output class
  * ------------------------------------------------------
  */
-	$OUT =& load_class('Output', 'core');
+	$OUT = & load_class('Output', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT);
 
 /*
@@ -336,7 +336,7 @@ 
  * Load the security class for xss and csrf support
  * -----------------------------------------------------
  */
-	$SEC =& load_class('Security', 'core');
+	$SEC = & load_class('Security', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC);
 
 /*
@@ -344,7 +344,7 @@ 
  *  Load the Input class and sanitize globals
  * ------------------------------------------------------
  */
-	$IN	=& load_class('Input', 'core');
+	$IN = & load_class('Input', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('IN', $IN);
 
 /*
@@ -352,7 +352,7 @@ 
  *  Load the Language class
  * ------------------------------------------------------
  */
-	$LANG =& load_class('Lang', 'core');
+	$LANG = & load_class('Lang', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG);
 
 /*
@@ -375,7 +375,7 @@ 
 	 */
 	function &get_instance()
 	{
-		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
+		if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled())
 		{
 			return CI_Controller::get_instance();
 		}

application/tests/_ci_phpunit_test/replacing/core/old/3.1.0-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'
 	);
@@ -136,7 +136,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');
 	}
@@ -271,7 +271,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);
@@ -342,7 +342,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))
@@ -362,7 +362,7 @@ 
 		$CI->db = '';
 
 		// Load the DB class
-		$CI->db =& DB($params, $query_builder);
+		$CI->db = & DB($params, $query_builder);
 		return $this;
 	}
 
@@ -377,12 +377,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');
@@ -409,11 +409,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');
@@ -746,7 +746,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;
@@ -781,7 +781,7 @@ 
 	 */
 	public function remove_package_path($path = '')
 	{
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 
 		if ($path === '')
 		{
@@ -882,12 +882,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;
 			}
 		}
 
@@ -1026,7 +1026,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);
@@ -1089,7 +1089,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);
@@ -1232,7 +1232,7 @@ 
 		}
 
 		// Don't overwrite existing properties
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$object_name))
 		{
 			if ($CI->$object_name instanceof $class_name)
@@ -1365,7 +1365,7 @@ 
 	 */
 	protected function &_ci_get_component($component)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$component;
 	}