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

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))

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

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;

Braces +1 added lines, -2 removed lines

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

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

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

Braces +8 added lines, -8 removed lines

@@ -154,14 +154,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
 	}
@@ -250,8 +252,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);
 		}
@@ -277,8 +278,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);

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

Braces +14 added lines, -28 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)
 			{
@@ -427,8 +424,7 @@ 
 				require_once($driver_path);
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
 			}
-		}
-		else
+		} else
 		{
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
 		}
@@ -696,8 +692,7 @@ 
 			}
 
 			return $this;
-		}
-		elseif (empty($library))
+		} elseif (empty($library))
 		{
 			return FALSE;
 		}
@@ -790,8 +785,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)
@@ -853,8 +847,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;
@@ -924,8 +917,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
 		}
@@ -952,8 +944,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();
@@ -993,8 +984,7 @@ 
 
 			// Get the filename from the path
 			$class = substr($class, $last_slash);
-		}
-		else
+		} else
 		{
 			$subdir = '';
 		}
@@ -1135,8 +1125,7 @@ 
 				{
 					$prefix = config_item('subclass_prefix');
 					break;
-				}
-				else
+				} else
 				{
 					log_message('debug', $path.' exists, but does not declare '.$subclass);
 				}
@@ -1183,8 +1172,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;
@@ -1194,8 +1182,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;
@@ -1386,8 +1373,7 @@ 
 		if ( ! is_array($filename))
 		{
 			return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension));
-		}
-		else
+		} else
 		{
 			foreach ($filename as $key => $val)
 			{

application/tests/Bootstrap.php

Braces +6 added lines, -12 removed lines

@@ -80,8 +80,7 @@ 
 		if (version_compare(PHP_VERSION, '5.3', '>='))
 		{
 			error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED & ~E_STRICT & ~E_USER_NOTICE & ~E_USER_DEPRECATED);
-		}
-		else
+		} else
 		{
 			error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_USER_NOTICE);
 		}
@@ -203,8 +202,7 @@ 
 	if (($_temp = realpath($system_path)) !== FALSE)
 	{
 		$system_path = $_temp.'/';
-	}
-	else
+	} else
 	{
 		// Ensure there's a trailing slash
 		$system_path = rtrim($system_path, '/').'/';
@@ -244,8 +242,7 @@ 
 		}
 
 		define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
-	}
-	else
+	} else
 	{
 		if ( ! is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
 		{
@@ -263,14 +260,12 @@ 
 		if ( ! empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
 		{
 			$view_folder = APPPATH.$view_folder;
-		}
-		elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
+		} elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
 		{
 			header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
 			echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
 			exit(3); // EXIT_CONFIG
-		}
-		else
+		} else
 		{
 			$view_folder = APPPATH.'views';
 		}
@@ -279,8 +274,7 @@ 
 	if (($_temp = realpath($view_folder)) !== FALSE)
 	{
 		$view_folder = $_temp.DIRECTORY_SEPARATOR;
-	}
-	else
+	} else
 	{
 		$view_folder = rtrim($view_folder, '/\\').DIRECTORY_SEPARATOR;
 	}

application/tests/_ci_phpunit_test/CIPHPUnitTestAutoloader.php

Braces +3 added lines, -6 removed lines

@@ -43,8 +43,7 @@ 
 				APPPATH.'controllers',
 				APPPATH.'modules',
 			];
-		}
-		else
+		} else
 		{
 			$this->dirs = $dirs;
 		}
@@ -85,8 +84,7 @@ 
 		{
 			$dir = __DIR__;
 			$this->loadClassFile($dir, $class);
-		}
-		else
+		} else
 		{
 			$dir = __DIR__ . '/exceptions';
 			$this->loadClassFile($dir, $class);
@@ -151,8 +149,7 @@ 
 			{
 				require $filename;
 				return true;
-			}
-			else
+			} else
 			{
 				unset($this->cache[$class]);
 			}