kenjis / ci-phpunit-test

application/tests/_ci_phpunit_test/replacing/core/old/3.0.3-CodeIgniter.php

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

application/tests/_ci_phpunit_test/replacing/core/old/3.1.0-Loader.php

Braces +16 added lines, -32 removed lines

@@ -192,16 +192,14 @@ 
 		if (empty($library))
 		{
 			return $this;
-		}
-		elseif (is_array($library))
+		} elseif (is_array($library))
 		{
 			foreach ($library as $key => $value)
 			{
 				if (is_int($key))
 				{
 					$this->library($value, $params);
-				}
-				else
+				} else
 				{
 					$this->library($key, $params, $value);
 				}
@@ -238,8 +236,7 @@ 
 		if (empty($model))
 		{
 			return $this;
-		}
-		elseif (is_array($model))
+		} elseif (is_array($model))
 		{
 			foreach ($model as $key => $value)
 			{
@@ -305,8 +302,7 @@ 
 				{
 					throw new RuntimeException($app_path."Model.php exists, but doesn't declare class CI_Model");
 				}
-			}
-			elseif ( ! class_exists('CI_Model', FALSE))
+			} elseif ( ! class_exists('CI_Model', FALSE))
 			{
 				require_once(BASEPATH.'core'.DIRECTORY_SEPARATOR.'Model.php');
 			}
@@ -457,8 +453,7 @@ 
 				require_once($driver_path);
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
 			}
-		}
-		else
+		} else
 		{
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
 		}
@@ -725,16 +720,14 @@ 
 				if (is_int($key))
 				{
 					$this->driver($value, $params);
-				}
-				else
+				} else
 				{
 					$this->driver($key, $params, $value);
 				}
 			}
 
 			return $this;
-		}
-		elseif (empty($library))
+		} elseif (empty($library))
 		{
 			return FALSE;
 		}
@@ -827,8 +820,7 @@ 
 			array_shift($this->_ci_helper_paths);
 			array_shift($this->_ci_view_paths);
 			array_pop($config->_config_paths);
-		}
-		else
+		} else
 		{
 			$path = rtrim($path, '/').'/';
 			foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var)
@@ -890,8 +882,7 @@ 
 		{
 			$_ci_x = explode('/', $_ci_path);
 			$_ci_file = end($_ci_x);
-		}
-		else
+		} else
 		{
 			$_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
 			$_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view;
@@ -969,8 +960,7 @@ 
 		if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE)
 		{
 			echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
-		}
-		else
+		} else
 		{
 			include($_ci_path); // include() vs include_once() allows for multiple views with the same name
 		}
@@ -997,8 +987,7 @@ 
 		if (ob_get_level() > $this->_ci_ob_level + 1)
 		{
 			ob_end_flush();
-		}
-		else
+		} else
 		{
 			$_ci_CI->output->append_output(ob_get_contents());
 			@ob_end_clean();
@@ -1038,8 +1027,7 @@ 
 
 			// Get the filename from the path
 			$class = substr($class, $last_slash);
-		}
-		else
+		} else
 		{
 			$subdir = '';
 		}
@@ -1180,8 +1168,7 @@ 
 				{
 					$prefix = config_item('subclass_prefix');
 					break;
-				}
-				else
+				} else
 				{
 					log_message('debug', $path.' exists, but does not declare '.$subclass);
 				}
@@ -1228,8 +1215,7 @@ 
 					{
 						include($path.'config/'.strtolower($class).'.php');
 						$found = TRUE;
-					}
-					elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
+					} elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
 					{
 						include($path.'config/'.ucfirst(strtolower($class)).'.php');
 						$found = TRUE;
@@ -1239,8 +1225,7 @@ 
 					{
 						include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
 						$found = TRUE;
-					}
-					elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
+					} elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
 					{
 						include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
 						$found = TRUE;
@@ -1428,8 +1413,7 @@ 
 		if ( ! is_array($filename))
 		{
 			return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension));
-		}
-		else
+		} else
 		{
 			foreach ($filename as $key => $val)
 			{

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

Braces +17 added lines, -25 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[$j], 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.';
@@ -782,8 +776,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'];
 
@@ -904,8 +897,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/replacing/core/old/3.0.4-CodeIgniter.php

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

application/tests/_ci_phpunit_test/replacing/core/old/3.1.2-CodeIgniter.php

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.0.3-Input.php

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/replacing/core/old/3.0.0-Common.php

Braces +9 added lines, -10 removed lines

@@ -158,14 +158,16 @@ 
 	if ($status_code < 100)
 	{
 		$exit_status = $status_code + 9; // 9 is EXIT__AUTO_MIN
-		if ($exit_status > 125) // 125 is EXIT__AUTO_MAX
+		if ($exit_status > 125) {
+			// 125 is EXIT__AUTO_MAX
 		{
-			$exit_status = 1; // EXIT_ERROR
+			$exit_status = 1;
+		}
+		// EXIT_ERROR
 		}
 
 		$status_code = 500;
-	}
-	else
+	} else
 	{
 		$exit_status = 1; // EXIT_ERROR
 	}
@@ -254,8 +256,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);
 		}
