kenjis / ci-phpunit-test

application/tests/_ci_phpunit_test/functions.php

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
 		{
 			$CI->db->close();
 			$CI->db = null;
-		}
-		else
+		} else
 		{
 			// Don't close if SQLite in-memory database
 			// If we close it, all tables and stored data will be gone

Spacing +10 added lines, -10 removed lines

@@ -32,7 +32,7 @@ 
 	reset_config();
 
 	// Close db connection
-	$CI =& get_instance();
+	$CI = & get_instance();
 	if (isset($CI->db))
 	{
 		if (
@@ -52,25 +52,25 @@ 
 	}
 
 	// Load core classes
-	$BM =& load_class('Benchmark', 'core');
+	$BM = & load_class('Benchmark', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('BM', $BM);
-	$EXT =& load_class('Hooks', 'core');
+	$EXT = & load_class('Hooks', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT);
-	$CFG =& load_class('Config', 'core');
+	$CFG = & load_class('Config', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG);
-	$UNI =& load_class('URI', 'core');
+	$UNI = & load_class('URI', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI);
 //	$URI =& load_class('Utf8', 'core');
 //	CIPHPUnitTestSuperGlobal::set_Global('URI', $URI);
-	$RTR =& load_class('Router', 'core');
+	$RTR = & load_class('Router', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR);
-	$OUT =& load_class('Output', 'core');
+	$OUT = & load_class('Output', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT);
-	$SEC =& load_class('Security', 'core');
+	$SEC = & load_class('Security', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC);
-	$IN =& load_class('Input', 'core');
+	$IN = & load_class('Input', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('IN', $IN);
-	$LANG =& load_class('Lang', 'core');
+	$LANG = & load_class('Lang', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG);
 
 	CIPHPUnitTest::loadLoader();

application/tests/_ci_phpunit_test/patcher/IncludeStream.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	{
 		$this->unwrap();
 
-		MonkeyPatchManager::log('stream_open: ' . $path);
+		MonkeyPatchManager::log('stream_open: '.$path);
 
 		$including = (bool) ($options & self::STREAM_OPEN_FOR_INCLUDE);
 		if ($including && $this->shouldPreprocess($path)) {

application/tests/_ci_phpunit_test/patcher/InvocationVerifier.php

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
 					PHPUnit_Framework_TestCase::assertEquals(
 						$expected_times,
 						$actual_times,
-						$class_method . '() expected to be not invoked, but invoked ' . $actual_times . ' times.'
+						$class_method.'() expected to be not invoked, but invoked '.$actual_times.' times.'
 					);
 				}
 				elseif ($expected_times === '+')
@@ -62,7 +62,7 @@ 
 					PHPUnit_Framework_TestCase::assertGreaterThanOrEqual(
 						1,
 						$actual_times,
-						$class_method . '() expected to be invoked at least one time, but invoked ' . $actual_times . ' times.'
+						$class_method.'() expected to be invoked at least one time, but invoked '.$actual_times.' times.'
 					);
 				}
 				else
@@ -70,7 +70,7 @@ 
 					PHPUnit_Framework_TestCase::assertEquals(
 						$expected_times,
 						$actual_times,
-						$class_method . '() expected to be invoked ' . $expected_times . ' times, but invoked ' . $actual_times . ' times.'
+						$class_method.'() expected to be invoked '.$expected_times.' times, but invoked '.$actual_times.' times.'
 					);
 				}
 			}

Braces +4 added lines, -8 removed lines

@@ -31,12 +31,10 @@ 
 				if ($invoked === false)
 				{
 					$actual_times = 0;
-				}
-				elseif ($expected_params === null)
+				} elseif ($expected_params === null)
 				{
 					$actual_times = count($invocations[$class_method]);
-				}
-				else
+				} else
 				{
 					$count = 0;
 					foreach ($invocations[$class_method] as $actual_params)
@@ -56,16 +54,14 @@ 
 						$actual_times,
 						$class_method . '() expected to be not invoked, but invoked ' . $actual_times . ' times.'
 					);
