kenjis / ci-phpunit-test

application/tests/_ci_phpunit_test/replacing/helpers/old/3.1.7-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/_ci_phpunit_test/replacing/helpers/old/3.1.7-download_helper.php

Spacing +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 			}
 
 			// Load the mime types
-			$mimes =& get_mimes();
+			$mimes = & get_mimes();
 
 			// Only change the default MIME if we can find one
 			if (isset($mimes[$extension]))
@@ -146,7 +146,7 @@ 
 
 		if (ENVIRONMENT === 'testing')
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->output->set_header('Content-Type: '.$mime);
 			$CI->output->set_header('Content-Disposition: attachment; filename="'.$filename.'"');
 			$CI->output->set_header('Expires: 0');

Braces +4 added lines, -8 removed lines

@@ -67,8 +67,7 @@ 
 		if ($filename === '' OR $data === '')
 		{
 			return;
-		}
-		elseif ($data === NULL)
+		} elseif ($data === NULL)
 		{
 			if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
 			{
@@ -78,8 +77,7 @@ 
 			$filepath = $filename;
 			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
 			$filename = end($filename);
-		}
-		else
+		} else
 		{
 			$filesize = strlen($data);
 		}
@@ -158,8 +156,7 @@ 
 			if (ENVIRONMENT !== 'testing')
 			{
 				exit($data);
-			}
-			else
+			} else
 			{
 				echo($data);
 				throw new CIPHPUnitTestExitException('exit() from force_download()');
@@ -176,8 +173,7 @@ 
 		if (ENVIRONMENT !== 'testing')
 		{
 			exit;
-		}
-		else
+		} else
 		{
 			throw new CIPHPUnitTestExitException('exit() from force_download()');
 		}

application/tests/_ci_phpunit_test/replacing/core/old/3.1.7-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);
 		}

application/tests/_ci_phpunit_test/replacing/core/old/3.1.7-Output.php

Spacing +11 added lines, -11 removed lines

@@ -76,7 +76,7 @@ 
 	 *
 	 * @var	array
 	 */
-	public $mimes =	array();
+	public $mimes = array();
 
 	/**
 	 * Mime-type for the current page
@@ -111,7 +111,7 @@ 
 	 *
 	 * @var	array
 	 */
-	protected $_profiler_sections =	array();
+	protected $_profiler_sections = array();
 
 	/**
 	 * Parse markers flag
@@ -166,7 +166,7 @@ 
 		isset(self::$func_overload) OR self::$func_overload = (extension_loaded('mbstring') && ini_get('mbstring.func_overload'));
 
 		// Get mime types for later
-		$this->mimes =& get_mimes();
+		$this->mimes = & get_mimes();
 
 		log_message('info', 'Output Class Initialized');
 	}
@@ -264,7 +264,7 @@ 
 			// Is this extension supported?
 			if (isset($this->mimes[$extension]))
 			{
-				$mime_type =& $this->mimes[$extension];
+				$mime_type = & $this->mimes[$extension];
 
 				if (is_array($mime_type))
 				{
@@ -334,7 +334,7 @@ 
 		{
 			if (strncasecmp($header, $headers[$c], $l = self::strlen($header)) === 0)
 			{
-				return trim(self::substr($headers[$c], $l+1));
+				return trim(self::substr($headers[$c], $l + 1));
 			}
 		}
 
@@ -437,13 +437,13 @@ 
 		// Note:  We use load_class() because we can't use $CI =& get_instance()
 		// since this function is sometimes called by the caching mechanism,
 		// which happens before the CI super object is available.
-		$BM =& load_class('Benchmark', 'core');
-		$CFG =& load_class('Config', 'core');
+		$BM = & load_class('Benchmark', 'core');
+		$CFG = & load_class('Config', 'core');
 
 		// Grab the super object if we can.
 		if (class_exists('CI_Controller', FALSE))
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 		}
 
 		// --------------------------------------------------------------------
@@ -451,7 +451,7 @@ 
 		// Set the output data
 		if ($output === '')
 		{
-			$output =& $this->final_output;
+			$output = & $this->final_output;
 		}
 
 		// --------------------------------------------------------------------
@@ -572,7 +572,7 @@ 
 	 */
 	public function _write_cache($output)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$path = $CI->config->item('cache_path');
 		$cache_path = ($path === '') ? APPPATH.'cache/' : $path;
 
