kenjis / ci-phpunit-test

update.php

Spacing +1 added lines, -1 removed lines

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

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 $app = 'application';
 if ($argv && $argv[1] && is_dir($argv[1])) {
-    $app = $argv[1];
+	$app = $argv[1];
 }
 $installer = new Installer();
 $installer->update($app);

application/tests/_ci_phpunit_test/functions.php

Braces +1 added lines, -2 removed lines

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

Spacing +10 added lines, -10 removed lines

@@ -29,7 +29,7 @@ 
 	is_loaded('', TRUE);
 
 	// Close db connection
-	$CI =& get_instance();
+	$CI = & get_instance();
 	if (isset($CI->db))
 	{
 		if (
@@ -49,25 +49,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();

install.php

Spacing +1 added lines, -1 removed lines

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

Indentation +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 $app = 'application';
 if ($argv && $argv[1] && is_dir($argv[1])) {
-    $app = $argv[1];
+	$app = $argv[1];
 }
 $installer = new Installer();
 $installer->update($app);

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

Doc Comments +5 added lines, -5 removed lines

@@ -233,7 +233,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
 	 */
@@ -247,7 +247,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
 	 */
@@ -307,9 +307,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
 	 */
 	public function server($index, $xss_clean = NULL)
 	{
@@ -892,7 +892,7 @@ 
 	 * Allows read access to protected properties
 	 *
 	 * @param	string	$name
-	 * @return	mixed
+	 * @return	string|null
 	 */
 	public function __get($name)
 	{

Spacing +7 added lines, -7 removed lines

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

Braces +16 added lines, -23 removed lines

@@ -196,29 +196,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;
 		}
@@ -403,8 +404,7 @@ 
 		if ( ! is_numeric($expire))
 		{
 			$expire = time() - 86500;
-		}
-		else
+		} else
 		{
 			$expire = ($expire > 0) ? time() + $expire : 0;
 		}
@@ -463,8 +463,7 @@ 
 					if ( ! $this->valid_ip($spoof))
 					{
 						$spoof = NULL;
-					}
-					else
+					} else
 					{
 						break;
 					}
@@ -517,8 +516,7 @@ 
 							}
 
 							$sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b';
-						}
-						else
+						} else
 						{
 							$ip = explode('.', $this->ip_address);
 							$sprintf = '%08b%08b%08b%08b';
@@ -538,8 +536,7 @@ 
 						{
 							$netaddr[$i] = intval($netaddr[$i], 16);
 						}
-					}
-					else
+					} else
 					{
 						$netaddr = explode('.', $netaddr);
 					}
