kenjis / ci-phpunit-test

application/tests/_ci_phpunit_test/replacing/core/old/3.1.5-Loader.php

Doc Comments +9 added lines, -9 removed lines

@@ -191,7 +191,7 @@ 
 	 * @param	string	$library	Library name
 	 * @param	array	$params		Optional parameters to pass to the library class constructor
 	 * @param	string	$object_name	An optional object name to assign to
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -237,7 +237,7 @@ 
 	 * @param	string	$model		Model name
 	 * @param	string	$name		An optional object name to assign to
 	 * @param	bool	$db_conn	An optional database connection configuration to initialize
-	 * @return	object
+	 * @return	CI_Loader
 	 * 
 	 * modified by ci-phpunit-test
 	 */
@@ -369,7 +369,7 @@ 
 	/**
 	 * Database Loader
 	 *
-	 * @param	mixed	$params		Database configuration options
+	 * @param	string|boolean	$params		Database configuration options
 	 * @param	bool	$return 	Whether to return the database object
 	 * @param	bool	$query_builder	Whether to enable Query Builder
 	 *					(overrides the configuration setting)
@@ -535,7 +535,7 @@ 
 	 *					An associative array or object containing values
 	 *					to be set, or a value's name if string
 	 * @param 	string	$val	Value to set, only used if $vars is a string
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -609,7 +609,7 @@ 
 	 * Helper Loader
 	 *
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -688,7 +688,7 @@ 
 	 *
 	 * @uses	CI_Loader::helper()
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -706,7 +706,7 @@ 
 	 *
 	 * @param	string|string[]	$files	List of language file names to load
 	 * @param	string		Language name
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -806,7 +806,7 @@ 
 	 *
 	 * @param	string	$path		Path to add
 	 * @param 	bool	$view_cascade	(default: TRUE)
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -854,7 +854,7 @@ 
 	 * added path will be removed removed.
 	 *
 	 * @param	string	$path	Path to remove
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */

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;
 	}
 }

Braces +16 added lines, -32 removed lines

@@ -200,16 +200,14 @@ 
 		if (empty($library))
 		{
 			return $this;
-		}
-		elseif (is_array($library))
+		} elseif (is_array($library))
 		{
 			foreach ($library as $key => $value)
 			{
 				if (is_int($key))
 				{
 					$this->library($value, $params);
-				}
-				else
+				} else
 				{
 					$this->library($key, $params, $value);
 				}
@@ -246,8 +244,7 @@ 
 		if (empty($model))
 		{
 			return $this;
-		}
-		elseif (is_array($model))
+		} elseif (is_array($model))
 		{
 			foreach ($model as $key => $value)
 			{
@@ -313,8 +310,7 @@ 
 				{
 					throw new RuntimeException($app_path."Model.php exists, but doesn't declare class CI_Model");
 				}
-			}
-			elseif ( ! class_exists('CI_Model', FALSE))
+			} elseif ( ! class_exists('CI_Model', FALSE))
 			{
 				require_once(BASEPATH.'core'.DIRECTORY_SEPARATOR.'Model.php');
 			}
@@ -471,8 +467,7 @@ 
 				require_once($driver_path);
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
 			}
-		}
-		else
+		} else
 		{
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
 		}
@@ -761,16 +756,14 @@ 
 				if (is_int($key))
 				{
 					$this->driver($value, $params);
-				}
-				else
+				} else
 				{
 					$this->driver($key, $params, $value);
 				}
 			}
 
 			return $this;
-		}
-		elseif (empty($library))
+		} elseif (empty($library))
 		{
 			return FALSE;
 		}
@@ -869,8 +862,7 @@ 
 			array_shift($this->_ci_helper_paths);
 			array_shift($this->_ci_view_paths);
 			array_pop($config->_config_paths);
-		}
-		else
+		} else
 		{
 			$path = rtrim($path, '/').'/';
 			foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var)
