kenjis / ci-phpunit-test

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

application/tests/_ci_phpunit_test/replacing/core/Input.php

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,

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
 	 */

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/CodeIgniter.php

Spacing +11 added lines, -11 removed lines

@@ -185,7 +185,7 @@ 
  *  Start the timer... tick tock tick tock...
  * ------------------------------------------------------
  */
-	$BM =& load_class('Benchmark', 'core');
+	$BM = & load_class('Benchmark', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('BM', $BM);
 	$BM->mark('total_execution_time_start');
 	$BM->mark('loading_time:_base_classes_start');
@@ -195,7 +195,7 @@ 
  *  Instantiate the hooks class
  * ------------------------------------------------------
  */
-	$EXT =& load_class('Hooks', 'core');
+	$EXT = & load_class('Hooks', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('EXT', $EXT);
 
 /*
@@ -215,7 +215,7 @@ 
  * depending on another class that uses it.
  *
  */
-	$CFG =& load_class('Config', 'core');
+	$CFG = & load_class('Config', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('CFG', $CFG);
 
 	// Do we have any manually set config items in the index.php file?
@@ -294,7 +294,7 @@ 
  *  Instantiate the UTF-8 class
  * ------------------------------------------------------
  */
-	$UNI =& load_class('Utf8', 'core');
+	$UNI = & load_class('Utf8', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('UNI', $UNI);
 
 /*
@@ -302,7 +302,7 @@ 
  *  Instantiate the URI class
  * ------------------------------------------------------
  */
-	$URI =& load_class('URI', 'core');
+	$URI = & load_class('URI', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('URI', $URI);
 
 /*
@@ -310,7 +310,7 @@ 
  *  Instantiate the routing class and set the routing
  * ------------------------------------------------------
  */
-	$RTR =& load_class('Router', 'core', isset($routing) ? $routing : NULL);
+	$RTR = & load_class('Router', 'core', isset($routing) ? $routing : NULL);
 	CIPHPUnitTestSuperGlobal::set_Global('RTR', $RTR);
 
 /*
@@ -318,7 +318,7 @@ 
  *  Instantiate the output class
  * ------------------------------------------------------
  */
-	$OUT =& load_class('Output', 'core');
+	$OUT = & load_class('Output', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('OUT', $OUT);
 
 /*
@@ -336,7 +336,7 @@ 
  * Load the security class for xss and csrf support
  * -----------------------------------------------------
  */
-	$SEC =& load_class('Security', 'core');
+	$SEC = & load_class('Security', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('SEC', $SEC);
 
 /*
@@ -344,7 +344,7 @@ 
  *  Load the Input class and sanitize globals
  * ------------------------------------------------------
  */
-	$IN	=& load_class('Input', 'core');
+	$IN = & load_class('Input', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('IN', $IN);
 
 /*
@@ -352,7 +352,7 @@ 
  *  Load the Language class
  * ------------------------------------------------------
  */
-	$LANG =& load_class('Lang', 'core');
+	$LANG = & load_class('Lang', 'core');
 	CIPHPUnitTestSuperGlobal::set_Global('LANG', $LANG);
 
 /*
@@ -375,7 +375,7 @@ 
 	 */
 	function &get_instance()
 	{
-		if (! CIPHPUnitTest::wiredesignzHmvcInstalled())
+		if ( ! CIPHPUnitTest::wiredesignzHmvcInstalled())
 		{
 			return CI_Controller::get_instance();
 		}

Braces +10 added lines, -20 removed lines

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