kenjis / ci-phpunit-test

application/tests/_ci_phpunit_test/CIPHPUnitTestRequest.php

Doc Comments +3 added lines

@@ -250,6 +250,9 @@
 		return $this->createAndCallController($class, $method, $params);
 	}
 
+	/**
+	 * @param string $hook
+	 */
 	protected function callHook($hook)
 	{
 		if ($this->enableHooks)

Braces +2 added lines, -4 removed lines

@@ -129,8 +129,7 @@ 
 				return $this->callControllerMethod(
 					$http_method, $argv, $params
 				);
-			}
-			else
+			} else
 			{
 				return $this->requestUri($http_method, $argv, $params);
 			}
@@ -141,8 +140,7 @@ 
 			if ($e->getCode() === 0)
 			{
 				set_status_header(200);
-			}
-			else
+			} else
 			{
 				set_status_header($e->getCode());
 			}

Spacing +9 added lines, -9 removed lines

@@ -95,7 +95,7 @@ 
 	public function enableHooks()
 	{
 		$this->enableHooks = true;
-		$this->hooks =& load_class('Hooks', 'core');
+		$this->hooks = & load_class('Hooks', 'core');
 	}
 
 	/**
@@ -141,7 +141,7 @@ 
 			{
 				set_status_header($e->getCode());
 			}
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->output->_status['redirect'] = $e->getMessage();
 		}
 		// show_404()
@@ -197,17 +197,17 @@ 
 		$this->setRawInputStream($request_params);
 
 		// 404 checking
-		if (! class_exists($class) || ! method_exists($class, $method))
+		if ( ! class_exists($class) || ! method_exists($class, $method))
 		{
 			// If 404, CodeIgniter instance is not created yet. So create it here
 			// Because we need CI->output->_status to store info
-			$CI =& get_instance();
+			$CI = & get_instance();
 			if ($CI === null)
 			{
 				new CI_Controller();
 			}
 
-			show_404($class.'::'.$method . '() is not found');
+			show_404($class.'::'.$method.'() is not found');
 		}
 
 		$params = $argv;
@@ -266,7 +266,7 @@ 
 	{
 		if (is_string($string))
 		{
-			$INPUT =& load_class('Input', 'core');
+			$INPUT = & load_class('Input', 'core');
 			CIPHPUnitTestReflection::setPrivateProperty(
 				$INPUT,
 				'_raw_input_stream',
@@ -290,7 +290,7 @@ 
 
 		// Create controller
 		$controller = new $class;
-		$CI =& get_instance();
+		$CI = & get_instance();
 
 		// Set CodeIgniter instance to TestCase
 		$this->testCase->setCI($CI);
@@ -330,8 +330,8 @@ 
 	 */
 	public function getStatus()
 	{
-		$CI =& get_instance();
-		if (! isset($CI->output->_status))
+		$CI = & get_instance();
+		if ( ! isset($CI->output->_status))
 		{
 			throw new LogicException('Status code is not set. You must call $this->request() first');
 		}

application/tests/_ci_phpunit_test/patcher/Cache.php

Doc Comments +9 added lines

@@ -63,6 +63,9 @@ 
 		return self::$cache_dir;
 	}
 
+	/**
+	 * @param string $path
+	 */
 	public static function getSrcCacheFilePath($path)
 	{
 		$len = strlen(self::$project_root);
@@ -158,6 +161,9 @@ 
 		);
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	protected static function writeTmpConfFile($filename, array $list)
 	{
 		$contents = implode("\n", $list);
@@ -194,6 +200,9 @@ 
 		);
 	}
 
+	/**
+	 * @param string $filename
+	 */
 	protected static function getTmpConfFile($filename)
 	{
 		if (is_readable(self::$$filename))

Spacing +15 added lines, -15 removed lines

@@ -45,17 +45,17 @@ 
 			throw new LogicException("No such directory: $dir");
 		}
 		
-		self::$src_cache_dir = self::$cache_dir . '/src';
+		self::$src_cache_dir = self::$cache_dir.'/src';
 		self::$tmp_function_whitelist_file = 
-			self::$cache_dir . '/conf/func_whiltelist.php';
+			self::$cache_dir.'/conf/func_whiltelist.php';
 		self::$tmp_function_blacklist_file = 
-			self::$cache_dir . '/conf/func_blacklist.php';
+			self::$cache_dir.'/conf/func_blacklist.php';
 		self::$tmp_patcher_list_file = 
-			self::$cache_dir . '/conf/patcher_list.php';
+			self::$cache_dir.'/conf/patcher_list.php';
 		self::$tmp_include_paths_file = 
