kenjis / ci-phpunit-test

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');
@@ -819,7 +819,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;
@@ -858,7 +858,7 @@ 
 	 */
 	public function remove_package_path($path = '')
 	{
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 
 		if ($path === '')
 		{
@@ -961,12 +961,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;
 			}
 		}
 
@@ -1099,7 +1099,7 @@ 
 				isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property];
 			}
 
-			$CI =& get_instance();
+			$CI = & get_instance();
 			if (isset($CI->$property))
 			{
 //				log_message('debug', $class.' class already loaded. Second attempt ignored.');
@@ -1174,7 +1174,7 @@ 
 				isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property];
 			}
 
-			$CI =& get_instance();
+			$CI = & get_instance();
 			if ( ! isset($CI->$property))
 			{
 				return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
@@ -1322,7 +1322,7 @@ 
 		}
 
 		// Don't overwrite existing properties
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$object_name))
 		{
 			if ($CI->$object_name instanceof $class_name)
@@ -1473,7 +1473,7 @@ 
 	 */
 	protected function &_ci_get_component($component)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$component;
 	}
 }

Doc Comments +9 added lines, -9 removed lines

@@ -191,7 +191,7 @@ 
 	 * @param	mixed	$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	mixed	$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
 	 */
@@ -375,7 +375,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)
@@ -539,7 +539,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
 	 */
@@ -613,7 +613,7 @@ 
 	 * Helper Loader
 	 *
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -692,7 +692,7 @@ 
 	 *
 	 * @uses	CI_Loader::helper()
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -710,7 +710,7 @@ 
 	 *
 	 * @param	string|string[]	$files	List of language file names to load
 	 * @param	string		Language name
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -810,7 +810,7 @@ 
 	 *
 	 * @param	string	$path		Path to add
 	 * @param 	bool	$view_cascade	(default: TRUE)
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -858,7 +858,7 @@ 
 	 * added path will be removed removed.
 	 *
 	 * @param	string	$path	Path to remove
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */

Braces +15 added lines, -30 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)
 			{
@@ -315,8 +312,7 @@ 
 				}
 
 				log_message('info', 'CI_Model class loaded');
-			}
-			elseif ( ! class_exists('CI_Model', FALSE))
+			} elseif ( ! class_exists('CI_Model', FALSE))
 			{
 				require_once(BASEPATH.'core'.DIRECTORY_SEPARATOR.'Model.php');
 			}
@@ -477,8 +473,7 @@ 
 				require_once($driver_path);
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
 			}
-		}
-		else
+		} else
 		{
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
 		}
@@ -765,16 +760,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;
 		}
@@ -873,8 +866,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)
@@ -938,8 +930,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;
@@ -1006,8 +997,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
 		}
@@ -1034,8 +1024,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();
@@ -1075,8 +1064,7 @@ 
 
 			// Get the filename from the path
 			$class = substr($class, $last_slash);
-		}
-		else
+		} else
 		{
 			$subdir = '';
 		}
@@ -1214,8 +1202,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');
 		}
@@ -1279,8 +1266,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;
@@ -1290,8 +1276,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/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];
 			}

install.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  * @link       https://github.com/kenjis/ci-phpunit-test
  */
 
-require __DIR__ . '/Installer.php';
+require __DIR__.'/Installer.php';
 
 $installer = new Installer($argv);
 $installer->install();

update.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
  * @link       https://github.com/kenjis/ci-phpunit-test
  */
 
-require __DIR__ . '/Installer.php';
+require __DIR__.'/Installer.php';
 
 $installer = new Installer($argv);
 $installer->update();

Installer.php

Indentation +187 added lines, -187 removed lines

