kenjis / ci-phpunit-test

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

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/libraries/Upload.php

Braces +20 added lines, -17 removed lines

@@ -332,19 +332,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)
 			{
@@ -353,8 +350,7 @@ 
 					if ($reflection->hasMethod('set_'.$key))
 					{
 						$this->{'set_'.$key}($value);
-					}
-					else
+					} else
 					{
 						$this->$key = $value;
 					}
@@ -416,9 +412,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)
 			{
@@ -483,8 +481,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);
@@ -882,8 +879,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';
 		}
@@ -1149,9 +1145,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);
@@ -1270,9 +1269,11 @@ 
 		if (function_exists('finfo_file'))
 		{
 			$finfo = @finfo_open(FILEINFO_MIME);
-			if ($finfo !== FALSE) // It is possible that a FALSE value is returned, if there is no magic MIME database file found on the system
+			if ($finfo !== FALSE) {
+				// 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,
@@ -1357,10 +1358,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/libraries/old/3.1.10-Upload.php

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.10-url_helper.php

Braces +3 added lines, -6 removed lines

@@ -34,16 +34,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;
 			}
@@ -68,8 +66,7 @@ 
 		if ( ! TestCase::isTestingEnv())
 		{
 			exit;
-		}
-		else
+		} else
 		{
 			while (ob_get_level() > 1)
 			{

application/tests/_ci_phpunit_test/replacing/helpers/old/3.1.10-download_helper.php

Braces +4 added lines, -8 removed lines

@@ -38,8 +38,7 @@ 
 		if ($filename === '' OR $data === '')
 		{
 			return;
-		}
-		elseif ($data === NULL)
+		} elseif ($data === NULL)
 		{
 			if ( ! @is_file($filename) OR ($filesize = @filesize($filename)) === FALSE)
 			{
@@ -49,8 +48,7 @@ 
 			$filepath = $filename;
 			$filename = explode('/', str_replace(DIRECTORY_SEPARATOR, '/', $filename));
 			$filename = end($filename);
-		}
-		else
+		} else
 		{
 			$filesize = strlen($data);
 		}
@@ -137,8 +135,7 @@ 
 			if ( ! TestCase::isTestingEnv())
 			{
 				exit($data);
-			}
-			else
+			} else
 			{
 				echo($data);
 				throw new CIPHPUnitTestExitException('exit() from force_download()');
@@ -155,8 +152,7 @@ 
 		if ( ! TestCase::isTestingEnv())
 		{
 			exit;
-		}
-		else
+		} else
 		{
 			throw new CIPHPUnitTestExitException('exit() from force_download()');
 		}