Refactor Core CodeIgniter

Author: hungnguyenhp

system/core/Config.php

@@ -124,6 +124,7 @@ public function __construct()
 	 * @param	bool	$fail_gracefully	Whether to just return FALSE or display an error message
 	 * @return	bool	TRUE if the file was loaded correctly or FALSE on failure
 	 */
+	#[\ReturnTypeWillChange]
 	public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE)
 	{
 		$file = ($file === '') ? 'config' : str_replace('.php', '', $file);
@@ -174,12 +175,11 @@ public function load($file = '', $use_sections = FALSE, $fail_gracefully = FALSE
 			}
 		}
 
-		if ($loaded === TRUE)
-		{
+		if ($loaded === TRUE) {
 			return TRUE;
 		}
-		elseif ($fail_gracefully === TRUE)
-		{
+
+		if ($fail_gracefully === TRUE) {
 			return FALSE;
 		}
 
@@ -219,7 +219,8 @@ public function slash_item($item)
 		{
 			return NULL;
 		}
-		elseif (trim($this->config[$item]) === '')
+
+		if (trim($this->config[$item]) === '')
 		{
 			return '';
 		}
@@ -264,8 +265,7 @@ public function site_url($uri = '', $protocol = NULL)
 
 		$uri = $this->_uri_string($uri);
 
-		if ($this->item('enable_query_strings') === FALSE)
-		{
+		if ($this->item('enable_query_strings') === FALSE) {
 			$suffix = isset($this->config['url_suffix']) ? $this->config['url_suffix'] : '';
 
 			if ($suffix !== '')
@@ -282,8 +282,8 @@ public function site_url($uri = '', $protocol = NULL)
 
 			return $base_url.$this->slash_item('index_page').$uri;
 		}
-		elseif (strpos($uri, '?') === FALSE)
-		{
+
+		if (strpos($uri, '?') === FALSE) {
 			$uri = '?'.$uri;
 		}
 
@@ -336,13 +336,12 @@ public function base_url($uri = '', $protocol = NULL)
 	 */
 	protected function _uri_string($uri)
 	{
-		if ($this->item('enable_query_strings') === FALSE)
-		{
+		if ($this->item('enable_query_strings') === FALSE) {
 			is_array($uri) && $uri = implode('/', $uri);
 			return ltrim($uri, '/');
 		}
-		elseif (is_array($uri))
-		{
+
+		if (is_array($uri)) {
 			return http_build_query($uri);
 		}
 

system/core/Exceptions.php

@@ -100,6 +100,7 @@ public function __construct()
 	 * @param	int	$line		Line number
 	 * @return	void
 	 */
+	#[\ReturnTypeWillChange]
 	public function log_exception($severity, $message, $filepath, $line)
 	{
 		$severity = isset($this->levels[$severity]) ? $this->levels[$severity] : $severity;

system/core/Input.php

@@ -928,7 +928,8 @@ public function __get($name)
 			isset($this->_raw_input_stream) OR $this->_raw_input_stream = file_get_contents('php://input');
 			return $this->_raw_input_stream;
 		}
-		elseif ($name === 'ip_address')
+
+		if ($name === 'ip_address')
 		{
 			return $this->ip_address;
 		}