@@ -10,191 +10,191 @@
 
 class Installer
 {
-    private $silent = false;
-    private $app_dir = 'application';
-    private $pub_dir = 'public';
-    private $test_dir = 'tests';
-
-    public function __construct($argv)
-    {
-        $this->parse_args($argv);
-    }
-
-    private function parse_args($argv)
-    {
-        $argc = count($argv);
-
-        if ($argc === 1) {
-            return;
-        }
-
-        for ($i = 1; $i <= $argc; $i++) {
-            if (! isset($argv[$i])) {
-                break;
-            }
-
-            switch ($argv[$i]) {
-                // php install.php -s
-                case '-s':
-                    $this->silent = true;
-                    break;
-
-                // php install.php -a application
-                case '-a':
-                    if (is_dir($argv[$i+1])) {
-                        $this->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])) {
-                        $this->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]);
-            }
-        }
-    }
-
-    public function install()
-    {
-        $this->recursiveCopy(
-            dirname(__FILE__) . '/application/tests',
-            $this->app_dir . '/' . $this->test_dir
-        );
-        $this->fixPath();
-    }
-
-    /**
-     * Fix paths in Bootstrap.php
-     */
-    private function fixPath()
-    {
-        $file = $this->app_dir . '/' . $this->test_dir . '/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('index.php')) {
-            if (file_exists($this->pub_dir . '/index.php')) {
-                // CodeIgniter 3.0.6 and after
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../'. $this->pub_dir).DIRECTORY_SEPARATOR);",
-                    $contents
-                );
-                // CodeIgniter 3.0.5 and before
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../' . $this->pub_dir).'/');",
-                    $contents
-                );
-            } elseif (file_exists($this->app_dir . '/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 ($this->app_dir != 'application') {
-                    $contents = str_replace(
-                        "\$application_folder = '../../application';",
-                        "\$application_folder = '../../{$this->app_dir}';",
-                        $contents
-                    );
-                }
-            } else {
-                throw new Exception('Can\'t find "index.php".');
-            }
-        }
-
-        file_put_contents($file, $contents);
-    }
-
-    public function update()
-    {
-        $target_dir = $this->app_dir . '/' . $this->test_dir . '/_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);
-
-        $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;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * 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);
-            }
-        }
-
-        rmdir($dir);
-    }
+	private $silent = false;
+	private $app_dir = 'application';
+	private $pub_dir = 'public';
+	private $test_dir = 'tests';
+
+	public function __construct($argv)
+	{
+		$this->parse_args($argv);
+	}
+
+	private function parse_args($argv)
+	{
+		$argc = count($argv);
+
+		if ($argc === 1) {
+			return;
+		}
+
+		for ($i = 1; $i <= $argc; $i++) {
+			if (! isset($argv[$i])) {
+				break;
+			}
+
+			switch ($argv[$i]) {
+				// php install.php -s
+				case '-s':
+					$this->silent = true;
+					break;
+
+				// php install.php -a application
+				case '-a':
+					if (is_dir($argv[$i+1])) {
+						$this->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])) {
+						$this->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]);
+			}
+		}
+	}
+
+	public function install()
+	{
+		$this->recursiveCopy(
+			dirname(__FILE__) . '/application/tests',
+			$this->app_dir . '/' . $this->test_dir
+		);
+		$this->fixPath();
+	}
+
+	/**
+	 * Fix paths in Bootstrap.php
+	 */
+	private function fixPath()
+	{
+		$file = $this->app_dir . '/' . $this->test_dir . '/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('index.php')) {
+			if (file_exists($this->pub_dir . '/index.php')) {
+				// CodeIgniter 3.0.6 and after
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../'. $this->pub_dir).DIRECTORY_SEPARATOR);",
+					$contents
+				);
+				// CodeIgniter 3.0.5 and before
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../' . $this->pub_dir).'/');",
+					$contents
+				);
+			} elseif (file_exists($this->app_dir . '/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 ($this->app_dir != 'application') {
+					$contents = str_replace(
+						"\$application_folder = '../../application';",
+						"\$application_folder = '../../{$this->app_dir}';",
+						$contents
+					);
+				}
+			} else {
+				throw new Exception('Can\'t find "index.php".');
+			}
+		}
+
+		file_put_contents($file, $contents);
+	}
+
+	public function update()
+	{
+		$target_dir = $this->app_dir . '/' . $this->test_dir . '/_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);
+
+		$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;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * 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);
+			}
+		}
+
+		rmdir($dir);
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -29,7 +29,7 @@ 
         }
 
         for ($i = 1; $i <= $argc; $i++) {
-            if (! isset($argv[$i])) {
+            if ( ! isset($argv[$i])) {
                 break;
             }
 
@@ -41,26 +41,26 @@ 
 
                 // php install.php -a application
                 case '-a':
-                    if (is_dir($argv[$i+1])) {
-                        $this->app_dir = $argv[$i+1];
+                    if (is_dir($argv[$i + 1])) {
+                        $this->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])) {
-                        $this->pub_dir = $argv[$i+1];
+                    if (is_dir($argv[$i + 1])) {
+                        $this->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]);
             }
         }
     }