@@ -751,7 +751,7 @@ 
 	 */
 	public function delete_cache($uri = '')
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$cache_path = $CI->config->item('cache_path');
 		if ($cache_path === '')
 		{

Braces +5 added lines, -10 removed lines

@@ -511,8 +511,7 @@ 
 				{
 //					header('Content-Encoding: gzip');
 //					header('Content-Length: '.self::strlen($output));
-				}
-				else
+				} else
 				{
 					// User agent doesn't support gzip compression,
 					// so we'll have to decompress our cache
@@ -552,8 +551,7 @@ 
 		if (method_exists($CI, '_output'))
 		{
 			$CI->_output($output);
-		}
-		else
+		} else
 		{
 			echo $output; // Send it to the browser!
 		}
@@ -591,8 +589,7 @@ 
 			if (is_array($cache_query_string))
 			{
 				$uri .= '?'.http_build_query(array_intersect_key($_GET, array_flip($cache_query_string)));
-			}
-			else
+			} else
 			{
 				$uri .= '?'.$_SERVER['QUERY_STRING'];
 			}
@@ -685,8 +682,7 @@ 
 			if (is_array($cache_query_string))
 			{
 				$uri .= '?'.http_build_query(array_intersect_key($_GET, array_flip($cache_query_string)));
-			}
-			else
+			} else
 			{
 				$uri .= '?'.$_SERVER['QUERY_STRING'];
 			}
@@ -773,8 +769,7 @@ 
 				if (is_array($cache_query_string))
 				{
 					$uri .= '?'.http_build_query(array_intersect_key($_GET, array_flip($cache_query_string)));
-				}
-				else
+				} else
 				{
 					$uri .= '?'.$_SERVER['QUERY_STRING'];
 				}

application/tests/_ci_phpunit_test/replacing/libraries/old/3.1.7-Upload.php

Spacing +13 added lines, -13 removed lines

@@ -293,8 +293,8 @@ 
 	{
 		empty($config) OR $this->initialize($config, FALSE);
 
-		$this->_mimes =& get_mimes();
-		$this->_CI =& get_instance();
+		$this->_mimes = & get_mimes();
+		$this->_CI = & get_instance();
 
 		log_message('info', 'Upload Class Initialized');
 	}
@@ -480,7 +480,7 @@ 
 			else
 			{
 				// An extension was provided, let's have it!
-				$this->file_ext	= $this->get_extension($this->_file_name_override);
+				$this->file_ext = $this->get_extension($this->_file_name_override);
 			}
 
 			if ( ! $this->is_allowed_filetype(TRUE))
@@ -493,7 +493,7 @@ 
 		// Convert the file size to kilobytes
 		if ($this->file_size > 0)
 		{
-			$this->file_size = round($this->file_size/1024, 2);
+			$this->file_size = round($this->file_size / 1024, 2);
 		}
 
 		// Is the file size within the allowed maximum?
@@ -818,10 +818,10 @@ 
 			{
 				$types = array(1 => 'gif', 2 => 'jpeg', 3 => 'png');
 
-				$this->image_width	= $D[0];
-				$this->image_height	= $D[1];
-				$this->image_type	= isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
-				$this->image_size_str	= $D[3]; // string containing height and width
+				$this->image_width = $D[0];
+				$this->image_height = $D[1];
+				$this->image_type = isset($types[$D[2]]) ? $types[$D[2]] : 'unknown';
+				$this->image_size_str = $D[3]; // string containing height and width
 			}
 		}
 
@@ -869,7 +869,7 @@ 
 			$this->file_type = 'image/jpeg';
 		}
 
-		$img_mimes = array('image/gif',	'image/jpeg', 'image/png');
+		$img_mimes = array('image/gif', 'image/jpeg', 'image/png');
 
 		return in_array($this->file_type, $img_mimes, TRUE);
 	}
@@ -1011,7 +1011,7 @@ 
 			return FALSE;
 		}
 
