ci-bonfire / Sprint

myth/_generators/Model/ModelGenerator.php

Braces +2 added lines, -4 removed lines

@@ -79,8 +79,7 @@ 
 		if ( $quiet === false )
 		{
 			$this->collectOptions( $name, $options );
-		}
-		else
+		} else
 		{
 			$this->quietSetOptions( $name, $options );
 		}
@@ -219,8 +218,7 @@ 
             }
 
             $fields = $this->parseFieldString($options['fields']);
-		}
-        else
+		} else
         {
             $fields = $this->db->field_data( $table_name );
         }

system/core/CodeIgniter.php

Braces +8 added lines, -16 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);
 		}
@@ -250,8 +248,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);
 	}
@@ -264,8 +261,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);
 	}
@@ -402,16 +398,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';
@@ -453,8 +447,7 @@ 
 						$RTR->directory = '';
 					}
 				}
-			}
-			else
+			} else
 			{
 				$e404 = FALSE;
 			}
@@ -470,8 +463,7 @@ 
 				1 => $class,
 				2 => $method
 			);
-		}
-		else
+		} else
 		{
 			show_404($RTR->directory.$class.'/'.$method);
 		}

system/core/Common.php

Braces +14 added lines, -20 removed lines

@@ -111,8 +111,7 @@ 
 			@chmod($file, 0777);
 			@unlink($file);
 			return TRUE;
-		}
-		elseif ( ! is_file($file) OR ($fp = @fopen($file, 'ab')) === FALSE)
+		} elseif ( ! is_file($file) OR ($fp = @fopen($file, 'ab')) === FALSE)
 		{
 			return FALSE;
 		}
@@ -253,8 +252,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.';
@@ -322,12 +320,10 @@ 
 			if (file_exists(APPPATH.'config/'.ENVIRONMENT.'/mimes.php'))
 			{
 				$_mimes = include(APPPATH.'config/'.ENVIRONMENT.'/mimes.php');
-			}
-			elseif (file_exists(APPPATH.'config/mimes.php'))
+			} elseif (file_exists(APPPATH.'config/mimes.php'))
 			{
 				$_mimes = include(APPPATH.'config/mimes.php');
-			}
-			else
+			} else
 			{
 				$_mimes = array();
 			}
@@ -354,12 +350,10 @@ 
 		if ( ! empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off')
 		{
 			return TRUE;
-		}
-		elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')
+		} elseif (isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https')
 		{
 			return TRUE;
-		}
-		elseif ( ! empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off')
+		} elseif ( ! empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off')
 		{
 			return TRUE;
 		}
@@ -410,14 +404,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
 		}
@@ -556,8 +552,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);
 			}
@@ -566,8 +561,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);

system/core/Config.php

Braces +10 added lines, -20 removed lines

@@ -93,16 +93,14 @@ 
 				if (strpos($_SERVER['SERVER_ADDR'], ':') !== FALSE)
 				{
 					$server_addr = '['.$_SERVER['SERVER_ADDR'].']';
-				}
-				else
+				} else
 				{
 					$server_addr = $_SERVER['SERVER_ADDR'];
 				}
 
 				$base_url = (is_https() ? 'https' : 'http').'://'.$server_addr
 					.substr($_SERVER['SCRIPT_NAME'], 0, strpos($_SERVER['SCRIPT_NAME'], basename($_SERVER['SCRIPT_FILENAME'])));
-			}
-			else
+			} else
 			{
 				$base_url = 'http://localhost/';
 			}
@@ -160,8 +158,7 @@ 
 					$this->config[$file] = isset($this->config[$file])
 						? array_merge($this->config[$file], $config)
 						: $config;
-				}
-				else
+				} else
 				{
 					$this->config = array_merge($this->config, $config);
 				}
@@ -176,8 +173,7 @@ 
 		if ($loaded === TRUE)
 		{
 			return TRUE;
-		}
-		elseif ($fail_gracefully === TRUE)
+		} elseif ($fail_gracefully === TRUE)
 		{
 			return FALSE;
 		}
@@ -217,8 +213,7 @@ 
 		if ( ! isset($this->config[$item]))
 		{
 			return NULL;
-		}
-		elseif (trim($this->config[$item]) === '')
+		} elseif (trim($this->config[$item]) === '')
 		{
 			return '';
 		}
@@ -249,8 +244,7 @@ 
 			if ($protocol === '')
 			{
 				$base_url = substr($base_url, strpos($base_url, '//'));
-			}
-			else
+			} else
 			{
 				$base_url = $protocol.substr($base_url, strpos($base_url, '://'));
 			}