@@ -934,8 +926,7 @@ 
 		{
 			$_ci_x = explode('/', $_ci_path);
 			$_ci_file = end($_ci_x);
-		}
-		else
+		} else
 		{
 			$_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
 			$_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view;
@@ -1002,8 +993,7 @@ 
 		if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE)
 		{
 			echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
-		}
-		else
+		} else
 		{
 			include($_ci_path); // include() vs include_once() allows for multiple views with the same name
 		}
@@ -1030,8 +1020,7 @@ 
 		if (ob_get_level() > $this->_ci_ob_level + 1)
 		{
 			ob_end_flush();
-		}
-		else
+		} else
 		{
 			$_ci_CI->output->append_output(ob_get_contents());
 			@ob_end_clean();
@@ -1071,8 +1060,7 @@ 
 
 			// Get the filename from the path
 			$class = substr($class, $last_slash);
-		}
-		else
+		} else
 		{
 			$subdir = '';
 		}
@@ -1210,8 +1198,7 @@ 
 		if (file_exists(TESTPATH.'_ci_phpunit_test/replacing/libraries/'.$file_path.$library_name.'.php'))
 		{
 			include_once(TESTPATH.'_ci_phpunit_test/replacing/libraries/'.$file_path.$library_name.'.php');
-		}
-		else
+		} else
 		{
 			include_once(BASEPATH.'libraries/'.$file_path.$library_name.'.php');
 		}
@@ -1227,8 +1214,7 @@ 
 				{
 					$prefix = config_item('subclass_prefix');
 					break;
-				}
-				else
+				} else
 				{
 					log_message('debug', $path.' exists, but does not declare '.$subclass);
 				}
@@ -1277,8 +1263,7 @@ 
 					{
 						include($path.'config/'.strtolower($class).'.php');
 						$found = TRUE;
-					}
-					elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
+					} elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
 					{
 						include($path.'config/'.ucfirst(strtolower($class)).'.php');
 						$found = TRUE;
@@ -1288,8 +1273,7 @@ 
 					{
 						include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
 						$found = TRUE;
-					}
-					elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
+					} elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
 					{
 						include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
 						$found = TRUE;

application/tests/_ci_phpunit_test/replacing/libraries/old/3.1.5-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;

Braces +21 added lines, -19 removed lines

@@ -331,19 +331,16 @@ 
 					if ($reflection->hasMethod('set_'.$key))
 					{
 						$this->{'set_'.$key}($config[$key]);
-					}
-					else
+					} else
 					{
 						$this->$key = $config[$key];
 					}
-				}
-				else
+				} else
 				{
 					$this->$key = $defaults[$key];
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach ($config as $key => &$value)
 			{
@@ -352,8 +349,7 @@ 
 					if ($reflection->hasMethod('set_'.$key))
 					{
 						$this->{'set_'.$key}($value);
-					}
-					else
+					} else
 					{
 						$this->$key = $value;
 					}
@@ -415,9 +411,11 @@ 
 		}
 
 		// Was the file able to be uploaded? If not, determine the reason why.
-		if ( ! file_exists($_file['tmp_name']))	// modified by ci-phpunit-test
+		if ( ! file_exists($_file['tmp_name'])) {
+			// modified by ci-phpunit-test
 		{
 			$error = isset($_file['error']) ? $_file['error'] : 4;
+		}
 
 			switch ($error)
 			{
@@ -482,8 +480,7 @@ 
 			if (strpos($this->_file_name_override, '.') === FALSE)
 			{
 				$this->file_name .= $this->file_ext;
-			}
-			else
+			} else
 			{
 				// An extension was provided, let's have it!
 				$this->file_ext	= $this->get_extension($this->_file_name_override);
@@ -687,8 +684,7 @@ 
 		{
 			$this->set_error('upload_bad_filename', 'debug');
 			return FALSE;
-		}
-		else
+		} else
 		{
 			return $new_filename;
 		}
@@ -883,8 +879,7 @@ 
 		if (in_array($this->file_type, $png_mimes))
 		{
 			$this->file_type = 'image/png';
-		}
-		elseif (in_array($this->file_type, $jpeg_mimes))
+		} elseif (in_array($this->file_type, $jpeg_mimes))
 		{
 			$this->file_type = 'image/jpeg';
 		}