@@ -620,8 +617,7 @@ 
 		if ($this->_allow_get_array === FALSE)
 		{
 			$_GET = array();
-		}
-		elseif (is_array($_GET))
+		} elseif (is_array($_GET))
 		{
 			foreach ($_GET as $key => $val)
 			{
@@ -657,8 +653,7 @@ 
 				if (($cookie_key = $this->_clean_input_keys($key)) !== FALSE)
 				{
 					$_COOKIE[$cookie_key] = $this->_clean_input_data($val);
-				}
-				else
+				} else
 				{
 					unset($_COOKIE[$key]);
 				}
@@ -744,8 +739,7 @@ 
 			if ($fatal === TRUE)
 			{
 				return FALSE;
-			}
-			else
+			} else
 			{
 				set_status_header(503);
 				echo 'Disallowed Key Characters.';
@@ -900,8 +894,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/CIPHPUnitTest.php

Braces +2 added lines, -4 removed lines

@@ -47,8 +47,7 @@ 
 					? $backtrace[$offset+2]['class']
 					: null;
 			$function = $backtrace[$offset+2]['function'];
-		}
-		else
+		} else
 		{
 			$class = null;
 			$function = null;
@@ -59,8 +58,7 @@ 
 			$method = $function;
 			$class_method = $class . '::' . $function;
 			$function = null;
-		}
-		else
+		} else
 		{
 			$method = null;
 			$class_method = null;

Spacing +17 added lines, -17 removed lines

@@ -33,35 +33,35 @@ 
 		$cwd_backup = getcwd();
 
 		// Load autoloader for ci-phpunit-test
-		require __DIR__ . '/autoloader.php';
+		require __DIR__.'/autoloader.php';
 
 		// Autoloader for PHP-Parser
 		// Don't use `require`, because we may have required already
 		// in `patcher/bootstrap.php`
-		require_once __DIR__ . '/patcher/third_party/PHP-Parser/lib/bootstrap.php';
+		require_once __DIR__.'/patcher/third_party/PHP-Parser/lib/bootstrap.php';
 
-		require APPPATH . '/tests/TestCase.php';
+		require APPPATH.'/tests/TestCase.php';
 
-		$db_test_case_file = APPPATH . '/tests/DbTestCase.php';
+		$db_test_case_file = APPPATH.'/tests/DbTestCase.php';
 		if (is_readable($db_test_case_file))
 		{
 			require $db_test_case_file;
 		}
 
 		// Replace a few Common functions
-		require __DIR__ . '/replacing/core/Common.php';
-		require BASEPATH . 'core/Common.php';
+		require __DIR__.'/replacing/core/Common.php';
+		require BASEPATH.'core/Common.php';
 
 		// Workaround for missing CodeIgniter's error handler
 		// See https://github.com/kenjis/ci-phpunit-test/issues/37
 		set_error_handler('_error_handler');
 
 		// Load new functions of CIPHPUnitTest
-		require __DIR__ . '/functions.php';
+		require __DIR__.'/functions.php';
 		// Load ci-phpunit-test CI_Loader
-		require __DIR__ . '/replacing/core/Loader.php';
+		require __DIR__.'/replacing/core/Loader.php';
 		// Load ci-phpunit-test CI_Input
-		require __DIR__ . '/replacing/core/Input.php';
+		require __DIR__.'/replacing/core/Input.php';
 
 		// Change current directroy
 		chdir(FCPATH);
@@ -73,12 +73,12 @@ 
 		 *
 		 * And away we go...
 		 */
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
+		require __DIR__.'/replacing/core/CodeIgniter.php';
 
 		self::replaceHelpers();
 
 		// Create CodeIgniter instance
-		if (! self::wiredesignzHmvcInstalled())
+		if ( ! self::wiredesignzHmvcInstalled())
 		{
 			new CI_Controller();
 		}
@@ -99,7 +99,7 @@ 
 
 	public static function createCodeIgniterInstance()
 	{
-		if (! self::wiredesignzHmvcInstalled())
+		if ( ! self::wiredesignzHmvcInstalled())
 		{
 			new CI_Controller();
 		}
@@ -128,11 +128,11 @@ 
 	protected static function replaceLoader()
 	{
 		$my_loader_file = 
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Loader.php';
+			APPPATH.'core/'.config_item('subclass_prefix').'Loader.php';
 
 		if (file_exists($my_loader_file))
 		{
-			self::$loader_class = config_item('subclass_prefix') . 'Loader';
+			self::$loader_class = config_item('subclass_prefix').'Loader';
 			if ( ! class_exists(self::$loader_class))
 			{
 				require $my_loader_file;
@@ -143,19 +143,19 @@ 
 
 	protected static function replaceHelpers()
 	{
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . 'url_helper.php';
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').'url_helper.php';
 		if (file_exists($my_helper_file))
 		{
 			require $my_helper_file;
 		}
-		require __DIR__ . '/replacing/helpers/url_helper.php';
+		require __DIR__.'/replacing/helpers/url_helper.php';
 	}
 
 	public static function setPatcherCacheDir($dir = null)
 	{
 		if ($dir === null)
 		{
-			$dir = APPPATH . 'tests/_ci_phpunit_test/tmp/cache';
+			$dir = APPPATH.'tests/_ci_phpunit_test/tmp/cache';
 		}
 
 		MonkeyPatchManager::setCacheDir(

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 +9 added lines, -18 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,16 +419,14 @@ 
 	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';
@@ -475,8 +468,7 @@ 
 						$RTR->directory = '';
 					}
 				}
-			}
-			else
+			} else
 			{
 				$e404 = FALSE;
 			}
@@ -492,8 +484,7 @@ 
 				1 => $class,
 				2 => $method
 			);
-		}
-		else
+		} else
 		{
 			show_404($RTR->directory.$class.'/'.$method);
 		}