-		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/',  $this->upload_path);
+		$this->upload_path = preg_replace('/(.+?)\/*$/', '\\1/', $this->upload_path);
 		return TRUE;
 	}
 
@@ -1055,9 +1055,9 @@ 
 		$ext = '';
 		if (strpos($filename, '.') !== FALSE)
 		{
-			$parts		= explode('.', $filename);
-			$ext		= '.'.array_pop($parts);
-			$filename	= implode('.', $parts);
+			$parts = explode('.', $filename);
+			$ext = '.'.array_pop($parts);
+			$filename = implode('.', $parts);
 		}
 
 		return substr($filename, 0, ($length - strlen($ext))).$ext;

Braces +20 added lines, -17 removed lines

@@ -331,19 +331,16 @@ 
 					if ($reflection->hasMethod('set_'.$key))
 					{
 						$this->{'set_'.$key}($config[$key]);
-					}
-					else
+					} else
 					{
 						$this->$key = $config[$key];
 					}
-				}
-				else
+				} else
 				{
 					$this->$key = $defaults[$key];
 				}
 			}
-		}
-		else
+		} else
 		{
 			foreach ($config as $key => &$value)
 			{
@@ -352,8 +349,7 @@ 
 					if ($reflection->hasMethod('set_'.$key))
 					{
 						$this->{'set_'.$key}($value);
-					}
-					else
+					} else
 					{
 						$this->$key = $value;
 					}
@@ -415,9 +411,11 @@ 
 		}
 
 		// Was the file able to be uploaded? If not, determine the reason why.