@@ -1150,9 +1145,12 @@ 
 
 		if (function_exists('getimagesize') && @getimagesize($file) !== FALSE)
 		{
-			if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary
+			if (($file = @fopen($file, 'rb')) === FALSE) {
+				// "b" to force binary
 			{
-				return FALSE; // Couldn't open the file, return FALSE
+				return FALSE;
+			}
+			// Couldn't open the file, return FALSE
 			}
 
 			$opening_bytes = fread($file, 256);
@@ -1271,9 +1269,11 @@ 
 		if (function_exists('finfo_file'))
 		{
 			$finfo = @finfo_open(FILEINFO_MIME);
-			if (is_resource($finfo)) // It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
+			if (is_resource($finfo)) {
+				// It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
 			{
 				$mime = @finfo_file($finfo, $file['tmp_name']);
+			}
 				finfo_close($finfo);
 
 				/* According to the comments section of the PHP manual page,
@@ -1358,10 +1358,12 @@ 
 		if (function_exists('mime_content_type'))
 		{
 			$this->file_type = @mime_content_type($file['tmp_name']);
-			if (strlen($this->file_type) > 0) // It's possible that mime_content_type() returns FALSE or an empty string
+			if (strlen($this->file_type) > 0) {
+				// It's possible that mime_content_type() returns FALSE or an empty string
 			{
 				return;
 			}
+			}
 		}
 
 		$this->file_type = $file['type'];

application/tests/_ci_phpunit_test/replacing/core/old/3.1.5-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();
 		}

Braces +10 added lines, -20 removed lines

@@ -169,12 +169,10 @@ 
 			file_exists(APPPATH.'vendor/autoload.php')
 				? require_once(APPPATH.'vendor/autoload.php')
 				: log_message('error', '$config[\'composer_autoload\'] is set to TRUE but '.APPPATH.'vendor/autoload.php was not found.');
-		}
-		elseif (file_exists($composer_autoload))
+		} elseif (file_exists($composer_autoload))
 		{
 			require_once($composer_autoload);
-		}
-		else
+		} else
 		{
 			log_message('error', 'Could not find the specified $config[\'composer_autoload\'] path: '.$composer_autoload);
 		}
@@ -253,8 +251,7 @@ 
 		// This is required for mb_convert_encoding() to strip invalid characters.
 		// That's utilized by CI_Utf8, but it's also done for consistency with iconv.
 		mb_substitute_character('none');
-	}
-	else
+	} else
 	{
 		define('MB_ENABLED', FALSE);
 	}
@@ -267,8 +264,7 @@ 
 		// iconv.internal_encoding is deprecated starting with PHP 5.6
 		// and it's usage triggers E_DEPRECATED messages.
 		@ini_set('iconv.internal_encoding', $charset);
-	}
-	else
+	} else
 	{
 		define('ICONV_ENABLED', FALSE);
 	}
@@ -378,8 +374,7 @@ 
 		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
 		{
 			return CI_Controller::get_instance();
-		}
-		else
+		} else
 		{
 			return CI::$APP;
 		}
@@ -424,21 +419,18 @@ 
 	if (empty($class) OR ! file_exists(APPPATH.'controllers/'.$RTR->directory.$class.'.php'))
 	{
 		$e404 = TRUE;
-	}
-	else
+	} else
 	{
 		require_once(APPPATH.'controllers/'.$RTR->directory.$class.'.php');
 
 		if ( ! class_exists($class, FALSE) OR $method[0] === '_' OR method_exists('CI_Controller', $method))
 		{
 			$e404 = TRUE;
-		}
-		elseif (method_exists($class, '_remap'))
+		} elseif (method_exists($class, '_remap'))
 		{
 			$params = array($method, array_slice($URI->rsegments, 2));
 			$method = '_remap';
-		}
-		elseif ( ! method_exists($class, $method))
+		} elseif ( ! method_exists($class, $method))
 		{
 			$e404 = TRUE;
 		}
@@ -490,8 +482,7 @@ 
 						$RTR->directory = '';
 					}
 				}
-			}
-			else
+			} else
 			{
 				$e404 = FALSE;
 			}
@@ -507,8 +498,7 @@ 
 				1 => $class,
 				2 => $method
 			);
-		}
-		else
+		} else
 		{
 			show_404($RTR->directory.$class.'/'.$method);
 		}

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

Unused Use Statements -2 removed lines

@@ -13,8 +13,6 @@
 require __DIR__ . '/MethodPatcher/NodeVisitor.php';
 require __DIR__ . '/MethodPatcher/PatchManager.php';
 
-use LogicException;
-
 use Kenjis\MonkeyPatch\Patcher\MethodPatcher\NodeVisitor;
 
 class MethodPatcher extends AbstractPatcher

Spacing +3 added lines, -3 removed lines

@@ -10,8 +10,8 @@ 
 
 namespace Kenjis\MonkeyPatch\Patcher;
 
-require __DIR__ . '/MethodPatcher/NodeVisitor.php';
-require __DIR__ . '/MethodPatcher/PatchManager.php';
+require __DIR__.'/MethodPatcher/NodeVisitor.php';
+require __DIR__.'/MethodPatcher/PatchManager.php';
 
 use LogicException;
 
@@ -61,7 +61,7 @@ 
 			{
 				if ($start_method && $token === '{')
 				{
-					$new_source .= '{ ' . self::CODE;
+					$new_source .= '{ '.self::CODE;
 					$start_method = false;
 					$replacement['key'] = key(self::$replacement);
 					$replacement['value'] = current(self::$replacement);

Braces +2 added lines, -4 removed lines

@@ -70,13 +70,11 @@
 					{
 						$replacement = false;
 					}
-				}
-				else
+				} else
 				{
 					$new_source .= $token;
 				}
-			}
-			else
+			} else
 			{
 				$new_source .= $token[1];
 			}

Installer.php

Indentation +127 added lines, -127 removed lines

@@ -10,145 +10,145 @@
 
 class Installer
 {
-    const TEST_FOLDER = 'tests';
+	const TEST_FOLDER = 'tests';
 
-    private $silent = false;
+	private $silent = false;
 
-    public function __construct($silent = false)
-    {
-        $this->silent = $silent;
-    }
+	public function __construct($silent = false)
+	{
+		$this->silent = $silent;
+	}
 
-    public function install($app = 'application', $pub = 'public')
-    {
-        $this->recursiveCopy(
-            dirname(__FILE__) . '/application/tests',
-            $app . '/' . static::TEST_FOLDER
-        );
-        $this->fixPath($app, $pub);
-    }
+	public function install($app = 'application', $pub = 'public')
+	{
+		$this->recursiveCopy(
+			dirname(__FILE__) . '/application/tests',
+			$app . '/' . static::TEST_FOLDER
+		);
+		$this->fixPath($app, $pub);
+	}
 
-    /**
-     * Fix paths in Bootstrap.php
-     */
-    private function fixPath($app = 'application', $pub = 'public')
-    {
-        $file = $app . '/' . static::TEST_FOLDER . '/Bootstrap.php';
-        $contents = file_get_contents($file);
+	/**
+	 * Fix paths in Bootstrap.php
+	 */
+	private function fixPath($app = 'application', $pub = 'public')
+	{
+		$file = $app . '/' . static::TEST_FOLDER . '/Bootstrap.php';
+		$contents = file_get_contents($file);
         
-        if (! file_exists('system')) {
-            if (file_exists('vendor/codeigniter/framework/system')) {
-                $contents = str_replace(
-                    '$system_path = \'../../system\';',
-                    '$system_path = \'../../vendor/codeigniter/framework/system\';',
-                    $contents
-                );
-            } else {
-                throw new Exception('Can\'t find "system" folder.');
-            }
-        }
+		if (! file_exists('system')) {
+			if (file_exists('vendor/codeigniter/framework/system')) {
+				$contents = str_replace(
+					'$system_path = \'../../system\';',
+					'$system_path = \'../../vendor/codeigniter/framework/system\';',
+					$contents
+				);
+			} else {
+				throw new Exception('Can\'t find "system" folder.');
+			}
+		}
         
-        if (! file_exists('index.php')) {
-            if (file_exists($pub . '/index.php')) {
-                // CodeIgniter 3.0.6 and after
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../'. $pub).DIRECTORY_SEPARATOR);",
-                    $contents
-                );
-                // CodeIgniter 3.0.5 and before
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../' . $pub).'/');",
-                    $contents
-                );
-            } elseif (file_exists($app . '/public/index.php')) {
-                // CodeIgniter 3.0.6 and after
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);",
-                    $contents
-                );
-                // CodeIgniter 3.0.5 and before
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
-                    $contents
-                );
-                if ($app != 'application') {
-                    $contents = str_replace(
-                        "\$application_folder = '../../application';",
-                        "\$application_folder = '../../{$app}';",
-                        $contents
-                    );
-                }
-            } else {
-                throw new Exception('Can\'t find "index.php".');
-            }
-        }
+		if (! file_exists('index.php')) {
+			if (file_exists($pub . '/index.php')) {
+				// CodeIgniter 3.0.6 and after
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../'. $pub).DIRECTORY_SEPARATOR);",
+					$contents
+				);
+				// CodeIgniter 3.0.5 and before
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../' . $pub).'/');",
+					$contents
+				);
+			} elseif (file_exists($app . '/public/index.php')) {
+				// CodeIgniter 3.0.6 and after
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);",
+					$contents
+				);
+				// CodeIgniter 3.0.5 and before
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
+					$contents
+				);
+				if ($app != 'application') {
+					$contents = str_replace(
+						"\$application_folder = '../../application';",
+						"\$application_folder = '../../{$app}';",
+						$contents
+					);
+				}
+			} else {
+				throw new Exception('Can\'t find "index.php".');
+			}
+		}
         