Installer.php

Spacing +11 added lines, -11 removed lines

@@ -15,8 +15,8 @@ 
     public static function install($app = 'application')
     {
         self::recursiveCopy(
-            dirname(__FILE__) . '/application/tests',
-            $app . '/' . static::TEST_FOLDER
+            dirname(__FILE__).'/application/tests',
+            $app.'/'.static::TEST_FOLDER
         );
         self::fixPath($app);
     }
@@ -26,10 +26,10 @@ 
      */
     private static function fixPath($app = 'application')
     {
-        $file = $app . '/' . static::TEST_FOLDER . '/Bootstrap.php';
+        $file = $app.'/'.static::TEST_FOLDER.'/Bootstrap.php';
         $contents = file_get_contents($file);
         
-        if (! file_exists('system')) {
+        if ( ! file_exists('system')) {
             if (file_exists('vendor/codeigniter/framework/system')) {
                 $contents = str_replace(
                     '$system_path = \'../../system\';',
@@ -41,14 +41,14 @@ 
             }
         }
         
-        if (! file_exists('index.php')) {
+        if ( ! file_exists('index.php')) {
             if (file_exists('public/index.php')) {
                 $contents = str_replace(
                     "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
                     "define('FCPATH', realpath(dirname(__FILE__).'/../../public').'/');",
                     $contents
                 );
-            } elseif (file_exists($app . '/public/index.php')) {
+            } elseif (file_exists($app.'/public/index.php')) {
                 $contents = str_replace(
                     "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
                     "define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
@@ -71,10 +71,10 @@ 
 
     public static function update($app = 'application')
     {
-        $target_dir = $app . '/' . static::TEST_FOLDER . '/_ci_phpunit_test';
+        $target_dir = $app.'/'.static::TEST_FOLDER.'/_ci_phpunit_test';
         self::recursiveUnlink($target_dir);
         self::recursiveCopy(
-            dirname(__FILE__) . '/application/tests/_ci_phpunit_test',
+            dirname(__FILE__).'/application/tests/_ci_phpunit_test',
             $target_dir
         );
     }
@@ -96,11 +96,11 @@ 
         
         foreach ($iterator as $file) {
             if ($file->isDir()) {
-                @mkdir($dst . '/' . $iterator->getSubPathName());
+                @mkdir($dst.'/'.$iterator->getSubPathName());
             } else {
-                $success = copy($file, $dst . '/' . $iterator->getSubPathName());
+                $success = copy($file, $dst.'/'.$iterator->getSubPathName());
                 if ($success) {
-                    echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;
+                    echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
                 }
             }
         }

Indentation +120 added lines, -120 removed lines

@@ -10,136 +10,136 @@
 
 class Installer
 {
-    const TEST_FOLDER = 'tests';
+	const TEST_FOLDER = 'tests';
 
-    public static function install($app = 'application')
-    {
-        self::recursiveCopy(
-            dirname(__FILE__) . '/application/tests',
-            $app . '/' . static::TEST_FOLDER
-        );
-        self::fixPath($app);
-    }
+	public static function install($app = 'application')
+	{
+		self::recursiveCopy(
+			dirname(__FILE__) . '/application/tests',
+			$app . '/' . static::TEST_FOLDER
+		);
+		self::fixPath($app);
+	}
 
-    /**
-     * Fix paths in Bootstrap.php
-     */
-    private static function fixPath($app = 'application')
-    {
-        $file = $app . '/' . static::TEST_FOLDER . '/Bootstrap.php';
-        $contents = file_get_contents($file);
+	/**
+	 * Fix paths in Bootstrap.php
+	 */
+	private static function fixPath($app = 'application')
+	{
+		$file = $app . '/' . static::TEST_FOLDER . '/Bootstrap.php';
+		$contents = file_get_contents($file);
         
-        if (! file_exists('system')) {
-            if (file_exists('vendor/codeigniter/framework/system')) {
-                $contents = str_replace(
-                    '$system_path = \'../../system\';',
-                    '$system_path = \'../../vendor/codeigniter/framework/system\';',
-                    $contents
-                );
-            } else {
-                throw new Exception('Can\'t find "system" folder.');
-            }
-        }
+		if (! file_exists('system')) {
+			if (file_exists('vendor/codeigniter/framework/system')) {
+				$contents = str_replace(
+					'$system_path = \'../../system\';',
+					'$system_path = \'../../vendor/codeigniter/framework/system\';',
+					$contents
+				);
+			} else {
+				throw new Exception('Can\'t find "system" folder.');
+			}
+		}
         
-        if (! file_exists('index.php')) {
-            if (file_exists('public/index.php')) {
-                // CodeIgniter 3.0.6 and after
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../public').DIRECTORY_SEPARATOR);",
-                    $contents
-                );
-                // CodeIgniter 3.0.5 and before
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../public').'/');",
-                    $contents
-                );
-            } elseif (file_exists($app . '/public/index.php')) {
-                // CodeIgniter 3.0.6 and after
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);",
-                    $contents
-                );
-                // CodeIgniter 3.0.5 and before
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
-                    $contents
-                );
-                if ($app != 'application') {
-                    $contents = str_replace(
-                        "\$application_folder = '../../application';",
-                        "\$application_folder = '../../{$app}';",
-                        $contents
-                    );
-                }
-            } else {
-                throw new Exception('Can\'t find "index.php".');
-            }
-        }
+		if (! file_exists('index.php')) {
+			if (file_exists('public/index.php')) {
+				// CodeIgniter 3.0.6 and after
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../public').DIRECTORY_SEPARATOR);",
+					$contents
+				);
+				// CodeIgniter 3.0.5 and before
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../public').'/');",
+					$contents
+				);
+			} elseif (file_exists($app . '/public/index.php')) {
+				// CodeIgniter 3.0.6 and after
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../public').DIRECTORY_SEPARATOR);",
+					$contents
+				);
+				// CodeIgniter 3.0.5 and before
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../public').'/');",
+					$contents
+				);
+				if ($app != 'application') {
+					$contents = str_replace(
+						"\$application_folder = '../../application';",
+						"\$application_folder = '../../{$app}';",
+						$contents
+					);
+				}
+			} else {
+				throw new Exception('Can\'t find "index.php".');
+			}
+		}
         
-        file_put_contents($file, $contents);
-    }
+		file_put_contents($file, $contents);
+	}
 