@@ -272,16 +266,14 @@ 
 				if (($offset = strpos($uri, '?')) !== FALSE)
 				{
 					$uri = substr($uri, 0, $offset).$suffix.substr($uri, $offset);
-				}
-				else
+				} else
 				{
 					$uri .= $suffix;
 				}
 			}
 
 			return $base_url.$this->slash_item('index_page').$uri;
-		}
-		elseif (strpos($uri, '?') === FALSE)
+		} elseif (strpos($uri, '?') === FALSE)
 		{
 			$uri = '?'.$uri;
 		}
@@ -312,8 +304,7 @@ 
 			if ($protocol === '')
 			{
 				$base_url = substr($base_url, strpos($base_url, '//'));
-			}
-			else
+			} else
 			{
 				$base_url = $protocol.substr($base_url, strpos($base_url, '://'));
 			}
@@ -342,8 +333,7 @@ 
 				$uri = implode('/', $uri);
 			}
 			return trim($uri, '/');
-		}
-		elseif (is_array($uri))
+		} elseif (is_array($uri))
 		{
 			return http_build_query($uri);
 		}

system/core/Exceptions.php

Braces +4 added lines, -8 removed lines

@@ -122,8 +122,7 @@ 
 		{
 			$heading = 'Not Found';
 			$message = 'The controller/method pair you requested was not found.';
-		}
-		else
+		} else
 		{
 			$heading = '404 Page Not Found';
 			$message = 'The page you requested was not found.';
@@ -166,8 +165,7 @@ 
 		{
 			$message = "\t".(is_array($message) ? implode("\n\t", $message) : $message);
 			$template = 'cli'.DIRECTORY_SEPARATOR.$template;
-		}
-		else
+		} else
 		{
 			set_status_header($status_code);
 			$message = '<p>'.(is_array($message) ? implode('</p><p>', $message) : $message).'</p>';
@@ -204,8 +202,7 @@ 
 		if (is_cli())
 		{
 			$templates_path .= 'cli'.DIRECTORY_SEPARATOR;
-		}
-		else
+		} else
 		{
 			set_status_header(500);
 			$templates_path .= 'html'.DIRECTORY_SEPARATOR;
@@ -255,8 +252,7 @@ 
 			}
 
 			$template = 'html'.DIRECTORY_SEPARATOR.'error_php';
-		}
-		else
+		} else
 		{
 			$template = 'cli'.DIRECTORY_SEPARATOR.'error_php';
 		}

system/core/Hooks.php

Braces +5 added lines, -10 removed lines

@@ -143,8 +143,7 @@ 
 			{
 				$this->_run_hook($val);
 			}
-		}
-		else
+		} else
 		{
 			$this->_run_hook($this->hooks[$which]);
 		}
@@ -172,8 +171,7 @@ 
 				: $data();
 
 			return TRUE;
-		}
-		elseif ( ! is_array($data))
+		} elseif ( ! is_array($data))
 		{
 			return FALSE;
 		}
@@ -227,13 +225,11 @@ 
 				if (method_exists($this->_objects[$class], $function))
 				{
 					$this->_objects[$class]->$function($params);
-				}
-				else
+				} else
 				{
 					return $this->_in_progress = FALSE;
 				}
-			}
-			else
+			} else
 			{
 				class_exists($class, FALSE) OR require_once($filepath);
 
@@ -246,8 +242,7 @@ 
 				$this->_objects[$class] = new $class();
 				$this->_objects[$class]->$function($params);
 			}
-		}
-		else
+		} else
 		{
 			function_exists($function) OR require_once($filepath);
 

system/core/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;
 		}
@@ -401,8 +402,7 @@ 
 		if ( ! is_numeric($expire))
 		{
 			$expire = time() - 86500;
-		}
-		else
+		} else
 		{
 			$expire = ($expire > 0) ? time() + $expire : 0;
 		}
@@ -448,8 +448,7 @@ 
 					if ( ! $this->valid_ip($spoof))
 					{
 						$spoof = NULL;
-					}
-					else
+					} else
 					{
 						break;
 					}
@@ -502,8 +501,7 @@ 
 							}
 
 							$sprintf = '%016b%016b%016b%016b%016b%016b%016b%016b';