-        file_put_contents($file, $contents);
-    }
+		file_put_contents($file, $contents);
+	}
 
-    public function update($app = 'application')
-    {
-        $target_dir = $app . '/' . static::TEST_FOLDER . '/_ci_phpunit_test';
-        $this->recursiveUnlink($target_dir);
-        $this->recursiveCopy(
-            dirname(__FILE__) . '/application/tests/_ci_phpunit_test',
-            $target_dir
-        );
-    }
+	public function update($app = 'application')
+	{
+		$target_dir = $app . '/' . static::TEST_FOLDER . '/_ci_phpunit_test';
+		$this->recursiveUnlink($target_dir);
+		$this->recursiveCopy(
+			dirname(__FILE__) . '/application/tests/_ci_phpunit_test',
+			$target_dir
+		);
+	}
 
-    /**
-     * Recursive Copy
-     *
-     * @param string $src
-     * @param string $dst
-     */
-    private function recursiveCopy($src, $dst)
-    {
-        @mkdir($dst, 0755);
+	/**
+	 * Recursive Copy
+	 *
+	 * @param string $src
+	 * @param string $dst
+	 */
+	private function recursiveCopy($src, $dst)
+	{
+		@mkdir($dst, 0755);
         
-        $iterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS),
-            \RecursiveIteratorIterator::SELF_FIRST
-        );
+		$iterator = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS),
+			\RecursiveIteratorIterator::SELF_FIRST
+		);
         