@@ -68,8 +68,8 @@ 
     public function install()
     {
         $this->recursiveCopy(
-            dirname(__FILE__) . '/application/tests',
-            $this->app_dir . '/' . $this->test_dir
+            dirname(__FILE__).'/application/tests',
+            $this->app_dir.'/'.$this->test_dir
         );
         $this->fixPath();
     }
@@ -79,10 +79,10 @@ 
      */
     private function fixPath()
     {
-        $file = $this->app_dir . '/' . $this->test_dir . '/Bootstrap.php';
+        $file = $this->app_dir.'/'.$this->test_dir.'/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\';',
@@ -94,8 +94,8 @@ 
             }
         }
 
-        if (! file_exists('index.php')) {
-            if (file_exists($this->pub_dir . '/index.php')) {
+        if ( ! file_exists('index.php')) {
+            if (file_exists($this->pub_dir.'/index.php')) {
                 // CodeIgniter 3.0.6 and after
                 $contents = str_replace(
                     "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
@@ -108,7 +108,7 @@ 
                     "define('FCPATH', realpath(dirname(__FILE__).'/../../' . $this->pub_dir).'/');",
                     $contents
                 );
-            } elseif (file_exists($this->app_dir . '/public/index.php')) {
+            } elseif (file_exists($this->app_dir.'/public/index.php')) {
                 // CodeIgniter 3.0.6 and after
                 $contents = str_replace(
                     "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
@@ -138,10 +138,10 @@ 
 
     public function update()
     {
-        $target_dir = $this->app_dir . '/' . $this->test_dir . '/_ci_phpunit_test';
+        $target_dir = $this->app_dir.'/'.$this->test_dir.'/_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
         );
     }
@@ -163,12 +163,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;
                     }
                 }
             }

application/tests/_ci_phpunit_test/CIPHPUnitTestUnitTestCase.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	{
 		reset_instance();
 		$controller = new $classname;
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 		return $controller;
 	}
 

application/tests/_ci_phpunit_test/replacing/core/old/3.1.6-Common.php

Doc Comments +8 added lines

@@ -136,6 +136,11 @@ 
 	return $_is_loaded;
 }
 
+/**
+ * @param boolean $return
+ *
+ * @return boolean
+ */
 function is_cli($return = null)
 {
 	static $_return = TRUE;
@@ -148,6 +153,9 @@ 
 	return $_return;
 }
 
+/**
+ * @param string $message
+ */
 function show_error($message, $status_code = 500, $heading = 'An Error Was Encountered')
 {
 	$status_code = abs($status_code);

Spacing +2 added lines, -2 removed lines

@@ -263,7 +263,7 @@ 
 
 	// Save status code in Output object
 	// added by ci-phpunit-test
-	$CI =& get_instance();
+	$CI = & get_instance();
 	$output = $CI->output;
 	$output->_status = [
 		'code'     => $code,
@@ -376,7 +376,7 @@ 
 	if (empty($_config))
 	{
 		// references cannot be directly assigned to static variables, so we use an array
-		$_config[0] =& get_config();
+		$_config[0] = & get_config();
 	}
 
 	return isset($_config[0][$item]) ? $_config[0][$item] : NULL;

Braces +3 added lines, -6 removed lines

@@ -160,8 +160,7 @@ 
 		$exit_status = $status_code + 9; // 9 is EXIT__AUTO_MIN
 
 		$status_code = 500;
-	}
-	else
+	} else
 	{
 		$exit_status = 1; // EXIT_ERROR
 	}
@@ -256,8 +255,7 @@ 
 		if (isset($stati[$code]))
 		{
 			$text = $stati[$code];
-		}
-		else
+		} else
 		{
 			show_error('No status text available. Please check your status code number or supply your own message text.', 500);
 		}