-				}
-				elseif ($expected_times === '+')
+				} elseif ($expected_times === '+')
 				{
 					PHPUnit_Framework_TestCase::assertGreaterThanOrEqual(
 						1,
 						$actual_times,
 						$class_method . '() expected to be invoked at least one time, but invoked ' . $actual_times . ' times.'
 					);
-				}
-				else
+				} else
 				{
 					PHPUnit_Framework_TestCase::assertEquals(
 						$expected_times,

application/tests/_ci_phpunit_test/patcher/functions/exit__.php

Spacing +2 added lines, -2 removed lines

@@ -18,11 +18,11 @@
 
 	if ($class === null)
 	{
-		$message = 'exit() called in ' . $method . '() function';
+		$message = 'exit() called in '.$method.'() function';
 	}
 	else
 	{
-		$message = 'exit() called in ' . $class . '::' . $method . '()';
+		$message = 'exit() called in '.$class.'::'.$method.'()';
 	}
 
 	$exception_name = Kenjis\MonkeyPatch\MonkeyPatchManager::getExitExceptionClassname();

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
 	if ($class === null)
 	{
 		$message = 'exit() called in ' . $method . '() function';
-	}
-	else
+	} else
 	{
 		$message = 'exit() called in ' . $class . '::' . $method . '()';
 	}

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

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

Doc Comments +9 added lines, -9 removed lines

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

application/tests/_ci_phpunit_test/replacing/helpers/url_helper.php

Spacing +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
 				ob_end_clean();
 			}
 
-			throw new CIPHPUnitTestRedirectException('Redirect to ' . $uri, $code);
+			throw new CIPHPUnitTestRedirectException('Redirect to '.$uri, $code);
 		}
 	}
 }

Braces +3 added lines, -6 removed lines

@@ -63,16 +63,14 @@ 
 		if ($method === 'auto' && isset($_SERVER['SERVER_SOFTWARE']) && strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') !== FALSE)
 		{
 			$method = 'refresh';
-		}
-		elseif ($method !== 'refresh' && (empty($code) OR ! is_numeric($code)))
+		} elseif ($method !== 'refresh' && (empty($code) OR ! is_numeric($code)))
 		{
 			if (isset($_SERVER['SERVER_PROTOCOL'], $_SERVER['REQUEST_METHOD']) && $_SERVER['SERVER_PROTOCOL'] === 'HTTP/1.1')
 			{
 				$code = ($_SERVER['REQUEST_METHOD'] !== 'GET')
 					? 303	// reference: http://en.wikipedia.org/wiki/Post/Redirect/Get
 					: 307;
-			}
-			else
+			} else
 			{
 				$code = 302;
 			}
