kenjis / ci-phpunit-test

application/tests/_ci_phpunit_test/patcher/PathChecker.php

Spacing +2 added lines, -2 removed lines

@@ -38,12 +38,12 @@
 			$real_path = realpath($path);
 			if ($real_path === FALSE)
 			{
-				throw new RuntimeException($path . ' does not exist?');
+				throw new RuntimeException($path.' does not exist?');
 			}
 			if (is_dir($real_path))
 			{
 				// Must use DIRECTORY_SEPARATOR for Windows
-				$real_path = $real_path . DIRECTORY_SEPARATOR;
+				$real_path = $real_path.DIRECTORY_SEPARATOR;
 			}
 			$new_paths[] = $excluded ? '-'.$real_path : $real_path;
 		}

application/tests/_ci_phpunit_test/CIPHPUnitTestDbTestCase.php

Spacing +2 added lines, -2 removed lines

@@ -35,7 +35,7 @@ 
 	{
 		if ($this->db === null)
 		{
-			$CI =& get_instance();
+			$CI = & get_instance();
 			$CI->load->database();
 			$this->db = $CI->db;
 		}
@@ -54,7 +54,7 @@ 
 	 */
 	protected function tearDown()
 	{
-		if (! empty($this->insertCache))
+		if ( ! empty($this->insertCache))
 		{
 			foreach ($this->insertCache as $row)
 			{

application/libraries/Seeder.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 
 	public function __construct()
 	{
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 		$this->CI->load->database();
 		$this->CI->load->dbforge();
 		$this->db = $this->CI->db;
@@ -33,10 +33,10 @@ 
 	{
 		if ($this->seedPath === null)
 		{
-			$this->seedPath = APPPATH . 'database/seeds/';
+			$this->seedPath = APPPATH.'database/seeds/';
 		}
 
-		$file = $this->seedPath . $seeder . '.php';
+		$file = $this->seedPath.$seeder.'.php';
 		require_once $file;
 
 		$obj = new $seeder;

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

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()');
 		}

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

application/tests/_ci_phpunit_test/CIPHPUnitTestCase.php

Spacing +12 added lines, -12 removed lines

@@ -49,7 +49,7 @@ 
 			return $this->$name;
 		}
 
-		throw new LogicException('No such property: ' . $name);
+		throw new LogicException('No such property: '.$name);
 	}
 
 	public static function setUpBeforeClass()
@@ -72,7 +72,7 @@ 
 	{
 		reset_instance();
 		CIPHPUnitTest::createCodeIgniterInstance();
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 	}
 
 	/**
@@ -85,7 +85,7 @@ 
 	{
 		reset_instance();
 		$controller = new $classname;
-		$this->CI =& get_instance();
+		$this->CI = & get_instance();
 		return $controller;
 	}
 
@@ -266,7 +266,7 @@ 
 		$this->assertSame(
 			$code,
 			$actual,
-			'Status code is not ' . $code . ' but ' . $actual . '.'
+			'Status code is not '.$code.' but '.$actual.'.'
 		);
 	}
 
@@ -278,7 +278,7 @@ 
 	 */
 	public function assertResponseHeader($name, $value)
 	{
-		$CI =& get_instance();
+		$CI = & get_instance();
 		$actual = $CI->output->get_header($name);
 
 		if ($actual === null)
@@ -302,7 +302,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;
 
@@ -360,23 +360,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)
@@ -384,7 +384,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/CIPHPUnitTestSuperGlobal.php

Spacing +7 added lines, -7 removed lines

@@ -42,9 +42,9 @@ 
 		}
 
 		// Handle single file
-		$file =& $files[$field];
+		$file = & $files[$field];
 
-		if (! file_exists($file['tmp_name']))
+		if ( ! file_exists($file['tmp_name']))
 		{
 			$file['error'] = UPLOAD_ERR_NO_FILE;
 			$file['type'] = '';
@@ -110,7 +110,7 @@ 
 				// Set $_GET if URI string has query string
 				parse_str($query_string, $_GET);
 				// Remove query string from URI string
-				$argv = substr($argv, 0, -strlen($query_string)-1);
+				$argv = substr($argv, 0, -strlen($query_string) - 1);
 			}
 		}
 
@@ -143,12 +143,12 @@ 
 		if ($_GET !== [])
 		{
 			$_SERVER['REQUEST_URI'] =
-				'/' . $path . '?'
+				'/'.$path.'?'
 				. http_build_query($_GET);
 		}
 		else
 		{
-			$_SERVER['REQUEST_URI'] = '/' . $path;
+			$_SERVER['REQUEST_URI'] = '/'.$path;
 		}
 	}
 
@@ -165,7 +165,7 @@ 
 
 		if ($query_string === false)
 		{
-			throw new LogicException('Bad URI string: ' . $uri);
+			throw new LogicException('Bad URI string: '.$uri);
 		}
 
 		return $query_string;
@@ -190,7 +190,7 @@ 
 		}
 		else
 		{
-			$key = 'HTTP_' . $normalized_name;
+			$key = 'HTTP_'.$normalized_name;
 		}
 
 		$_SERVER[$key] = $value;

Braces +4 added lines, -8 removed lines

@@ -76,8 +76,7 @@ 
 		if (is_numeric($value))
 		{
 			return $value;
-		}
-		else
+		} else
 		{
 			$value_length = strlen($value);
 			$number = substr($value, 0, $value_length - 1);
@@ -133,8 +132,7 @@ 
 		if (is_string($argv))
 		{
 			$path = $argv;
-		}
-		elseif (is_array($argv))
+		} elseif (is_array($argv))
 		{
 			// Generate URI path from array of controller, method, arg, ...
 			$path = implode('/', $argv);
@@ -145,8 +143,7 @@ 
 			$_SERVER['REQUEST_URI'] =
 				'/' . $path . '?'
 				. http_build_query($_GET);
-		}
-		else
+		} else
 		{
 			$_SERVER['REQUEST_URI'] = '/' . $path;
 		}
@@ -187,8 +184,7 @@ 
 		)
 		{
 			$key = $normalized_name;
-		}
-		else
+		} else
 		{
 			$key = 'HTTP_' . $normalized_name;
 		}

application/tests/_ci_phpunit_test/replacing/libraries/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 +21 added lines, -19 removed lines

@@ -327,19 +327,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)
 			{
@@ -348,8 +345,7 @@ 
 					if ($reflection->hasMethod('set_'.$key))
 					{
 						$this->{'set_'.$key}($value);
-					}
-					else
+					} else
 					{
 						$this->$key = $value;
 					}
@@ -409,9 +405,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)
 			{
@@ -476,8 +474,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);
@@ -677,8 +674,7 @@ 
 		{
 			$this->set_error('upload_bad_filename', 'debug');
 			return FALSE;
-		}
-		else
+		} else
 		{
 			return $new_filename;
 		}
@@ -863,8 +859,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';
 		}
@@ -1116,9 +1111,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);
@@ -1220,9 +1218,11 @@ 
 
 		// Fileinfo extension - most reliable method
 		$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,
@@ -1306,10 +1306,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'];