@@ -327,8 +325,7 @@ 
 		if (file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/config.php'))
 		{
 			require($file_path);
-		}
-		elseif ( ! $found)
+		} elseif ( ! $found)
 		{
 			set_status_header(503);
 			echo 'The configuration file does not exist.';

application/tests/_ci_phpunit_test/replacing/core/old/3.1.6-Input.php

Doc Comments +5 added lines, -5 removed lines

@@ -237,7 +237,7 @@ 
 	/**
 	 * Fetch an item from the GET array
 	 *
-	 * @param	mixed	$index		Index for item to be fetched from $_GET
+	 * @param	string	$index		Index for item to be fetched from $_GET
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
 	 * @return	mixed
 	 *
@@ -253,7 +253,7 @@ 
 	/**
 	 * Fetch an item from the POST array
 	 *
-	 * @param	mixed	$index		Index for item to be fetched from $_POST
+	 * @param	string	$index		Index for item to be fetched from $_POST
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
 	 * @return	mixed
 	 *
@@ -321,9 +321,9 @@ 
 	/**
 	 * Fetch an item from the SERVER array
 	 *
-	 * @param	mixed	$index		Index for item to be fetched from $_SERVER
+	 * @param	string	$index		Index for item to be fetched from $_SERVER
 	 * @param	bool	$xss_clean	Whether to apply XSS filtering
-	 * @return	mixed
+	 * @return	string
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -934,7 +934,7 @@ 
 	 * Allows read access to protected properties
 	 *
 	 * @param	string	$name
-	 * @return	mixed
+	 * @return	string|null
 	 *
 	 * @codeCoverageIgnore
 	 */

Spacing +7 added lines, -7 removed lines

@@ -137,17 +137,17 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_allow_get_array		= (config_item('allow_get_array') === TRUE);
-		$this->_enable_xss		= (config_item('global_xss_filtering') === TRUE);
-		$this->_enable_csrf		= (config_item('csrf_protection') === TRUE);
-		$this->_standardize_newlines	= (bool) config_item('standardize_newlines');
+		$this->_allow_get_array = (config_item('allow_get_array') === TRUE);
+		$this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
+		$this->_enable_csrf = (config_item('csrf_protection') === TRUE);
+		$this->_standardize_newlines = (bool) config_item('standardize_newlines');
 
-		$this->security =& load_class('Security', 'core');
+		$this->security = & load_class('Security', 'core');
 
 		// Do we need the UTF-8 class?
 		if (UTF8_ENABLED === TRUE)
 		{
-			$this->uni =& load_class('Utf8', 'core');
+			$this->uni = & load_class('Utf8', 'core');
 		}
 
 		// Sanitize global arrays
@@ -413,7 +413,7 @@ 
 
 		// Save cookie in Output object
 		// added by ci-phpunit-test
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$output = $CI->output;
 		$output->_cookies[$prefix.$name][] = [
 			'value' => $value,

Braces +17 added lines, -25 removed lines

@@ -200,29 +200,30 @@ 
 		if (isset($array[$index]))
 		{
 			$value = $array[$index];
-		}
-		elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) // Does the index contain array notation
+		} elseif (($count = preg_match_all('/(?:^[^\[]+)|\[[^]]*\]/', $index, $matches)) > 1) {
+			// Does the index contain array notation
 		{
 			$value = $array;
+		}
 			for ($i = 0; $i < $count; $i++)
 			{
 				$key = trim($matches[0][$i], '[]');
-				if ($key === '') // Empty notation will return the value as array
+				if ($key === '') {
+					// Empty notation will return the value as array
 				{
 					break;
 				}
+				}
 
 				if (isset($value[$key]))
 				{
 					$value = $value[$key];
-				}
-				else
+				} else
 				{
 					return NULL;
 				}
 			}
-		}
-		else
+		} else
 		{
 			return NULL;
 		}
@@ -421,8 +422,7 @@ 
 		if ( ! is_numeric($expire))
 		{
 			$expire = time() - 86500;
-		}
-		else
+		} else
 		{
 			$expire = ($expire > 0) ? time() + $expire : 0;
 		}
@@ -483,8 +483,7 @@ 
 					if ( ! $this->valid_ip($spoof))
 					{
 						$spoof = NULL;
-					}
-					else
+					} else
 					{
 						break;
 					}
@@ -537,8 +536,7 @@ 
 							}
 
 							$sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b';
-						}
-						else
+						} else
 						{
 							$ip = explode('.', $this->ip_address);
 							$sprintf = '%08b%08b%08b%08b';
@@ -558,8 +556,7 @@ 
 						{
 							$netaddr[$j] = intval($netaddr[$j], 16);
 						}
-					}
-					else
+					} else
 					{
 						$netaddr = explode('.', $netaddr);
 					}