-			self::$cache_dir . '/conf/include_paths.php';
+			self::$cache_dir.'/conf/include_paths.php';
 		self::$tmp_exclude_paths_file = 
-			self::$cache_dir . '/conf/exclude_paths.php';
+			self::$cache_dir.'/conf/exclude_paths.php';
 	}
 
 	public static function getCacheDir()
@@ -73,16 +73,16 @@ 
 			return false;
 		}
 
-		return self::$src_cache_dir . '/' . $relative_path;
+		return self::$src_cache_dir.'/'.$relative_path;
 	}
 
 	protected static function createDir($dir)
 	{
-		if (! is_dir($dir))
+		if ( ! is_dir($dir))
 		{
-			if (! @mkdir($dir, 0777, true))
+			if ( ! @mkdir($dir, 0777, true))
 			{
-				throw new RuntimeException('Failed to create folder: ' . $dir);
+				throw new RuntimeException('Failed to create folder: '.$dir);
 			}
 		}
 	}
@@ -154,7 +154,7 @@ 
 	public static function appendTmpFunctionBlacklist($function)
 	{
 		file_put_contents(
-			self::getTmpFunctionBlacklistFile(), $function . "\n", FILE_APPEND
+			self::getTmpFunctionBlacklistFile(), $function."\n", FILE_APPEND
 		);
 	}
 
@@ -234,20 +234,20 @@ 
 	{
 		$cache = self::getSrcCacheFilePath($orig_file);
 		@unlink($cache);
-		MonkeyPatchManager::log('remove_src_cache: ' . $cache);
+		MonkeyPatchManager::log('remove_src_cache: '.$cache);
 		return $cache;
 	}
 
 	public static function clearSrcCache()
 	{
 		self::recursiveUnlink(self::$src_cache_dir);
-		MonkeyPatchManager::log('clear_src_cache: cleared ' . self::$src_cache_dir);
+		MonkeyPatchManager::log('clear_src_cache: cleared '.self::$src_cache_dir);
 	}
 
 	public static function clearCache()
 	{
 		self::recursiveUnlink(self::$cache_dir);
-		MonkeyPatchManager::log('clear_cache: cleared ' . self::$cache_dir);
+		MonkeyPatchManager::log('clear_cache: cleared '.self::$cache_dir);
 	}
 
 	/**
@@ -257,7 +257,7 @@ 
 	*/
 	protected static function recursiveUnlink($dir)
 	{
-		if (! is_dir($dir))
+		if ( ! is_dir($dir))
 		{
 			return;
 		}

Unused Use Statements -1 removed lines

@@ -13,7 +13,6 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\NodeVisitorAbstract;
-
 use Kenjis\MonkeyPatch\Patcher\MethodPatcher;
 
 class NodeVisitor extends NodeVisitorAbstract

Indentation +4 added lines, -4 removed lines

@@ -251,10 +251,10 @@
 	}
 
 	/**
-	* Recursive Unlink
-	*
-	* @param string $dir
-	*/
+	 * Recursive Unlink
+	 *
+	 * @param string $dir
+	 */
 	protected static function recursiveUnlink($dir)
 	{
 		if (! is_dir($dir))

application/tests/_ci_phpunit_test/patcher/MonkeyPatch.php

Doc Comments +4 added lines, -1 removed lines

@@ -21,7 +21,7 @@ 
 	 * 
 	 * @param string $function     function name
 	 * @param mixed  $return_value return value
-	 * @param string $class_name   class::method to apply this patch
+	 * @param string $class_method   class::method to apply this patch
 	 */
 	public static function patchFunction($function, $return_value, $class_method = null)
 	{
@@ -55,6 +55,9 @@ 
 		PatchManager::clear();
 	}
 
+	/**
+	 * @param string $class_method
+	 */
 	protected static function getClassname($class_method)
 	{
 		if (strpos($class_method, '::') === false)

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
 		{
 			$patched = true;
 			$new_source = static::generateNewSource($source);
-		}
-		else
+		} else
 		{
 			$new_source = $source;
 		}

Indentation +6 added lines, -6 removed lines

@@ -37,12 +37,12 @@
 	}
 
 	/**
-     * Patch on constant
-     * 
-     * @param type $constant
-     * @param type $value
-     * @param type $class_method
-     */
+	 * Patch on constant
+	 * 
+	 * @param type $constant
+	 * @param type $value
+	 * @param type $class_method
+	 */
 	public static function patchConstant($constant, $value, $class_method = null)
 	{
 		ConstProxy::patch($constant, $value, $class_method);

application/tests/_ci_phpunit_test/patcher/MonkeyPatchManager.php

Doc Comments +6 added lines

@@ -32,6 +32,9 @@ 
 		'MethodPatcher',
 	];
 
