Merge pull request bcit-ci#5367 from carusogabriel/clean-elses

Clean elses
radenrap · Dec 27, 2017 · 3b470a6 · 3b470a6
2 parents fbae310 + 7774e38
commit 3b470a6
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 45 deletions.
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
@@ -382,10 +382,8 @@ protected function _create_table($table, $if_not_exists, $attributes)
 			{
 				return TRUE;
 			}
-			else
-			{
-				$if_not_exists = FALSE;
-			}
+
+			$if_not_exists = FALSE;
 		}
 
 		$sql = ($if_not_exists)

diff --git a/system/database/DB_result.php b/system/database/DB_result.php
@@ -163,10 +163,8 @@ public function result($type = 'object')
 		{
 			return $this->result_object();
 		}
-		else
-		{
-			return $this->custom_result_object($type);
-		}
+
+		return $this->custom_result_object($type);
 	}
 
 	// --------------------------------------------------------------------
@@ -336,7 +334,8 @@ public function row($n = 0, $type = 'object')
 
 		if ($type === 'object') return $this->row_object($n);
 		elseif ($type === 'array') return $this->row_array($n);
-		else return $this->custom_row_object($n, $type);
+
+		return $this->custom_row_object($n, $type);
 	}
 
 	// --------------------------------------------------------------------

diff --git a/system/libraries/Email.php b/system/libraries/Email.php
@@ -941,10 +941,8 @@ protected function _get_content_type()
 		{
 			return 'plain-attach';
 		}
-		else
-		{
-			return 'plain';
-		}
+
+		return 'plain';
 	}
 
 	// --------------------------------------------------------------------
@@ -2209,10 +2207,8 @@ protected function _send_data($data)
 				usleep(250000);
 				continue;
 			}
-			else
-			{
-				$timestamp = 0;
-			}
+
+			$timestamp = 0;
 		}
 
 		if ($result === FALSE)

diff --git a/system/libraries/Encryption.php b/system/libraries/Encryption.php
@@ -682,10 +682,8 @@ protected function _get_params($params)
 			{
 				return FALSE;
 			}
-			else
-			{
-				$params['mode'] = $this->_modes[$this->_driver][$params['mode']];
-			}
+
+			$params['mode'] = $this->_modes[$this->_driver][$params['mode']];
 		}
 
 		if (isset($params['hmac']) && $params['hmac'] === FALSE)

diff --git a/system/libraries/Session/Session.php b/system/libraries/Session/Session.php
@@ -222,10 +222,8 @@ protected function _ci_load_classes($driver)
 			{
 				return $prefix.$class;
 			}
-			else
-			{
-				log_message('debug', 'Session: '.$prefix.$class.".php found but it doesn't declare class ".$prefix.$class.'.');
-			}
+
+			log_message('debug', 'Session: '.$prefix.$class.".php found but it doesn't declare class ".$prefix.$class.'.');
 		}
 
 		return 'CI_'.$class;

diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
@@ -678,10 +678,8 @@ public function set_filename($path, $filename)
 			$this->set_error('upload_bad_filename', 'debug');
 			return FALSE;
 		}
-		else
-		{
-			return $new_filename;
-		}
+
+		return $new_filename;
 	}
 
 	// --------------------------------------------------------------------

diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php
@@ -402,15 +402,11 @@ protected function _execute($m)
 			{
 				return get_instance()->{$method_parts[1]}($m);
 			}
-			else
-			{
-				return $this->object->{$method_parts[1]}($m);
-			}
-		}
-		else
-		{
-			return call_user_func($this->methods[$methName]['function'], $m);
+
+			return $this->object->{$method_parts[1]}($m);
 		}
+
+		return call_user_func($this->methods[$methName]['function'], $m);
 	}
 
 	// --------------------------------------------------------------------
@@ -499,10 +495,8 @@ public function methodHelp($m)
 
 			return new XML_RPC_Response(new XML_RPC_Values($docstring, 'string'));
 		}
-		else
-		{
-			return new XML_RPC_Response(0, $this->xmlrpcerr['introspect_unknown'], $this->xmlrpcstr['introspect_unknown']);
-		}
+
+		return new XML_RPC_Response(0, $this->xmlrpcerr['introspect_unknown'], $this->xmlrpcstr['introspect_unknown']);
 	}
 
 	// --------------------------------------------------------------------

diff --git a/tests/mocks/ci_testcase.php b/tests/mocks/ci_testcase.php
@@ -377,10 +377,8 @@ public function __call($method, $args)
 		{
 			return call_user_func_array($this->{$method},$args);
 		}
-		else
-		{
-			return parent::__call($method, $args);
-		}
+
+		return parent::__call($method, $args);
 	}
 
 }