-		if ( ! file_exists($_file['tmp_name']))	// modified by ci-phpunit-test
+		if ( ! file_exists($_file['tmp_name'])) {
+			// modified by ci-phpunit-test
 		{
 			$error = isset($_file['error']) ? $_file['error'] : 4;
+		}
 
 			switch ($error)
 			{
@@ -482,8 +480,7 @@ 
 			if (strpos($this->_file_name_override, '.') === FALSE)
 			{
 				$this->file_name .= $this->file_ext;
-			}
-			else
+			} else
 			{
 				// An extension was provided, let's have it!
 				$this->file_ext	= $this->get_extension($this->_file_name_override);
@@ -881,8 +878,7 @@ 
 		if (in_array($this->file_type, $png_mimes))
 		{
 			$this->file_type = 'image/png';
-		}
-		elseif (in_array($this->file_type, $jpeg_mimes))
+		} elseif (in_array($this->file_type, $jpeg_mimes))
 		{
 			$this->file_type = 'image/jpeg';
 		}
@@ -1148,9 +1144,12 @@ 
 
 		if (function_exists('getimagesize') && @getimagesize($file) !== FALSE)
 		{
-			if (($file = @fopen($file, 'rb')) === FALSE) // "b" to force binary
+			if (($file = @fopen($file, 'rb')) === FALSE) {
+				// "b" to force binary
 			{
-				return FALSE; // Couldn't open the file, return FALSE
+				return FALSE;
+			}
+			// Couldn't open the file, return FALSE
 			}
 
 			$opening_bytes = fread($file, 256);
@@ -1269,9 +1268,11 @@ 
 		if (function_exists('finfo_file'))
 		{
 			$finfo = @finfo_open(FILEINFO_MIME);
-			if (is_resource($finfo)) // It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
+			if (is_resource($finfo)) {
+				// It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
 			{
 				$mime = @finfo_file($finfo, $file['tmp_name']);
+			}
 				finfo_close($finfo);
 
 				/* According to the comments section of the PHP manual page,
@@ -1356,10 +1357,12 @@ 
 		if (function_exists('mime_content_type'))
 		{
 			$this->file_type = @mime_content_type($file['tmp_name']);
-			if (strlen($this->file_type) > 0) // It's possible that mime_content_type() returns FALSE or an empty string
+			if (strlen($this->file_type) > 0) {
+				// It's possible that mime_content_type() returns FALSE or an empty string
 			{
 				return;
 			}
+			}
 		}
 
 		$this->file_type = $file['type'];

lib/Installer.php

Spacing +10 added lines, -10 removed lines

@@ -29,7 +29,7 @@ 
         }
 
         for ($i = 1; $i <= $argc; $i++) {
-            if (! isset($argv[$i])) {
+            if ( ! isset($argv[$i])) {
                 break;
             }
 
@@ -41,20 +41,20 @@ 
 
                 // php install.php -a application
                 case '-a':
-                    if (is_dir($argv[$i+1])) {
-                        $this->app_dir = $argv[$i+1];
+                    if (is_dir($argv[$i + 1])) {
+                        $this->app_dir = $argv[$i + 1];
                     } else {
-                        throw new Exception('No such directory: '.$argv[$i+1]);
+                        throw new Exception('No such directory: '.$argv[$i + 1]);
                     }
                     $i++;
                     break;
 
                 // php install.php -p public
                 case '-p':
-                    if (is_dir($argv[$i+1])) {
-                        $this->pub_dir = $argv[$i+1];
+                    if (is_dir($argv[$i + 1])) {
+                        $this->pub_dir = $argv[$i + 1];
                     } else {
-                        throw new Exception('No such directory: '.$argv[$i+1]);
+                        throw new Exception('No such directory: '.$argv[$i + 1]);
                     }
                     $i++;
                     break;
@@ -82,7 +82,7 @@ 
         $file = $this->app_dir.'/'.$this->test_dir.'/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\';',
@@ -94,7 +94,7 @@ 
             }
         }
 
-        if (! file_exists('index.php')) {
+        if ( ! file_exists('index.php')) {
             if (file_exists($this->pub_dir.'/index.php')) {
                 // CodeIgniter 3.0.6 and after
                 $contents = str_replace(
@@ -167,7 +167,7 @@ 
             } else {
                 $success = copy($file, $dst.'/'.$iterator->getSubPathName());
                 if ($success) {
-                    if (! $this->silent) {
+                    if ( ! $this->silent) {
                         echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
                     }
                 }

Indentation +196 added lines, -196 removed lines

@@ -10,202 +10,202 @@
 
 class Installer
 {
-    private $silent = false;
-    private $app_dir = 'application';
-    private $pub_dir = 'public';
-    private $test_dir = 'tests';
-    private $from_composer = false;
-
-    public function __construct($argv)
-    {
-        $this->parse_args($argv);
-    }
-
-    private function parse_args($argv)
-    {
-        $argc = count($argv);
-
-        if ($argc === 1) {
-            return;
-        }
-
-        for ($i = 1; $i <= $argc; $i++) {
-            if (! isset($argv[$i])) {
-                break;
-            }
-
-            switch ($argv[$i]) {
-                // php install.php -s
-                case '-s':
-                    $this->silent = true;
-                    break;
-
-                // php install.php -a application
-                case '-a':
-                    if (is_dir($argv[$i+1])) {
-                        $this->app_dir = $argv[$i+1];
-                    } else {
-                        throw new Exception('No such directory: '.$argv[$i+1]);
-                    }
-                    $i++;
-                    break;
-
-                // php install.php -p public
-                case '-p':
-                    if (is_dir($argv[$i+1])) {
-                        $this->pub_dir = $argv[$i+1];
-                    } else {
-                        throw new Exception('No such directory: '.$argv[$i+1]);
-                    }
-                    $i++;
-                    break;
-
-                case '--from-composer':
-                    $this->from_composer = true;
-                    $i++;
-                    break;
-
-                default:
-                    throw new Exception('Unknown argument: '.$argv[$i]);
-            }
-        }
-    }
-
-    public function install()
-    {
-        $this->recursiveCopy(
-            dirname(dirname(__FILE__)).'/application/tests',
-            $this->app_dir.'/'.$this->test_dir
-        );
-        $this->fixPath();
-        if ($this->from_composer) {
-            $this->recursiveUnlink($this->app_dir.'/'.$this->test_dir.'/_ci_phpunit_test');
-        }
-    }
-
-    /**
-     * Fix paths in Bootstrap.php
+	private $silent = false;
+	private $app_dir = 'application';
+	private $pub_dir = 'public';
+	private $test_dir = 'tests';
+	private $from_composer = false;
+
+	public function __construct($argv)
+	{
+		$this->parse_args($argv);
+	}
+
+	private function parse_args($argv)
+	{
+		$argc = count($argv);
+
+		if ($argc === 1) {
+			return;
+		}
+
+		for ($i = 1; $i <= $argc; $i++) {
+			if (! isset($argv[$i])) {
+				break;
+			}
+
+			switch ($argv[$i]) {
+				// php install.php -s
+				case '-s':
+					$this->silent = true;
+					break;
+
+				// php install.php -a application
+				case '-a':
+					if (is_dir($argv[$i+1])) {
+						$this->app_dir = $argv[$i+1];
+					} else {
+						throw new Exception('No such directory: '.$argv[$i+1]);
+					}
+					$i++;
+					break;
+
+				// php install.php -p public
+				case '-p':
+					if (is_dir($argv[$i+1])) {
+						$this->pub_dir = $argv[$i+1];
+					} else {
+						throw new Exception('No such directory: '.$argv[$i+1]);
+					}
+					$i++;
+					break;
+
+				case '--from-composer':
+					$this->from_composer = true;
+					$i++;
+					break;
+
+				default:
+					throw new Exception('Unknown argument: '.$argv[$i]);
+			}
+		}
+	}
+
+	public function install()
+	{
+		$this->recursiveCopy(
+			dirname(dirname(__FILE__)).'/application/tests',
+			$this->app_dir.'/'.$this->test_dir
+		);
+		$this->fixPath();
+		if ($this->from_composer) {
+			$this->recursiveUnlink($this->app_dir.'/'.$this->test_dir.'/_ci_phpunit_test');
+		}
+	}
+
+	/**
+	 * Fix paths in Bootstrap.php
 	 *
 	 * @FIXME Too ad hoc. Must rewrite, because can't handle complex paths.
-     */
-    private function fixPath()
-    {
-        $file = $this->app_dir.'/'.$this->test_dir.'/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('index.php')) {
-            if (file_exists($this->pub_dir.'/index.php')) {
-                // CodeIgniter 3.0.6 and after
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').DIRECTORY_SEPARATOR);",
-                    $contents
-                );
-                // CodeIgniter 3.0.5 and before
-                $contents = str_replace(
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
-                    "define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').'/');",
-                    $contents
-                );
-            } elseif (file_exists($this->app_dir.'/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 ($this->app_dir !== 'application') {
-                    $contents = str_replace(
-                        "\$application_folder = '../../application';",
-                        "\$application_folder = '../../{$this->app_dir}';",
-                        $contents
-                    );
-                }
-            } else {
-                throw new Exception('Can\'t find "index.php".');
-            }
-        }
-
-        file_put_contents($file, $contents);
-    }
-
-    public function update()
-    {
-        $target_dir = $this->app_dir.'/'.$this->test_dir.'/_ci_phpunit_test';
-        $this->recursiveUnlink($target_dir);
-        $this->recursiveCopy(
-            dirname(dirname(__FILE__)).'/application/tests/_ci_phpunit_test',
-            $target_dir
-        );
-    }
-
-    /**
-     * Recursive Copy
-     *
-     * @param string $src
-     * @param string $dst
-     */
-    private function recursiveCopy($src, $dst)
-    {
-        @mkdir($dst, 0755);
-
-        $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) {
-                    if (! $this->silent) {
-                        echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Recursive Unlink
-     *
-     * @param string $dir
-     */
-    private 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);
-            }
-        }
-
-        rmdir($dir);
-    }
+	 */
+	private function fixPath()
+	{
+		$file = $this->app_dir.'/'.$this->test_dir.'/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('index.php')) {
+			if (file_exists($this->pub_dir.'/index.php')) {
+				// CodeIgniter 3.0.6 and after
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').DIRECTORY_SEPARATOR);",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').DIRECTORY_SEPARATOR);",
+					$contents
+				);
+				// CodeIgniter 3.0.5 and before
+				$contents = str_replace(
+					"define('FCPATH', realpath(dirname(__FILE__).'/../..').'/');",
+					"define('FCPATH', realpath(dirname(__FILE__).'/../../{$this->pub_dir}').'/');",
+					$contents
+				);
+			} elseif (file_exists($this->app_dir.'/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 ($this->app_dir !== 'application') {
+					$contents = str_replace(
+						"\$application_folder = '../../application';",
+						"\$application_folder = '../../{$this->app_dir}';",
+						$contents
+					);
+				}
+			} else {
+				throw new Exception('Can\'t find "index.php".');
+			}
+		}
+
+		file_put_contents($file, $contents);
+	}
+
+	public function update()
+	{
+		$target_dir = $this->app_dir.'/'.$this->test_dir.'/_ci_phpunit_test';
+		$this->recursiveUnlink($target_dir);
+		$this->recursiveCopy(
+			dirname(dirname(__FILE__)).'/application/tests/_ci_phpunit_test',
+			$target_dir
+		);
+	}
+
+	/**
+	 * Recursive Copy
+	 *
+	 * @param string $src
+	 * @param string $dst
+	 */
+	private function recursiveCopy($src, $dst)
+	{
+		@mkdir($dst, 0755);
+
+		$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) {
+					if (! $this->silent) {
+						echo 'copied: '.$dst.'/'.$iterator->getSubPathName().PHP_EOL;
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Recursive Unlink
+	 *
+	 * @param string $dir
+	 */
+	private 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);
+			}
+		}
+
+		rmdir($dir);
+	}
 }

