6 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/phpbb/auth/provider_collection.php b/phpBB/phpbb/auth/provider_collection.php
index 27a3f24564..fe32a34e12 100644
--- a/phpBB/phpbb/auth/provider_collection.php
+++ b/phpBB/phpbb/auth/provider_collection.php
@@ -53,7 +53,7 @@ class provider_collection extends \phpbb\di\service_collection
 			return $this->offsetGet('auth.provider.' . basename(trim($this->config['auth_method'])));
 		}
 		// Revert to db auth provider if selected method does not exist
-		elseif ($this->offsetExists('auth.provider.db'))
+		else if ($this->offsetExists('auth.provider.db'))
 		{
 			return $this->offsetGet('auth.provider.db');
 		}
diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php
index 7f77db5949..c43004f340 100644
--- a/phpBB/phpbb/avatar/driver/upload.php
+++ b/phpBB/phpbb/avatar/driver/upload.php
@@ -72,7 +72,7 @@ class upload extends \phpbb\avatar\driver\driver
 		{
 			$file = $upload->form_upload('avatar_upload_file');
 		}
-		elseif (!empty($this->config['allow_avatar_remote_upload']) && !empty($url))
+		else if (!empty($this->config['allow_avatar_remote_upload']) && !empty($url))
 		{
 			if (!preg_match('#^(http|https|ftp)://#i', $url))
 			{
diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php
index 03b7b1ea82..b32af32d25 100644
--- a/phpBB/phpbb/cache/driver/file.php
+++ b/phpBB/phpbb/cache/driver/file.php
@@ -224,7 +224,7 @@ class file extends \phpbb\cache\driver\base
 			{
 				$this->remove_dir($fileInfo->getPathname());
 			}
-			elseif (strpos($filename, 'container_') === 0 ||
+			else if (strpos($filename, 'container_') === 0 ||
 				strpos($filename, 'url_matcher') === 0 ||
 				strpos($filename, 'sql_') === 0 ||
 				strpos($filename, 'data_') === 0)
diff --git a/phpBB/phpbb/console/command/config/get.php b/phpBB/phpbb/console/command/config/get.php
index 20164f0da1..ee8c65110e 100644
--- a/phpBB/phpbb/console/command/config/get.php
+++ b/phpBB/phpbb/console/command/config/get.php
@@ -60,7 +60,7 @@ class get extends command
 		{
 			$output->write($this->config[$key]);
 		}
-		elseif (isset($this->config[$key]))
+		else if (isset($this->config[$key]))
 		{
 			$output->writeln($this->config[$key]);
 		}
diff --git a/phpBB/phpbb/passwords/helper.php b/phpBB/phpbb/passwords/helper.php
index c6c5fb6d02..c2a49202cd 100644
--- a/phpBB/phpbb/passwords/helper.php
+++ b/phpBB/phpbb/passwords/helper.php
@@ -60,7 +60,7 @@ class helper
 			$data[$type] .= ($data[$type] !== '$') ? '\\' : '';
 			$data[$type] .= str_replace('$', '', $value);
 		}
-		elseif ($type == 'settings')
+		else if ($type == 'settings')
 		{
 			$data[$type] .= ($data[$type] !== '$') ? '$' : '';
 			$data[$type] .= $value;
diff --git a/phpBB/phpbb/search/fulltext_postgres.php b/phpBB/phpbb/search/fulltext_postgres.php
index 49d528c8ba..bdb5a86009 100644
--- a/phpBB/phpbb/search/fulltext_postgres.php
+++ b/phpBB/phpbb/search/fulltext_postgres.php
@@ -263,12 +263,12 @@ class fulltext_postgres extends \phpbb\search\base
 					$this->search_query .= $word . ' ';
 					$this->tsearch_query .= '&' . substr($word, 1) . ' ';
 				}
-				elseif (strpos($word, '-') === 0)
+				else if (strpos($word, '-') === 0)
 				{
 					$this->search_query .= $word . ' ';
 					$this->tsearch_query .= '&!' . substr($word, 1) . ' ';
 				}
-				elseif (strpos($word, '|') === 0)
+				else if (strpos($word, '|') === 0)
 				{
 					$this->search_query .= $word . ' ';
 					$this->tsearch_query .= '|' . substr($word, 1) . ' ';