Merge pull request #3803 from paulbalandan/elseif

Use elseif instead of else if

Author: MGatner

system/CodeIgniter.php

@@ -991,7 +991,7 @@ protected function display404errors(PageNotFoundException $e)
 			{
 				echo $override($e->getMessage());
 			}
-			else if (is_array($override))
+			elseif (is_array($override))
 			{
 				$this->benchmark->start('controller');
 				$this->benchmark->start('controller_constructor');

system/Database/Query.php

@@ -480,7 +480,7 @@ protected function matchSimpleBinds(string $sql, array $binds, int $bindCount, i
 			}
 		}
 		// Number of binds must match bindMarkers in the string.
-		else if (($c = preg_match_all('/' . preg_quote($this->bindMarker, '/') . '/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bindCount)
+		elseif (($c = preg_match_all('/' . preg_quote($this->bindMarker, '/') . '/i', $sql, $matches, PREG_OFFSET_CAPTURE)) !== $bindCount)
 		{
 			return $sql;
 		}

system/Entity.php

@@ -330,7 +330,7 @@ public function __get(string $key)
 
 		// Otherwise return the protected property
 		// if it exists.
-		else if (array_key_exists($key, $this->attributes))
+		elseif (array_key_exists($key, $this->attributes))
 		{
 			$result = $this->attributes[$key];
 		}
@@ -341,7 +341,7 @@ public function __get(string $key)
 			$result = $this->mutateDate($result);
 		}
 		// Or cast it as something?
-		else if ($this->_cast && ! empty($this->casts[$key]))
+		elseif ($this->_cast && ! empty($this->casts[$key]))
 		{
 			$result = $this->castAs($result, $this->casts[$key]);
 		}

system/HTTP/CURLRequest.php

@@ -557,7 +557,7 @@ protected function applyMethod(string $method, array $curlOptions): array
 				$this->setHeader('Content-Length', '0');
 			}
 		}
-		else if ($method === 'HEAD')
+		elseif ($method === 'HEAD')
 		{
 			$curlOptions[CURLOPT_NOBODY] = 1;
 		}
@@ -603,7 +603,7 @@ protected function setResponseHeaders(array $headers = [])
 
 				$this->response->setHeader($title, $value);
 			}
-			else if (strpos($header, 'HTTP') === 0)
+			elseif (strpos($header, 'HTTP') === 0)
 			{
 				preg_match('#^HTTP\/([12](?:\.[01])?) ([0-9]+) (.+)#', $header, $matches);
 
@@ -681,7 +681,7 @@ protected function setCURLOptions(array $curlOptions = [], array $config = [])
 				$curlOptions[CURLOPT_CAINFO]         = $file;
 				$curlOptions[CURLOPT_SSL_VERIFYPEER] = 1;
 			}
-			else if (is_bool($config['verify']))
+			elseif (is_bool($config['verify']))
 			{
 				$curlOptions[CURLOPT_SSL_VERIFYPEER] = $config['verify'];
 			}
@@ -789,7 +789,7 @@ protected function setCURLOptions(array $curlOptions = [], array $config = [])
 			{
 				$curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
 			}
-			else if ($config['version'] === 1.1)
+			elseif ($config['version'] === 1.1)
 			{
 				$curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_1;
 			}

system/HTTP/Header.php

@@ -221,12 +221,12 @@ public function getValueLine(): string
 			{
 				$options[] = $key . '=' . $value;
 			}
-			else if (is_array($value))
+			elseif (is_array($value))
 			{
 				$key       = key($value);
 				$options[] = $key . '=' . $value[$key];
 			}
-			else if (is_numeric($key))
+			elseif (is_numeric($key))
 			{
 				$options[] = $value;
 			}

system/HTTP/URI.php

@@ -1214,7 +1214,7 @@ public function removeDotSegments(string $path): string
 			{
 				array_pop($output);
 			}
-			else if ($segment !== '.' && $segment !== '')
+			elseif ($segment !== '.' && $segment !== '')
 			{
 				array_push($output, $segment);
 			}

system/Helpers/number_helper.php

@@ -157,17 +157,17 @@ function number_to_amount($num, int $precision = 0, string $locale = null)
 			$suffix = lang('Number.trillion', [], $generalLocale);
 			$num    = round(($num / 1000000000000), $precision);
 		}
-		else if ($num > 1000000000)
+		elseif ($num > 1000000000)
 		{
 			$suffix = lang('Number.billion', [], $generalLocale);
 			$num    = round(($num / 1000000000), $precision);
 		}
-		else if ($num > 1000000)
+		elseif ($num > 1000000)
 		{
 			$suffix = lang('Number.million', [], $generalLocale);
 			$num    = round(($num / 1000000), $precision);
 		}
-		else if ($num > 1000)
+		elseif ($num > 1000)
 		{
 			$suffix = lang('Number.thousand', [], $generalLocale);
 			$num    = round(($num / 1000), $precision);

system/Router/RouteCollection.php

@@ -1404,7 +1404,7 @@ protected function create(string $verb, string $from, $to, array $options = null
 		}
 
 		// Limiting to subdomains?
-		else if (! empty($options['subdomain']))
+		elseif (! empty($options['subdomain']))
 		{
 			// If we don't match the current subdomain, then
 			// we don't need to add the route.

system/Test/DOMParser.php

@@ -267,14 +267,14 @@ protected function doXPath(string $search = null, string $element, array $paths
 				: "//body//{$selector['tag']}[@id=\"{$selector['id']}\"]";
 		}
 		// By Class
-		else if (! empty($selector['class']))
+		elseif (! empty($selector['class']))
 		{
 			$path = empty($selector['tag'])
 				? "//*[@class=\"{$selector['class']}\"]"
 				: "//body//{$selector['tag']}[@class=\"{$selector['class']}\"]";
 		}
 		// By tag only
-		else if (! empty($selector['tag']))
+		elseif (! empty($selector['tag']))
 		{
 			$path = "//body//{$selector['tag']}";
 		}

system/View/Parser.php

@@ -385,7 +385,7 @@ protected function parsePair(string $variable, array $data, string $template): a
 					$row = $row->toArray();
 				}
 				// Otherwise, cast as an array and it will grab public properties.
-				else if (is_object($row))
+				elseif (is_object($row))
 				{
 					$row = (array)$row;
 				}
@@ -409,11 +409,12 @@ protected function parsePair(string $variable, array $data, string $template): a
 
 						continue;
 					}
+
 					if (is_object($val))
 					{
 						$val = 'Class: ' . get_class($val);
 					}
-					else if (is_resource($val))
+					elseif (is_resource($val))
 					{
 						$val = 'Resource';
 					}
@@ -858,7 +859,7 @@ protected function objectToArray($value)
 			$value = $value->toArray();
 		}
 		// Otherwise, cast as an array and it will grab public properties.
-		else if (is_object($value))
+		elseif (is_object($value))
 		{
 			$value = (array)$value;
 		}