+	/**
+	 * @param string $message
+	 */
 	public static function log($message)
 	{
 		if (! self::$debug)
@@ -276,6 +279,9 @@ 
 		self::$load_patchers = true;
 	}
 
+	/**
+	 * @param string $source
+	 */
 	protected static function execPatchers($source)
 	{
 		$patched = false;

Spacing +17 added lines, -17 removed lines

@@ -34,7 +34,7 @@ 
 
 	public static function log($message)
 	{
-		if (! self::$debug)
+		if ( ! self::$debug)
 		{
 			return;
 		}
@@ -64,7 +64,7 @@ 
 		}
 		if (self::$debug)
 		{
-			self::$log_file = __DIR__ . '/debug.log';
+			self::$log_file = __DIR__.'/debug.log';
 		}
 
 		if (isset($config['root_dir']))
@@ -74,16 +74,16 @@ 
 		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"');
 		}
 		self::setCacheDir($config['cache_dir']);
 
-		if (! isset($config['include_paths']))
+		if ( ! isset($config['include_paths']))
 		{
 			throw new LogicException('You have to set "include_paths"');
 		}
@@ -131,7 +131,7 @@ 
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpIncludePaths($current);
 		}
@@ -142,7 +142,7 @@ 
 		// Updated?
 		if ($cached !== $current)
 		{
-			MonkeyPatchManager::log('clear_src_cache: from ' . __METHOD__);
+			MonkeyPatchManager::log('clear_src_cache: from '.__METHOD__);
 			Cache::clearSrcCache();
 			Cache::writeTmpExcludePaths($current);
 		}
@@ -155,7 +155,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);
 		}
@@ -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::writeTmpFunctionWhitelist($current);
 		}
@@ -231,7 +231,7 @@ 
 	 */
 	public static function patch($path)
 	{
-		if (! is_readable($path))
+		if ( ! is_readable($path))
 		{
 			throw new LogicException("Can't read '$path'");
 		}
@@ -239,17 +239,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+');
@@ -265,12 +265,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;
@@ -281,7 +281,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;

Braces +1 added lines, -2 removed lines

@@ -38,8 +38,7 @@
 		{
 			$patched = true;
 			$new_source = static::generateNewSource($source);
-		}
-		else
+		} else
 		{
 			$new_source = $source;
 		}

Unused Use Statements -1 removed lines

@@ -11,7 +11,6 @@
 namespace Kenjis\MonkeyPatch;
 
 use LogicException;
-use RuntimeException;
 use PhpParser\ParserFactory;
 use Kenjis\MonkeyPatch\Patcher\FunctionPatcher;
 

application/tests/_ci_phpunit_test/patcher/Patcher/FunctionPatcher/NodeVisitor.php

Unused Use Statements -4 removed lines

@@ -21,15 +21,11 @@
 
 namespace Kenjis\MonkeyPatch\Patcher\FunctionPatcher;
 
-use ReflectionFunction;
-use ReflectionException;
-
 use PhpParser\Node;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\NodeVisitorAbstract;
-
 use Kenjis\MonkeyPatch\Patcher\FunctionPatcher;
 
 class NodeVisitor extends NodeVisitorAbstract

Spacing +5 added lines, -5 removed lines

@@ -36,17 +36,17 @@ 
 {
 	public function leaveNode(Node $node)
 	{
-		if (! ($node instanceof FuncCall))
+		if ( ! ($node instanceof FuncCall))
 		{
 			return;
 		}
 
-		if (! ($node->name instanceof Name))
+		if ( ! ($node->name instanceof Name))
 		{
 			return;
 		}
 
-		if (! $node->name->isUnqualified())
+		if ( ! $node->name->isUnqualified())
 		{
 			return;
 		}
@@ -57,12 +57,12 @@ 
 		) {
 			$replacement = new FullyQualified(array());
 			$replacement->set(
-				'\__FuncProxy__::' . (string) $node->name
+				'\__FuncProxy__::'.(string) $node->name
 			);
 
 			$pos = $node->getAttribute('startTokenPos');
 			FunctionPatcher::$replacement[$pos] = 
-				'\__FuncProxy__::' . (string) $node->name;
+				'\__FuncProxy__::'.(string) $node->name;
 
 			$node->name = $replacement;
 		}

application/tests/_ci_phpunit_test/patcher/Patcher/FunctionPatcher/Proxy.php

Doc Comments +10 added lines, -1 removed lines

@@ -37,7 +37,7 @@ 
 	 * 
 	 * @param string $function     function name
 	 * @param mixed  $return_value return value or callable
-	 * @param string $class_name   class::method to apply this patch
+	 * @param string $class_method   class::method to apply this patch
 	 * 
 	 * @throws LogicException
 	 */
@@ -86,6 +86,9 @@ 
 		InvocationVerifier::verify(self::$expected_invocations, self::$invocations);
 	}
 