-    public static function update($app = 'application')
-    {
-        $target_dir = $app . '/' . static::TEST_FOLDER . '/_ci_phpunit_test';
-        self::recursiveUnlink($target_dir);
-        self::recursiveCopy(
-            dirname(__FILE__) . '/application/tests/_ci_phpunit_test',
-            $target_dir
-        );
-    }
+	public static function update($app = 'application')
+	{
+		$target_dir = $app . '/' . static::TEST_FOLDER . '/_ci_phpunit_test';
+		self::recursiveUnlink($target_dir);
+		self::recursiveCopy(
+			dirname(__FILE__) . '/application/tests/_ci_phpunit_test',
+			$target_dir
+		);
+	}
 
-    /**
-     * Recursive Copy
-     *
-     * @param string $src
-     * @param string $dst
-     */
-    private static function recursiveCopy($src, $dst)
-    {
-        @mkdir($dst, 0755);
+	/**
+	 * Recursive Copy
+	 *
+	 * @param string $src
+	 * @param string $dst
+	 */
+	private static function recursiveCopy($src, $dst)
+	{
+		@mkdir($dst, 0755);
         
-        $iterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS),
-            \RecursiveIteratorIterator::SELF_FIRST
-        );
+		$iterator = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator($src, \RecursiveDirectoryIterator::SKIP_DOTS),
+			\RecursiveIteratorIterator::SELF_FIRST
+		);
         