application/tests/_ci_phpunit_test/patcher/2.x/Patcher/ConstantPatcher/Proxy.php

Spacing +6 added lines, -6 removed lines

@@ -63,7 +63,7 @@ 
 			$method = isset($info['class_method']) ? $info['class_method'] : $info['function'];
 
 			MonkeyPatchManager::log(
-				'invoke_const: ' . $constant . ') on line ' . $line . ' in ' . $file . ' by ' . $method . '()'
+				'invoke_const: '.$constant.') on line '.$line.' in '.$file.' by '.$method.'()'
 			);
 		}
 	}
@@ -106,12 +106,12 @@ 
 	{
 		self::logInvocation($constant);
 
-		if (! empty(self::$patches_to_apply[$constant]))
+		if ( ! empty(self::$patches_to_apply[$constant]))
 		{
-			if (! self::checkCalledMethod($constant))
+			if ( ! self::checkCalledMethod($constant))
 			{
 				MonkeyPatchManager::log(
-					'invoke_const: ' . $constant . ' not patched (out of scope)'
+					'invoke_const: '.$constant.' not patched (out of scope)'
 				);
 				return constant($constant);
 			}
@@ -119,12 +119,12 @@ 
 
 		if (array_key_exists($constant, self::$patches))
 		{
-			MonkeyPatchManager::log('invoke_const: ' . $constant . ' patched');
+			MonkeyPatchManager::log('invoke_const: '.$constant.' patched');
 			return self::$patches[$constant];
 		}
 
 		MonkeyPatchManager::log(
-			'invoke_const: ' . $constant . ' not patched (no patch)'
+			'invoke_const: '.$constant.' not patched (no patch)'
 		);
 		return constant($constant);
 	}

update.php

Spacing +1 added lines, -1 removed lines

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

application/tests/_ci_phpunit_test/CIPHPUnitTestDbTestCase.php

Doc Comments +3 added lines, -3 removed lines

@@ -87,7 +87,7 @@ 
 	 * @param string $table
 	 * @param array  $where
 	 *
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function dontSeeInDatabase($table, array $where)
 	{
@@ -107,7 +107,7 @@ 
 	 * @param string $table
 	 * @param array  $where
 	 *
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function seeInDatabase($table, array $where)
 	{
@@ -169,7 +169,7 @@ 
 	 * @param string $table
 	 * @param array  $where
 	 *
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function seeNumRecords($expected, $table, array $where = [])
 	{

Spacing +3 added lines, -3 removed lines

@@ -35,7 +35,7 @@ 
 	{
 		if ($this->db === null)
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->load->database();
 			$this->db = $CI->db;
 		}
@@ -56,7 +56,7 @@ 
 	{
 		$this->checkDbConnId();
 		
-		if (! empty($this->insertCache))
+		if ( ! empty($this->insertCache))
 		{
 			foreach ($this->insertCache as $row)
 			{
@@ -83,7 +83,7 @@ 
 		$this->db->close();
 		$this->db = null;
 
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$CI->load->database();
 		$this->db = $CI->db;
 	}