+	/**
+	 * @param string $function
+	 */
 	protected static function logInvocation($function, $arguments)
 	{
 		if (MonkeyPatchManager::$debug)
@@ -111,6 +114,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $function
+	 */
 	protected static function checkCalledMethod($function)
 	{
 		$trace = debug_backtrace();
@@ -184,6 +190,9 @@ 
 		return call_user_func_array($function, $arguments);
 	}
 
+	/**
+	 * @param string $function
+	 */
 	protected static function checkPassedByReference($function)
 	{
 		$ref_func = new ReflectionFunction($function);

Spacing +9 added lines, -9 removed lines

@@ -51,7 +51,7 @@ 
 			self::outputMessage($msg);
 			throw new LogicException($msg);
 		}
-		if (! FunctionPatcher::isWhitelisted($function))
+		if ( ! FunctionPatcher::isWhitelisted($function))
 		{
 			$msg = "<red>Can't patch on '$function'. It is not in whitelist. If you want to patch it, please add it to 'functions_to_patch' in 'tests/Bootstrap.php'. But note that there are some limitations. See <https://github.com/kenjis/ci-phpunit-test/blob/master/docs/HowToWriteTests.md#patching-functions> for details.</red>";
 			self::outputMessage($msg);
@@ -97,16 +97,16 @@ 
 			$line = $info['line'];
 			$method = isset($info['class_method']) ? $info['class_method'] : $info['function'];
 
-			$log_args = function () use ($arguments) {
+			$log_args = function() use ($arguments) {
 				$output = '';
 				foreach ($arguments as $arg) {
-					$output .= var_export($arg, true) . ', ';
+					$output .= var_export($arg, true).', ';
 				}
 				$output = rtrim($output, ', ');
 				return $output;
 			};
 			MonkeyPatchManager::log(
-				'invoke_func: ' . $function . '(' . $log_args() . ') on line ' . $line . ' in ' . $file . ' by ' . $method . '()'
+				'invoke_func: '.$function.'('.$log_args().') on line '.$line.' in '.$file.' by '.$method.'()'
 			);
 		}
 	}
@@ -148,10 +148,10 @@ 
 
 		if (isset(self::$patches_to_apply[$function]))
 		{
-			if (! self::checkCalledMethod($function))
+			if ( ! self::checkCalledMethod($function))
 			{
 				MonkeyPatchManager::log(
-					'invoke_func: ' . $function . '() not patched (out of scope)'
+					'invoke_func: '.$function.'() not patched (out of scope)'
 				);
 				self::checkPassedByReference($function);
 				return call_user_func_array($function, $arguments);
@@ -160,7 +160,7 @@ 
 
 		if (array_key_exists($function, self::$patches))
 		{
-			MonkeyPatchManager::log('invoke_func: ' . $function . '() patched');
+			MonkeyPatchManager::log('invoke_func: '.$function.'() patched');
 
 			if (is_callable(self::$patches[$function]))
 			{
@@ -178,7 +178,7 @@ 
 		}
 
 		MonkeyPatchManager::log(
-			'invoke_func: ' . $function . '() not patched (no patch)'
+			'invoke_func: '.$function.'() not patched (no patch)'
 		);
 		self::checkPassedByReference($function);
 		return call_user_func_array($function, $arguments);
@@ -231,7 +231,7 @@ 
 		$msg = str_replace(
 			['<red>', '</red>'], [$red_begin, $red_end], $msg
 		);
-		echo $msg . "\n";
+		echo $msg."\n";
 	}
 
 	/**

Unused Use Statements -1 removed lines

@@ -13,7 +13,6 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\NodeVisitorAbstract;
-
 use Kenjis\MonkeyPatch\Patcher\MethodPatcher;
 
 class NodeVisitor extends NodeVisitorAbstract

application/tests/_ci_phpunit_test/patcher/Patcher/MethodPatcher/NodeVisitor.php

Unused Use Statements -1 removed lines

@@ -13,7 +13,6 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\NodeVisitorAbstract;
-
 use Kenjis\MonkeyPatch\Patcher\MethodPatcher;
 
 class NodeVisitor extends NodeVisitorAbstract

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 {
 	public function leaveNode(Node $node)
 	{
-		if (! ($node instanceof ClassMethod))
+		if ( ! ($node instanceof ClassMethod))
 		{
 			return;
 		}

application/tests/_ci_phpunit_test/replacing/core/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 +9 added lines, -10 removed lines

@@ -158,14 +158,16 @@ 
 	if ($status_code < 100)
 	{
 		$exit_status = $status_code + 9; // 9 is EXIT__AUTO_MIN
-		if ($exit_status > 125) // 125 is EXIT__AUTO_MAX
+		if ($exit_status > 125) {
+			// 125 is EXIT__AUTO_MAX
 		{
-			$exit_status = 1; // EXIT_ERROR
+			$exit_status = 1;
+		}
+		// EXIT_ERROR
 		}
 
 		$status_code = 500;
-	}
-	else
+	} else
 	{
 		$exit_status = 1; // EXIT_ERROR
 	}
@@ -254,8 +256,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);
 		}
@@ -281,8 +282,7 @@ 
 	if (strpos(PHP_SAPI, 'cgi') === 0)
 	{
 		header('Status: '.$code.' '.$text, TRUE);
-	}
-	else
+	} else
 	{
 		$server_protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
 		header($server_protocol.' '.$code.' '.$text, TRUE, $code);
@@ -325,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/Loader.php

Doc Comments +10 added lines, -10 removed lines

@@ -185,7 +185,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
 	 */
 	public function library($library, $params = NULL, $object_name = NULL)
 	{
@@ -229,7 +229,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
 	 */
@@ -331,7 +331,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)
@@ -487,7 +487,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
 	 */
 	public function vars($vars, $val = '')
 	{
@@ -559,7 +559,7 @@ 
 	 * Helper Loader
 	 *
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helper($helpers = array())
 	{
@@ -630,7 +630,7 @@ 
 	 *
 	 * @uses	CI_Loader::helper()
 	 * @param	string|string[]	$helpers	Helper name(s)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function helpers($helpers = array())
 	{
@@ -646,7 +646,7 @@ 
 	 *
 	 * @param	string|string[]	$files	List of language file names to load
 	 * @param	string		Language name
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function language($files, $lang = '')
 	{
@@ -733,7 +733,7 @@ 
 	 *
 	 * @param	string	$path		Path to add
 	 * @param 	bool	$view_cascade	(default: TRUE)
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function add_package_path($path, $view_cascade = TRUE)
 	{
@@ -777,7 +777,7 @@ 
 	 * added path will be removed removed.
 	 *
 	 * @param	string	$path	Path to remove
-	 * @return	object
+	 * @return	CI_Loader
 	 */
 	public function remove_package_path($path = '')
 	{
@@ -1065,7 +1065,7 @@ 
 	 * @used-by	CI_Loader::_ci_load_library()
 	 * @uses	CI_Loader::_ci_init_library()
 	 *
-	 * @param	string	$library	Library name to load
+	 * @param	string	$library_name	Library name to load
 	 * @param	string	$file_path	Path to the library filename, relative to libraries/
 	 * @param	mixed	$params		Optional parameters to pass to the class constructor
 	 * @param	string	$object_name	Optional object name to assign to

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

Braces +16 added lines, -32 removed lines

@@ -192,16 +192,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);
 				}
@@ -238,8 +236,7 @@ 
 		if (empty($model))
 		{
 			return $this;
-		}
-		elseif (is_array($model))
+		} elseif (is_array($model))
 		{
 			foreach ($model as $key => $value)
 			{
@@ -305,8 +302,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');
 			}
@@ -457,8 +453,7 @@ 
 				require_once($driver_path);
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
 			}
-		}
-		else
+		} else
 		{
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
 		}
@@ -725,16 +720,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;
 		}
@@ -827,8 +820,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)
@@ -890,8 +882,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;
@@ -969,8 +960,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
 		}
@@ -997,8 +987,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();
@@ -1038,8 +1027,7 @@ 
 
 			// Get the filename from the path
 			$class = substr($class, $last_slash);
-		}
-		else
+		} else
 		{
 			$subdir = '';
 		}
@@ -1180,8 +1168,7 @@ 
 				{
 					$prefix = config_item('subclass_prefix');
 					break;
-				}
-				else
+				} else
 				{
 					log_message('debug', $path.' exists, but does not declare '.$subclass);
 				}
@@ -1228,8 +1215,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;
@@ -1239,8 +1225,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;
@@ -1428,8 +1413,7 @@ 
 		if ( ! is_array($filename))
 		{
 			return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension));
-		}
-		else
+		} else
 		{
 			foreach ($filename as $key => $val)
 			{