-						}
-						else
+						} else
 						{
 							$ip = explode('.', $this->ip_address);
 							$sprintf = '%08b%08b%08b%08b';
@@ -523,8 +521,7 @@ 
 						{
 							$netaddr[$i] = intval($netaddr[$i], 16);
 						}
-					}
-					else
+					} else
 					{
 						$netaddr = explode('.', $netaddr);
 					}
@@ -605,8 +602,7 @@ 
 		if ($this->_allow_get_array === FALSE)
 		{
 			$_GET = array();
-		}
-		elseif (is_array($_GET))
+		} elseif (is_array($_GET))
 		{
 			foreach ($_GET as $key => $val)
 			{
@@ -642,8 +638,7 @@ 
 				if (($cookie_key = $this->_clean_input_keys($key)) !== FALSE)
 				{
 					$_COOKIE[$cookie_key] = $this->_clean_input_data($val);
-				}
-				else
+				} else
 				{
 					unset($_COOKIE[$key]);
 				}
@@ -729,8 +724,7 @@ 
 			if ($fatal === TRUE)
 			{
 				return FALSE;
-			}
-			else
+			} else
 			{
 				set_status_header(503);
 				echo 'Disallowed Key Characters.';
@@ -885,8 +879,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;
 		}

system/core/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);
 				}
@@ -236,8 +234,7 @@ 
 		if (empty($model))
 		{
 			return $this;
-		}
-		elseif (is_array($model))
+		} elseif (is_array($model))
 		{
 			foreach ($model as $key => $value)
 			{
@@ -313,8 +310,7 @@ 
 			{
 				throw new RuntimeException('Unable to locate the model you have specified: '.$model);
 			}
-		}
-		elseif ( ! is_subclass_of($model, 'CI_Model'))
+		} elseif ( ! is_subclass_of($model, 'CI_Model'))
 		{
 			throw new RuntimeException("Class ".$model." already exists and doesn't extend CI_Model");
 		}
@@ -425,8 +421,7 @@ 
 				require_once($driver_path);
 				$class = 'CI_DB_'.$db->dbdriver.'_'.$db->subdriver.'_forge';
 			}
-		}
-		else
+		} else
 		{
 			$class = 'CI_DB_'.$db->dbdriver.'_forge';
 		}
@@ -694,8 +689,7 @@ 
 			}
 
 			return $this;
-		}
-		elseif (empty($library))
+		} elseif (empty($library))
 		{
 			return FALSE;
 		}
@@ -788,8 +782,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)
@@ -851,8 +844,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;
@@ -922,8 +914,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
 		}
@@ -950,8 +941,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();
@@ -989,8 +979,7 @@ 
 
 			// Get the filename from the path
 			$class = substr($class, $last_slash);
-		}
-		else
+		} else
 		{
 			$subdir = '';
 		}
@@ -1108,8 +1097,7 @@ 
 				if (class_exists($prefix.$library_name, FALSE))
 				{
 					return $this->_ci_init_library($library_name, $prefix, $params, $object_name);
-				}
-				else
+				} else
 				{
 					log_message('debug', $path.' exists, but does not declare '.$prefix.$library_name);
 				}
@@ -1129,8 +1117,7 @@ 
 				{
 					$prefix = config_item('subclass_prefix');
 					break;
-				}
-				else
+				} else
 				{
 					log_message('debug', $path.' exists, but does not declare '.$subclass);
 				}
@@ -1177,8 +1164,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;
@@ -1188,8 +1174,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;
@@ -1380,8 +1365,7 @@ 
 		if ( ! is_array($filename))
 		{
 			return array(strtolower(str_replace(array($extension, '.php'), '', $filename).$extension));
-		}
-		else
+		} else
 		{
 			foreach ($filename as $key => $val)
 			{

system/core/Log.php

Braces +2 added lines, -4 removed lines

@@ -129,8 +129,7 @@ 
 		if (is_numeric($config['log_threshold']))
 		{
 			$this->_threshold = (int) $config['log_threshold'];
-		}
-		elseif (is_array($config['log_threshold']))
+		} elseif (is_array($config['log_threshold']))
 		{
 			$this->_threshold = 0;
 			$this->_threshold_array = array_flip($config['log_threshold']);
@@ -198,8 +197,7 @@ 
 			$microtime_short = sprintf("%06d", ($microtime_full - floor($microtime_full)) * 1000000);
 			$date = new DateTime(date('Y-m-d H:i:s.'.$microtime_short, $microtime_full));
 			$date = $date->format($this->_date_fmt);
-		}
-		else
+		} else
 		{
 			$date = date($this->_date_fmt);
 		}