@@ -281,8 +282,7 @@ 
 	if (strpos(PHP_SAPI, 'cgi') === 0)
 	{
 		header('Status: '.$code.' '.$text, TRUE);
-	}
-	else
+	} else
 	{
 		$server_protocol = isset($_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.1';
 		header($server_protocol.' '.$code.' '.$text, TRUE, $code);
@@ -325,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.0.4-Input.php

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/replacing/core/old/3.0.5-Loader.php

Braces +16 added lines, -32 removed lines

@@ -192,16 +192,14 @@ 
 		if (empty($library))
 		{
 			return $this;
-		}
-		elseif (is_array($library))
+		} elseif (is_array($library))
 		{
 			foreach ($library as $key => $value)
 			{
 				if (is_int($key))
 				{
 					$this->library($value, $params);
-				}
-				else
+				} else
 				{
 					$this->library($key, $params, $value);
 				}
@@ -238,8 +236,7 @@ 
 		if (empty($model))
 		{
 			return $this;
-		}
-		elseif (is_array($model))
+		} elseif (is_array($model))
 		{
 			foreach ($model as $key => $value)
 			{
@@ -305,8 +302,7 @@ 
 				{
 					throw new RuntimeException($app_path."Model.php exists, but doesn't declare class CI_Model");
 				}
-			}
-			elseif ( ! class_exists('CI_Model', FALSE))
+			} elseif ( ! class_exists('CI_Model', FALSE))
 			{
 				require_once(BASEPATH.'core'.DIRECTORY_SEPARATOR.'Model.php');
 			}
@@ -457,8 +453,7 @@ 
 				require_once($driver_path);
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
 			}
-		}
-		else
+		} else
 		{
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
 		}
@@ -725,16 +720,14 @@ 
 				if (is_int($key))
 				{
 					$this->driver($value, $params);
-				}
-				else
+				} else
 				{
 					$this->driver($key, $params, $value);
 				}
 			}
 
 			return $this;
-		}
-		elseif (empty($library))
+		} elseif (empty($library))
 		{
 			return FALSE;
 		}
@@ -827,8 +820,7 @@ 
 			array_shift($this->_ci_helper_paths);
 			array_shift($this->_ci_view_paths);
 			array_pop($config->_config_paths);
-		}
-		else
+		} else
 		{
 			$path = rtrim($path, '/').'/';
 			foreach (array('_ci_library_paths', '_ci_model_paths', '_ci_helper_paths') as $var)
@@ -890,8 +882,7 @@ 
 		{
 			$_ci_x = explode('/', $_ci_path);
 			$_ci_file = end($_ci_x);
-		}
-		else
+		} else
 		{
 			$_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION);
 			$_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view;
@@ -969,8 +960,7 @@ 
 		if ( ! is_php('5.4') && ! ini_get('short_open_tag') && config_item('rewrite_short_tags') === TRUE)
 		{
 			echo eval('?>'.preg_replace('/;*\s*\?>/', '; ?>', str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
-		}
-		else
+		} else
 		{
 			include($_ci_path); // include() vs include_once() allows for multiple views with the same name
 		}
@@ -997,8 +987,7 @@ 
 		if (ob_get_level() > $this->_ci_ob_level + 1)
 		{
 			ob_end_flush();
-		}
-		else
+		} else
 		{
 			$_ci_CI->output->append_output(ob_get_contents());
 			@ob_end_clean();
@@ -1038,8 +1027,7 @@ 
 
 			// Get the filename from the path
 			$class = substr($class, $last_slash);
-		}
-		else
+		} else
 		{
 			$subdir = '';
 		}
@@ -1180,8 +1168,7 @@ 
 				{
 					$prefix = config_item('subclass_prefix');
 					break;
-				}
-				else
+				} else
 				{
 					log_message('debug', $path.' exists, but does not declare '.$subclass);
 				}
@@ -1228,8 +1215,7 @@ 
 					{
 						include($path.'config/'.strtolower($class).'.php');
 						$found = TRUE;
-					}
-					elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
+					} elseif (file_exists($path.'config/'.ucfirst(strtolower($class)).'.php'))
 					{
 						include($path.'config/'.ucfirst(strtolower($class)).'.php');
 						$found = TRUE;
@@ -1239,8 +1225,7 @@ 
 					{
 						include($path.'config/'.ENVIRONMENT.'/'.strtolower($class).'.php');
 						$found = TRUE;
-					}
-					elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
+					} elseif (file_exists($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php'))
 					{
 						include($path.'config/'.ENVIRONMENT.'/'.ucfirst(strtolower($class)).'.php');
 						$found = TRUE;
@@ -1428,8 +1413,7 @@ 
 		if ( ! is_array($filename))
 		{
 			return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension));
-		}
-		else
+		} else
 		{
 			foreach ($filename as $key => $val)
 			{