-        foreach ($iterator as $file) {
-            if ($file->isDir()) {
-                @mkdir($dst . '/' . $iterator->getSubPathName());
-            } else {
-                $success = copy($file, $dst . '/' . $iterator->getSubPathName());
-                if ($success) {
-                    if (! $this->silent) {
-                        echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;
-                    }
-                }
-            }
-        }
-    }
+		foreach ($iterator as $file) {
+			if ($file->isDir()) {
+				@mkdir($dst . '/' . $iterator->getSubPathName());
+			} else {
+				$success = copy($file, $dst . '/' . $iterator->getSubPathName());
+				if ($success) {
+					if (! $this->silent) {
+						echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;
+					}
+				}
+			}
+		}
+	}
 
-    /**
-     * Recursive Unlink
-     *
-     * @param string $dir
-     */
-    private function recursiveUnlink($dir)
-    {
-        $iterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
-            \RecursiveIteratorIterator::CHILD_FIRST
-        );
+	/**
+	 * Recursive Unlink
+	 *
+	 * @param string $dir
+	 */
+	private function recursiveUnlink($dir)
+	{
+		$iterator = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
+			\RecursiveIteratorIterator::CHILD_FIRST
+		);
         
-        foreach ($iterator as $file) {
-            if ($file->isDir()) {
-                rmdir($file);
-            } else {
-                unlink($file);
-            }
-        }
+		foreach ($iterator as $file) {
+			if ($file->isDir()) {
+				rmdir($file);
+			} else {
+				unlink($file);
+			}
+		}
         