@@ -97,8 +95,7 @@ 
 		if (ENVIRONMENT !== 'testing')
 		{
 			exit;
-		}
-		else
+		} else
 		{
 			while (ob_get_level() > 1)
 			{

application/tests/controllers/Welcome_test.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	public function test_APPPATH()
 	{
 		$actual = realpath(APPPATH);
-		$expected = realpath(__DIR__ . '/../..');
+		$expected = realpath(__DIR__.'/../..');
 		$this->assertEquals(
 			$expected,
 			$actual,

application/tests/mocks/autoloader.php

Spacing +1 added lines, -1 removed lines

@@ -102,7 +102,7 @@
 		elseif (strpos($class, 'CI_DB') === 0)
 		{
 			$dir = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR;
-			$file = $dir.str_replace(array('CI_DB','active_record'), array('DB', 'active_rec'), $subclass).'.php';
+			$file = $dir.str_replace(array('CI_DB', 'active_record'), array('DB', 'active_rec'), $subclass).'.php';
 		}
 		else
 		{

Braces +8 added lines, -16 removed lines

@@ -63,8 +63,7 @@ 
 	if (strpos($class, 'Mock_') === 0)
 	{
 		$class = strtolower(str_replace(array('Mock_', '_'), array('', DIRECTORY_SEPARATOR), $class));
-	}
-	elseif (strpos($class, 'CI_') === 0)
+	} elseif (strpos($class, 'CI_') === 0)
 	{
 		$subclass = substr($class, 3);
 
@@ -72,39 +71,32 @@ 
 		{
 			$dir = SYSTEM_PATH.'core'.DIRECTORY_SEPARATOR;
 			$class = $subclass;
-		}
-		elseif (in_array($subclass, $ci_libraries))
+		} elseif (in_array($subclass, $ci_libraries))
 		{
 			$dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR;
 			$class = ($subclass === 'Driver_Library') ? 'Driver' : $subclass;
-		}
-		elseif (in_array($subclass, $ci_drivers))
+		} elseif (in_array($subclass, $ci_drivers))
 		{
 			$dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR.$subclass.DIRECTORY_SEPARATOR;
 			$class = $subclass;
-		}
-		elseif (in_array(($parent = strtok($subclass, '_')), $ci_drivers)) {
+		} elseif (in_array(($parent = strtok($subclass, '_')), $ci_drivers)) {
 			$dir = SYSTEM_PATH.'libraries'.DIRECTORY_SEPARATOR.$parent.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR;
 			$class = $subclass;
-		}
-		elseif (preg_match('/^CI_DB_(.+)_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 4)
+		} elseif (preg_match('/^CI_DB_(.+)_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 4)
 		{
 			$driver_path = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR;
 			$dir = $driver_path.$m[1].DIRECTORY_SEPARATOR.'subdrivers'.DIRECTORY_SEPARATOR;
 			$file = $dir.$m[1].'_'.$m[2].'_'.$m[3].'.php';
-		}
-		elseif (preg_match('/^CI_DB_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 3)
+		} elseif (preg_match('/^CI_DB_(.+)_(driver|forge|result|utility)$/', $class, $m) && count($m) === 3)
 		{
 			$driver_path = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR.'drivers'.DIRECTORY_SEPARATOR;
 			$dir = $driver_path.$m[1].DIRECTORY_SEPARATOR;
 			$file = $dir.$m[1].'_'.$m[2].'.php';
-		}
-		elseif (strpos($class, 'CI_DB') === 0)
+		} elseif (strpos($class, 'CI_DB') === 0)
 		{
 			$dir = SYSTEM_PATH.'database'.DIRECTORY_SEPARATOR;
 			$file = $dir.str_replace(array('CI_DB','active_record'), array('DB', 'active_rec'), $subclass).'.php';
-		}
-		else
+		} else
 		{
 			$class = strtolower($class);
 		}

application/tests/_ci_phpunit_test/TestSuiteProvider.php

Spacing +1 added lines, -1 removed lines

@@ -113,7 +113,7 @@
      */
     private static function checkConfigurationFile($file)
     {
-        if (!file_exists($file)) {
+        if ( ! file_exists($file)) {
             throw new \RuntimeException("The requested phpunit configuration was not found at $file");
         }
 

Indentation +59 added lines, -59 removed lines

@@ -52,71 +52,71 @@
  */
 final class TestSuiteProvider
 {
-    /**
-     * phpunit configuration file
-     *
-     * @var string
-     */
-    private static $file;
+	/**
+	 * phpunit configuration file
+	 *
+	 * @var string
+	 */
+	private static $file;
 
-    /**
-     * constructor
-     */
-    private function __construct() {}
+	/**
+	 * constructor
+	 */
+	private function __construct() {}
 
-    /**
-     * set the phpunit configuration file
-     *
-     * @param string $file the path or filename of the phunit configuration file
-     */
-    public static function setConfigurationFile($file)
-    {
-        static::$file = $file;
-    }
+	/**
+	 * set the phpunit configuration file
+	 *
+	 * @param string $file the path or filename of the phunit configuration file
+	 */
+	public static function setConfigurationFile($file)
+	{
+		static::$file = $file;
+	}
 
-    /**
-     * get the phpunit test suite instance
-     *
-     * @return PHPUnit_Framework_TestSuite returns the phpunit test suite instance
-     * @throws FileNotFoundException       if the file is not found
-     */
-    public static function suite()
-    {
-        $file = static::checkConfigurationFile(
-            static::getConfigurationFile()
-        );
+	/**
+	 * get the phpunit test suite instance
+	 *
+	 * @return PHPUnit_Framework_TestSuite returns the phpunit test suite instance
+	 * @throws FileNotFoundException       if the file is not found
+	 */
+	public static function suite()
+	{
+		$file = static::checkConfigurationFile(
+			static::getConfigurationFile()
+		);
 
-        return PHPUnit_Util_Configuration::getInstance($file)
-            ->getTestSuiteConfiguration();
-    }
+		return PHPUnit_Util_Configuration::getInstance($file)
+			->getTestSuiteConfiguration();
+	}
 
-    /**
-     * get the phpunit configuration file
-     *
-     * @return string
-     */
-    private static function getConfigurationFile()
-    {
-        static::$file = isset(static::$file)
-            ? static::$file
-            : APPPATH.'tests/phpunit.xml';
+	/**
+	 * get the phpunit configuration file
+	 *
+	 * @return string
+	 */
+	private static function getConfigurationFile()
+	{
+		static::$file = isset(static::$file)
+			? static::$file
+			: APPPATH.'tests/phpunit.xml';
 
-        return static::$file;
-    }
+		return static::$file;
+	}
 
-    /**
-     * check the given file
-     *
-     * @param  string                $file file to check
-     * @return string                returns the file if it is valid
-     * @throws FileNotFoundException if the file is not found
-     */
-    private static function checkConfigurationFile($file)
-    {
-        if (!file_exists($file)) {
-            throw new \RuntimeException("The requested phpunit configuration was not found at $file");
-        }
+	/**
+	 * check the given file
+	 *
+	 * @param  string                $file file to check
+	 * @return string                returns the file if it is valid
+	 * @throws FileNotFoundException if the file is not found
+	 */
+	private static function checkConfigurationFile($file)
+	{
+		if (!file_exists($file)) {
+			throw new \RuntimeException("The requested phpunit configuration was not found at $file");
+		}
 
-        return $file;
-    }
+		return $file;
+	}
 }