-        foreach ($iterator as $file) {
-            if ($file->isDir()) {
-                @mkdir($dst . '/' . $iterator->getSubPathName());
-            } else {
-                $success = copy($file, $dst . '/' . $iterator->getSubPathName());
-                if ($success) {
-                    echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;
-                }
-            }
-        }
-    }
+		foreach ($iterator as $file) {
+			if ($file->isDir()) {
+				@mkdir($dst . '/' . $iterator->getSubPathName());
+			} else {
+				$success = copy($file, $dst . '/' . $iterator->getSubPathName());
+				if ($success) {
+					echo 'copied: ' . $dst . '/' . $iterator->getSubPathName() . PHP_EOL;
+				}
+			}
+		}
+	}
 
-    /**
-     * Recursive Unlink
-     *
-     * @param string $dir
-     */
-    private static function recursiveUnlink($dir)
-    {
-        $iterator = new \RecursiveIteratorIterator(
-            new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
-            \RecursiveIteratorIterator::CHILD_FIRST
-        );
+	/**
+	 * Recursive Unlink
+	 *
+	 * @param string $dir
+	 */
+	private static function recursiveUnlink($dir)
+	{
+		$iterator = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS),
+			\RecursiveIteratorIterator::CHILD_FIRST
+		);
         
-        foreach ($iterator as $file) {
-            if ($file->isDir()) {
-                rmdir($file);
-            } else {
-                unlink($file);
-            }
-        }
+		foreach ($iterator as $file) {
+			if ($file->isDir()) {
+				rmdir($file);
+			} else {
+				unlink($file);
+			}
+		}
         
-        rmdir($dir);
-    }
+		rmdir($dir);
+	}
 }

application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php

Spacing +11 added lines, -11 removed lines

@@ -41,7 +41,7 @@ 
 			return $this->$name;
 		}
 
-		throw new LogicException('No such property: ' . $name);
+		throw new LogicException('No such property: '.$name);
 	}
 
 	public static function setUpBeforeClass()
@@ -61,7 +61,7 @@ 
 	{
 		reset_instance();
 		CIPHPUnitTest::createCodeIgniterInstance();
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 	}
 
 	protected function tearDown()
@@ -236,7 +236,7 @@ 
 		$this->assertSame(
 			$code,
 			$actual,
-			'Status code is not ' . $code . ' but ' . $actual . '.'
+			'Status code is not '.$code.' but '.$actual.'.'
 		);
 	}
 
@@ -248,7 +248,7 @@ 
 	 */
 	public function assertResponseHeader($name, $value)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$actual = $CI->output->get_header($name);
 
 		if ($actual === null)
@@ -272,7 +272,7 @@ 
 	 */
 	public function assertResponseCookie($name, $value, $allow_duplicate = false)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$cookies = isset($CI->output->_cookies[$name])
 			? $CI->output->_cookies[$name] : null;
 
@@ -330,23 +330,23 @@ 
 			$this->fail('redirect() is not called.');
 		}
 
-		if (! function_exists('site_url'))
+		if ( ! function_exists('site_url'))
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->load->helper('url');
 		}
 
-		if (! preg_match('#^(\w+:)?//#i', $uri))
+		if ( ! preg_match('#^(\w+:)?//#i', $uri))
 		{
 			$uri = site_url($uri);
 		}
 		$absolute_url = $uri;
-		$expected = 'Redirect to ' . $absolute_url;
+		$expected = 'Redirect to '.$absolute_url;
 
 		$this->assertSame(
 			$expected,
 			$status['redirect'],
-			'URL to redirect is not ' . $expected . ' but ' . $status['redirect'] . '.'
+			'URL to redirect is not '.$expected.' but '.$status['redirect'].'.'
 		);
 
 		if ($code !== null)
@@ -354,7 +354,7 @@ 
 			$this->assertSame(
 				$code,
 				$status['code'],
-				'Status code is not ' . $code . ' but ' . $status['code'] . '.'
+				'Status code is not '.$code.' but '.$status['code'].'.'
 			);
 		}
 	}