-        rmdir($dir);
-    }
+		rmdir($dir);
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -22,8 +22,8 @@ 
     public function install($app = 'application', $pub = 'public')
     {
         $this->recursiveCopy(
-            dirname(__FILE__) . '/application/tests',
-            $app . '/' . static::TEST_FOLDER
+            dirname(__FILE__).'/application/tests',
+            $app.'/'.static::TEST_FOLDER
         );
         $this->fixPath($app, $pub);
     }
@@ -33,10 +33,10 @@ 
      */
     private function fixPath($app = 'application', $pub = 'public')
     {
-        $file = $app . '/' . static::TEST_FOLDER . '/Bootstrap.php';
+        $file = $app.'/'.static::TEST_FOLDER.'/Bootstrap.php';
         $contents = file_get_contents($file);
         
-        if (! file_exists('system')) {
+        if ( ! file_exists('system')) {
             if (file_exists('vendor/codeigniter/framework/system')) {
                 $contents = str_replace(
                     '$system_path = \'../../system\';',
@@ -48,8 +48,8 @@ 
             }
         }
         
-        if (! file_exists('index.php')) {
-            if (file_exists($pub . '/index.php')) {
+        if ( ! file_exists('index.php')) {
+            if (file_exists($pub.'/index.php')) {
                 // CodeIgniter 3.0.6 and after
                 $contents = str_replace(
                     "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
@@ -62,7 +62,7 @@ 
                     "define('FCPATH', realpath(dirname(__FILE__).'/../../' . $pub).'/');",
                     $contents
                 );
-            } elseif (file_exists($app . '/public/index.php')) {
+            } elseif (file_exists($app.'/public/index.php')) {
                 // CodeIgniter 3.0.6 and after
                 $contents = str_replace(
                     "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
@@ -92,10 +92,10 @@ 
 
     public function update($app = 'application')
     {
-        $target_dir = $app . '/' . static::TEST_FOLDER . '/_ci_phpunit_test';
+        $target_dir = $app.'/'.static::TEST_FOLDER.'/_ci_phpunit_test';
         $this->recursiveUnlink($target_dir);
         $this->recursiveCopy(
-            dirname(__FILE__) . '/application/tests/_ci_phpunit_test',
+            dirname(__FILE__).'/application/tests/_ci_phpunit_test',
             $target_dir
         );
     }
@@ -117,12 +117,12 @@ 
         
         foreach ($iterator as $file) {
             if ($file->isDir()) {
-                @mkdir($dst . '/' . $iterator->getSubPathName());
+                @mkdir($dst.'/'.$iterator->getSubPathName());
             } else {
-                $success = copy($file, $dst . '/' . $iterator->getSubPathName());
+                $success = copy($file, $dst.'/'.$iterator->getSubPathName());
                 if ($success) {
-                    if (! $this->silent) {
-                        echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;
+                    if ( ! $this->silent) {
+                        echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
                     }
                 }
             }

install.php

Indentation +35 added lines, -35 removed lines

@@ -15,41 +15,41 @@
 $pub_dir = 'public';
 
 if ($argc > 1) {
-    for ($i = 1; $i <= $argc; $i++) {
-        if (! isset($argv[$i])) {
-            break;
-        }
-
-        switch ($argv[$i]) {
-            // php install.php -s
-            case '-s':
-                $silent = true;
-                break;
-
-            // php install.php -a application
-            case '-a':
-                if (is_dir($argv[$i+1])) {
-                    $app_dir = $argv[$i+1];
-                } else {
-                    throw new Exception('No such directory: ' . $argv[$i+1]);
-                }
-                $i++;
-                break;
-
-            // php install.php -p public
-            case '-p':
-                if (is_dir($argv[$i+1])) {
-                    $pub_dir = $argv[$i+1];
-                } else {
-                    throw new Exception('No such directory: ' . $argv[$i+1]);
-                }
-                $i++;
-                break;
-
-            default:
-                throw new Exception('Unknown argument: ' . $argv[$i]);
-        }
-    }
+	for ($i = 1; $i <= $argc; $i++) {
+		if (! isset($argv[$i])) {
+			break;
+		}
+
+		switch ($argv[$i]) {
+			// php install.php -s
+			case '-s':
+				$silent = true;
+				break;
+
+			// php install.php -a application
+			case '-a':
+				if (is_dir($argv[$i+1])) {
+					$app_dir = $argv[$i+1];
+				} else {
+					throw new Exception('No such directory: ' . $argv[$i+1]);
+				}
+				$i++;
+				break;
+
+			// php install.php -p public
+			case '-p':
+				if (is_dir($argv[$i+1])) {
+					$pub_dir = $argv[$i+1];
+				} else {
+					throw new Exception('No such directory: ' . $argv[$i+1]);
+				}
+				$i++;
+				break;
+
+			default:
+				throw new Exception('Unknown argument: ' . $argv[$i]);
+		}
+	}
 }
 
 $installer = new Installer($silent);

Spacing +9 added lines, -9 removed lines

@@ -8,7 +8,7 @@ 
  * @link       https://github.com/kenjis/ci-phpunit-test
  */
 
-require __DIR__ . '/Installer.php';
+require __DIR__.'/Installer.php';
 
 $silent = false;
 $app_dir = 'application';
@@ -16,7 +16,7 @@ 
 
 if ($argc > 1) {
     for ($i = 1; $i <= $argc; $i++) {
-        if (! isset($argv[$i])) {
+        if ( ! isset($argv[$i])) {
             break;
         }
 
@@ -28,26 +28,26 @@ 
 
             // php install.php -a application
             case '-a':
-                if (is_dir($argv[$i+1])) {
-                    $app_dir = $argv[$i+1];
+                if (is_dir($argv[$i + 1])) {
+                    $app_dir = $argv[$i + 1];
                 } else {
-                    throw new Exception('No such directory: ' . $argv[$i+1]);
+                    throw new Exception('No such directory: '.$argv[$i + 1]);
                 }
                 $i++;
                 break;
 
             // php install.php -p public
             case '-p':
-                if (is_dir($argv[$i+1])) {
-                    $pub_dir = $argv[$i+1];
+                if (is_dir($argv[$i + 1])) {
+                    $pub_dir = $argv[$i + 1];
                 } else {
-                    throw new Exception('No such directory: ' . $argv[$i+1]);
+                    throw new Exception('No such directory: '.$argv[$i + 1]);
                 }
                 $i++;
                 break;
 
             default:
-                throw new Exception('Unknown argument: ' . $argv[$i]);
+                throw new Exception('Unknown argument: '.$argv[$i]);
         }
     }
 }