kenjis / ci-phpunit-test

application/tests/_ci_phpunit_test/replacing/core/old/3.1.8-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/core/old/3.1.8-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/libraries/old/3.1.8-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'];

application/tests/_ci_phpunit_test/replacing/helpers/old/3.1.8-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.8-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/CIPHPUnitTest.php

Braces +3 added lines, -6 removed lines

@@ -89,8 +89,7 @@ 
 		if (! self::wiredesignzHmvcInstalled())
 		{
 			new CI_Controller();
-		}
-		else
+		} else
 		{
 			new MX_Controller();
 		}
@@ -115,13 +114,11 @@ 
 			if ($use_my_controller && self::hasMyController())
 			{
 				new self::$controller_class;
-			}
-			else
+			} else
 			{
 				new CI_Controller();
 			}
-		}
-		else
+		} else
 		{
 			new CI();
 			new MX_Controller();

Spacing +25 added lines, -25 removed lines

@@ -28,11 +28,11 @@ 
 	 */
 	public static function init(array $autoload_dirs = null)
 	{
-		if (! defined('TESTPATH')) {
+		if ( ! defined('TESTPATH')) {
 			define('TESTPATH', APPPATH.'tests'.DIRECTORY_SEPARATOR);
 		}
 		// Current Bootstrap.php should define this, but in case it doesn't:
-		if (! defined('CI_PHPUNIT_TESTPATH')) {
+		if ( ! defined('CI_PHPUNIT_TESTPATH')) {
 			define('CI_PHPUNIT_TESTPATH', dirname(__FILE__).DIRECTORY_SEPARATOR);
 		}
 
@@ -49,38 +49,38 @@ 
 		$cwd_backup = getcwd();
 
 		// Load autoloader for ci-phpunit-test
-		require __DIR__ . '/autoloader.php';
+		require __DIR__.'/autoloader.php';
 
-		require TESTPATH . 'TestCase.php';
+		require TESTPATH.'TestCase.php';
 
-		$db_test_case_file = TESTPATH . 'DbTestCase.php';
+		$db_test_case_file = TESTPATH.'DbTestCase.php';
 		if (is_readable($db_test_case_file))
 		{
 			require $db_test_case_file;
 		}
 
-		$unit_test_case_file = TESTPATH . 'UnitTestCase.php';
+		$unit_test_case_file = TESTPATH.'UnitTestCase.php';
 		if (is_readable($unit_test_case_file))
 		{
 			require $unit_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';
 		// Load ci-phpunit-test CI_Output
-		require __DIR__ . '/replacing/core/Output.php';
+		require __DIR__.'/replacing/core/Output.php';
 
 		// Change current directory
 		chdir(FCPATH);
@@ -95,10 +95,10 @@ 
 		 *
 		 * And away we go...
 		 */
-		require __DIR__ . '/replacing/core/CodeIgniter.php';
+		require __DIR__.'/replacing/core/CodeIgniter.php';
 
 		// Create CodeIgniter instance
-		if (! self::wiredesignzHmvcInstalled())
+		if ( ! self::wiredesignzHmvcInstalled())
 		{
 			new CI_Controller();
 		}
@@ -123,7 +123,7 @@ 
 	 */
 	public static function createCodeIgniterInstance($use_my_controller = false)
 	{
-		if (! self::wiredesignzHmvcInstalled())
+		if ( ! self::wiredesignzHmvcInstalled())
 		{
 			if ($use_my_controller && self::hasMyController())
 			{
@@ -148,11 +148,11 @@ 
 		}
 
 		$my_controller_file =
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Controller.php';
+			APPPATH.'core/'.config_item('subclass_prefix').'Controller.php';
 
 		if (file_exists($my_controller_file))
 		{
-			$controller_class = config_item('subclass_prefix') . 'Controller';
+			$controller_class = config_item('subclass_prefix').'Controller';
 			if ( ! class_exists($controller_class))
 			{
 				require $my_controller_file;
@@ -184,11 +184,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;
@@ -200,11 +200,11 @@ 
 	protected static function replaceConfig()
 	{
 		$my_config_file =
-			APPPATH . 'core/' . config_item('subclass_prefix') . 'Config.php';
+			APPPATH.'core/'.config_item('subclass_prefix').'Config.php';
 
 		if (file_exists($my_config_file))
 		{
-			self::$config_class = config_item('subclass_prefix') . 'Config';
+			self::$config_class = config_item('subclass_prefix').'Config';
 			if ( ! class_exists(self::$config_class))
 			{
 				require $my_config_file;
@@ -223,19 +223,19 @@ 
 
 	protected static function loadHelper($helper)
 	{
-		$my_helper_file = APPPATH . 'helpers/' . config_item('subclass_prefix') . $helper . '.php';
+		$my_helper_file = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php';
 		if (file_exists($my_helper_file))
 		{
 			require $my_helper_file;
 		}
-		require __DIR__ . '/replacing/helpers/' . $helper . '.php';
+		require __DIR__.'/replacing/helpers/'.$helper.'.php';
 	}
 
 	public static function setPatcherCacheDir($dir = null)
 	{
 		if ($dir === null)
 		{
-			$dir = CI_PHPUNIT_TESTPATH . 'tmp/cache';
+			$dir = CI_PHPUNIT_TESTPATH.'tmp/cache';
 		}
 
 		MonkeyPatchManager::setCacheDir(
@@ -251,7 +251,7 @@ 
 
 	public static function loadConfig()
 	{
-		$config= new self::$config_class;
+		$config = new self::$config_class;
 		load_class_instance('Config', $config);
 	}
 }

application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php

Spacing +14 added lines, -14 removed lines

@@ -9,7 +9,7 @@ 
  */
 
 // Support PHPUnit 6.0
-if (! class_exists('PHPUnit_Framework_TestCase'))
+if ( ! class_exists('PHPUnit_Framework_TestCase'))
 {
 	class_alias('PHPUnit\Framework\TestCase', 'PHPUnit_Framework_TestCase');
 }
@@ -69,7 +69,7 @@ 
 			return $this->$name;
 		}
 
-		throw new LogicException('No such property: ' . $name);
+		throw new LogicException('No such property: '.$name);
 	}
 
 	public static function setUpBeforeClass()
@@ -99,7 +99,7 @@ 
 	{
 		reset_instance();
 		CIPHPUnitTest::createCodeIgniterInstance($use_my_controller);
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 	}
 
 	protected function tearDown()
@@ -172,8 +172,8 @@ 
 		}
 
 		set_error_handler(
-			function ($errno, $errstr, $errfile, $errline) {
-				throw new RuntimeException($errstr . ' on line ' . $errline . ' in file ' . $errfile);
+			function($errno, $errstr, $errfile, $errline) {
+				throw new RuntimeException($errstr.' on line '.$errline.' in file '.$errfile);
 			}
 		);
 
@@ -310,7 +310,7 @@ 
 		$this->assertSame(
 			$code,
 			$actual,
-			'Status code is not ' . $code . ' but ' . $actual . '.'
+			'Status code is not '.$code.' but '.$actual.'.'
 		);
 	}
 
@@ -322,7 +322,7 @@ 
 	 */
 	public function assertResponseHeader($name, $value)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$actual = $CI->output->get_header($name);
 
 		if ($actual === null)
@@ -346,7 +346,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;
 
@@ -414,23 +414,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)
@@ -438,7 +438,7 @@ 
 			$this->assertSame(
 				$code,
 				$status['code'],
-				'Status code is not ' . $code . ' but ' . $status['code'] . '.'
+				'Status code is not '.$code.' but '.$status['code'].'.'
 			);
 		}
 	}

application/tests/_ci_phpunit_test/replacing/core/old/3.1.9-Common.php

Doc Comments +8 added lines

@@ -136,6 +136,11 @@ 
 	return $_is_loaded;
 }
 
+/**
+ * @param boolean $return
+ *
+ * @return boolean
+ */
 function is_cli($return = null)
 {
 	static $_return = TRUE;
@@ -148,6 +153,9 @@ 
 	return $_return;
 }
 
+/**
+ * @param string $message
+ */
 function show_error($message, $status_code = 500, $heading = 'An Error Was Encountered')
 {
 	$status_code = abs($status_code);

Spacing +2 added lines, -2 removed lines

@@ -263,7 +263,7 @@ 
 
 	// Save status code in Output object
 	// added by ci-phpunit-test
-	$CI =& get_instance();
+	$CI = & get_instance();
 	$output = $CI->output;
 	$output->_status = [
 		'code'     => $code,
@@ -376,7 +376,7 @@ 
 	if (empty($_config))
 	{
 		// references cannot be directly assigned to static variables, so we use an array
-		$_config[0] =& get_config();
+		$_config[0] = & get_config();
 	}
 
 	return isset($_config[0][$item]) ? $_config[0][$item] : NULL;

Braces +3 added lines, -6 removed lines

@@ -160,8 +160,7 @@ 
 		$exit_status = $status_code + 9; // 9 is EXIT__AUTO_MIN
 
 		$status_code = 500;
-	}
-	else
+	} else
 	{
 		$exit_status = 1; // EXIT_ERROR
 	}
@@ -256,8 +255,7 @@ 
 		if (isset($stati[$code]))
 		{
 			$text = $stati[$code];
-		}
-		else
+		} else
 		{
 			show_error('No status text available. Please check your status code number or supply your own message text.', 500);
 		}
@@ -327,8 +325,7 @@ 
 		if (file_exists($file_path = APPPATH.'config/'.ENVIRONMENT.'/config.php'))
 		{
 			require($file_path);
-		}
-		elseif ( ! $found)
+		} elseif ( ! $found)
 		{
 			set_status_header(503);
 			echo 'The configuration file does not exist.';

application/tests/_ci_phpunit_test/replacing/core/old/3.1.9-Input.php

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

Spacing +7 added lines, -7 removed lines

@@ -139,17 +139,17 @@ 
 	 */
 	public function __construct()
 	{
-		$this->_allow_get_array		= (config_item('allow_get_array') !== FALSE);
-		$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') !== FALSE);
+		$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
@@ -429,7 +429,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 +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;
 		}