@@ -646,8 +643,7 @@ 
 		if ($this->_allow_get_array === FALSE)
 		{
 			$_GET = array();
-		}
-		elseif (is_array($_GET))
+		} elseif (is_array($_GET))
 		{
 			foreach ($_GET as $key => $val)
 			{
@@ -683,8 +679,7 @@ 
 				if (($cookie_key = $this->_clean_input_keys($key)) !== FALSE)
 				{
 					$_COOKIE[$cookie_key] = $this->_clean_input_data($val);
-				}
-				else
+				} else
 				{
 					unset($_COOKIE[$key]);
 				}
@@ -774,8 +769,7 @@ 
 			if ($fatal === TRUE)
 			{
 				return FALSE;
-			}
-			else
+			} else
 			{
 				set_status_header(503);
 				echo 'Disallowed Key Characters.';
@@ -814,8 +808,7 @@ 
 		if (function_exists('apache_request_headers'))
 		{
 			$this->headers = apache_request_headers();
-		}
-		else
+		} else
 		{
 			isset($_SERVER['CONTENT_TYPE']) && $this->headers['Content-Type'] = $_SERVER['CONTENT_TYPE'];
 
@@ -944,8 +937,7 @@ 
 		{
 			isset($this->_raw_input_stream) OR $this->_raw_input_stream = file_get_contents('php://input');
 			return $this->_raw_input_stream;
-		}
-		elseif ($name === 'ip_address')
+		} elseif ($name === 'ip_address')
 		{
 			return $this->ip_address;
 		}

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

Doc Comments +9 added lines, -9 removed lines

@@ -191,7 +191,7 @@ 
 	 * @param	mixed	$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)
@@ -533,7 +533,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
 	 */
@@ -607,7 +607,7 @@ 
 	 * Helper Loader
 	 *
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -686,7 +686,7 @@ 
 	 *
 	 * @uses	CI_Loader::helper()
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -704,7 +704,7 @@ 
 	 *
 	 * @param	string|string[]	$files	List of language file names to load
 	 * @param	string		Language name
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -804,7 +804,7 @@ 
 	 *
 	 * @param	string	$path		Path to add
 	 * @param 	bool	$view_cascade	(default: TRUE)
-	 * @return	object
+	 * @return	CI_Loader
 	 *
 	 * @codeCoverageIgnore
 	 */
@@ -852,7 +852,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');
@@ -819,7 +819,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;
@@ -858,7 +858,7 @@ 
 	 */
 	public function remove_package_path($path = '')
 	{
-		$config =& $this->_ci_get_component('config');
+		$config = & $this->_ci_get_component('config');
 
 		if ($path === '')
 		{
@@ -961,12 +961,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;
 			}
 		}
 
@@ -1099,7 +1099,7 @@ 
 				isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property];
 			}
 
-			$CI =& get_instance();
+			$CI = & get_instance();
 			if (isset($CI->$property))
 			{
 //				log_message('debug', $class.' class already loaded. Second attempt ignored.');
@@ -1174,7 +1174,7 @@ 
 				isset($this->_ci_varmap[$property]) && $property = $this->_ci_varmap[$property];
 			}
 
-			$CI =& get_instance();
+			$CI = & get_instance();
 			if ( ! isset($CI->$property))
 			{
 				return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
@@ -1322,7 +1322,7 @@ 
 		}
 
 		// Don't overwrite existing properties
-		$CI =& get_instance();
+		$CI = & get_instance();
 		if (isset($CI->$object_name))
 		{
 			if ($CI->$object_name instanceof $class_name)
@@ -1473,7 +1473,7 @@ 
 	 */
 	protected function &_ci_get_component($component)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		return $CI->$component;
 	}
 }

Braces +15 added lines, -30 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';
 		}
@@ -759,16 +754,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;
 		}
@@ -867,8 +860,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)
@@ -932,8 +924,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;
@@ -1000,8 +991,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
 		}
@@ -1028,8 +1018,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();
@@ -1069,8 +1058,7 @@ 
 
 			// Get the filename from the path
 			$class = substr($class, $last_slash);
-		}
-		else
+		} else
 		{
 			$subdir = '';
 		}
@@ -1208,8 +1196,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');
 		}
@@ -1273,8 +1260,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;
@@ -1284,8 +1270,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;