From 033aa88b1bb55ade862fc3162d2f249f854fbe06 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 18:53:23 +0300
Subject: [PATCH 01/43] Fixed callable call in loop termination condition

---
 libraries/cms/schema/changeitem/postgresql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/cms/schema/changeitem/postgresql.php b/libraries/cms/schema/changeitem/postgresql.php
index a4a8f4d68db85..0ad55207beafc 100644
--- a/libraries/cms/schema/changeitem/postgresql.php
+++ b/libraries/cms/schema/changeitem/postgresql.php
@@ -86,7 +86,7 @@ protected function buildCheckQuery()
 				{
 					$type = '';
 
-					for ($i = 7; $i < count($wordArray); $i++)
+					for ($i = 7, $iMax = count($wordArray); $i < $iMax; $i++)
 					{
 						$type .= $wordArray[$i] . ' ';
 					}

From a650515773ca792f48bb7629ebd91cc0b159c913 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 18:54:25 +0300
Subject: [PATCH 02/43] Fixed non-optimal regular expression

---
 libraries/cms/component/router/legacy.php | 2 +-
 libraries/cms/router/router.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/cms/component/router/legacy.php b/libraries/cms/component/router/legacy.php
index fd8a431d559eb..8c8d674f90054 100644
--- a/libraries/cms/component/router/legacy.php
+++ b/libraries/cms/component/router/legacy.php
@@ -98,7 +98,7 @@ public function parse(&$segments)
 
 			for ($i = 0; $i < $total; $i++)
 			{
-				$segments[$i] = preg_replace('/-/', ':', $segments[$i], 1);
+				$segments[$i] = str_replace('-', ':', $segments[$i]);
 			}
 
 			return $function($segments);
diff --git a/libraries/cms/router/router.php b/libraries/cms/router/router.php
index 640e42a47ed04..a6f760b4cfe72 100644
--- a/libraries/cms/router/router.php
+++ b/libraries/cms/router/router.php
@@ -774,7 +774,7 @@ protected function decodeSegments($segments)
 
 		for ($i = 0; $i < $total; $i++)
 		{
-			$segments[$i] = preg_replace('/-/', ':', $segments[$i], 1);
+			$segments[$i] = str_replace('-', ':', $segments[$i]);
 		}
 
 		return $segments;

From a33ad89c9534e7ca34c3f9b27cdf4de042054142 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 18:56:02 +0300
Subject: [PATCH 03/43] Shortened syntax for applied operations

---
 libraries/cms/form/field/captcha.php | 2 +-
 libraries/cms/html/number.php        | 2 +-
 libraries/cms/router/site.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/cms/form/field/captcha.php b/libraries/cms/form/field/captcha.php
index 67e5e1cb31576..4cd4fe9aed8ea 100644
--- a/libraries/cms/form/field/captcha.php
+++ b/libraries/cms/form/field/captcha.php
@@ -111,7 +111,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 
 			if (strpos($this->class, 'required') === false)
 			{
-				$this->class = $this->class . ' required';
+				$this->class .= ' required';
 			}
 		}
 
diff --git a/libraries/cms/html/number.php b/libraries/cms/html/number.php
index cfa1cbe176ce3..24c3b8a3afd72 100644
--- a/libraries/cms/html/number.php
+++ b/libraries/cms/html/number.php
@@ -58,7 +58,7 @@ public static function bytes($bytes, $unit = 'auto', $precision = 2, $iec = fals
 			{
 				$oBase  = $iec && strpos($oUnit, 'i') === false ? 1000 : 1024;
 				$factor = pow($oBase, stripos('BKMGTPEZY', $oUnit[0]));
-				$oBytes = $oBytes * $factor;
+				$oBytes *= $factor;
 			}
 		}
 
diff --git a/libraries/cms/router/site.php b/libraries/cms/router/site.php
index 151284970a083..5b257dc7f6b01 100644
--- a/libraries/cms/router/site.php
+++ b/libraries/cms/router/site.php
@@ -231,7 +231,7 @@ protected function parseRawRoute(&$uri)
 
 			if ($item !== null && is_array($item->query))
 			{
-				$vars = $vars + $item->query;
+				$vars += $item->query;
 			}
 		}
 

From 4173a7ffe1170422efaf61976c001b65d58d12ee Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 19:15:30 +0300
Subject: [PATCH 04/43] Don't use strlen() to check if string is empty.

---
 libraries/cms/application/cms.php            | 2 +-
 libraries/cms/helper/media.php               | 4 ++--
 libraries/cms/html/string.php                | 2 +-
 libraries/cms/installer/adapter/library.php  | 2 +-
 libraries/cms/installer/adapter/module.php   | 2 +-
 libraries/cms/installer/adapter/template.php | 2 +-
 libraries/cms/installer/installer.php        | 4 ++--
 libraries/cms/installer/manifest.php         | 2 +-
 libraries/cms/toolbar/button/popup.php       | 4 ++--
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libraries/cms/application/cms.php b/libraries/cms/application/cms.php
index 4574077ff0c68..35e9c4a3b94c4 100644
--- a/libraries/cms/application/cms.php
+++ b/libraries/cms/application/cms.php
@@ -231,7 +231,7 @@ public function checkSession()
 	public function enqueueMessage($msg, $type = 'message')
 	{
 		// Don't add empty messages.
-		if (!strlen(trim($msg)))
+		if (trim($msg) === '')
 		{
 			return;
 		}
diff --git a/libraries/cms/helper/media.php b/libraries/cms/helper/media.php
index ff48d93771d79..b56c16d031b3e 100644
--- a/libraries/cms/helper/media.php
+++ b/libraries/cms/helper/media.php
@@ -160,7 +160,7 @@ public function canUpload($file, $component = 'com_media')
 					$finfo = finfo_open(FILEINFO_MIME);
 					$type  = finfo_file($finfo, $file['tmp_name']);
 
-					if (strlen($type) && !in_array($type, $allowed_mime) && in_array($type, $illegal_mime))
+					if ($type !== '' && !in_array($type, $allowed_mime) && in_array($type, $illegal_mime))
 					{
 						$app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_MIME'), 'notice');
 
@@ -174,7 +174,7 @@ public function canUpload($file, $component = 'com_media')
 					// We have mime magic.
 					$type = mime_content_type($file['tmp_name']);
 
-					if (strlen($type) && !in_array($type, $allowed_mime) && in_array($type, $illegal_mime))
+					if ($type !== '' && !in_array($type, $allowed_mime) && in_array($type, $illegal_mime))
 					{
 						$app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_MIME'), 'notice');
 
diff --git a/libraries/cms/html/string.php b/libraries/cms/html/string.php
index 8b60a81d54040..cfb536152fe5e 100644
--- a/libraries/cms/html/string.php
+++ b/libraries/cms/html/string.php
@@ -197,7 +197,7 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
 		$ptString = JHtml::_('string.truncate', $html, $maxLength, $noSplit, $allowHtml = false);
 
 		// It's all HTML, just return it.
-		if (strlen($ptString) == 0)
+		if ($ptString === '')
 		{
 				return $html;
 		}
diff --git a/libraries/cms/installer/adapter/library.php b/libraries/cms/installer/adapter/library.php
index a124903438c03..098879f05cd4d 100644
--- a/libraries/cms/installer/adapter/library.php
+++ b/libraries/cms/installer/adapter/library.php
@@ -362,7 +362,7 @@ public function uninstall($id)
 		// This should give us the necessary information to proceed.
 		$row = JTable::getInstance('extension');
 
-		if (!$row->load((int) $id) || !strlen($row->element))
+		if (!$row->load((int) $id) || $row->element === '')
 		{
 			JLog::add(JText::_('ERRORUNKOWNEXTENSION'), JLog::WARNING, 'jerror');
 
diff --git a/libraries/cms/installer/adapter/module.php b/libraries/cms/installer/adapter/module.php
index ecf8a08f9b9bb..acbb0679ce763 100644
--- a/libraries/cms/installer/adapter/module.php
+++ b/libraries/cms/installer/adapter/module.php
@@ -517,7 +517,7 @@ public function uninstall($id)
 
 		// First order of business will be to load the module object table from the database.
 		// This should give us the necessary information to proceed.
-		if (!$this->extension->load((int) $id) || !strlen($this->extension->element))
+		if (!$this->extension->load((int) $id) || $this->extension->element === '')
 		{
 			JLog::add(JText::_('JLIB_INSTALLER_ERROR_MOD_UNINSTALL_ERRORUNKOWNEXTENSION'), JLog::WARNING, 'jerror');
 
diff --git a/libraries/cms/installer/adapter/template.php b/libraries/cms/installer/adapter/template.php
index b24ae7431e092..de65c247f56e6 100644
--- a/libraries/cms/installer/adapter/template.php
+++ b/libraries/cms/installer/adapter/template.php
@@ -409,7 +409,7 @@ public function uninstall($id)
 		// This should give us the necessary information to proceed.
 		$row = JTable::getInstance('extension');
 
-		if (!$row->load((int) $id) || !strlen($row->element))
+		if (!$row->load((int) $id) || $row->element === '')
 		{
 			JLog::add(JText::_('JLIB_INSTALLER_ERROR_TPL_UNINSTALL_ERRORUNKOWNEXTENSION'), JLog::WARNING, 'jerror');
 
diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
index 30f53423dc723..d27f771f7d416 100644
--- a/libraries/cms/installer/installer.php
+++ b/libraries/cms/installer/installer.php
@@ -1027,7 +1027,7 @@ public function setSchemaVersion(SimpleXMLElement $schema, $eid)
 					}
 				}
 
-				if (strlen($schemapath))
+				if ($schemapath !== '')
 				{
 					$files = str_replace('.sql', '', JFolder::files($this->getPath('extension_root') . '/' . $schemapath, '\.sql$'));
 					usort($files, 'version_compare');
@@ -1102,7 +1102,7 @@ public function parseSchemaUpdates(SimpleXMLElement $schema, $eid)
 					}
 				}
 
-				if (strlen($schemapath))
+				if ($schemapath !== '')
 				{
 					$files = str_replace('.sql', '', JFolder::files($this->getPath('extension_root') . '/' . $schemapath, '\.sql$'));
 					usort($files, 'version_compare');
diff --git a/libraries/cms/installer/manifest.php b/libraries/cms/installer/manifest.php
index 548d55d21f9d6..2f52a83dc2202 100644
--- a/libraries/cms/installer/manifest.php
+++ b/libraries/cms/installer/manifest.php
@@ -91,7 +91,7 @@ abstract class JInstallerManifest
 	 */
 	public function __construct($xmlpath = '')
 	{
-		if (strlen($xmlpath))
+		if ($xmlpath !== '')
 		{
 			$this->loadManifestFromXml($xmlpath);
 		}
diff --git a/libraries/cms/toolbar/button/popup.php b/libraries/cms/toolbar/button/popup.php
index 4a16183dada94..4c8327153be7a 100644
--- a/libraries/cms/toolbar/button/popup.php
+++ b/libraries/cms/toolbar/button/popup.php
@@ -46,7 +46,7 @@ public function fetchButton($type = 'Modal', $name = '', $text = '', $url = '',
 		$onClose = '', $title = '', $footer = null)
 	{
 		// If no $title is set, use the $text element
-		if (strlen($title) == 0)
+		if ($title === '')
 		{
 			$title = $text;
 		}
@@ -83,7 +83,7 @@ public function fetchButton($type = 'Modal', $name = '', $text = '', $url = '',
 		$html[] = JHtml::_('bootstrap.renderModal', 'modal-' . $name, $params);
 
 		// If an $onClose event is passed, add it to the modal JS object
-		if (strlen($onClose) >= 1)
+		if ($onClose !== '')
 		{
 			$html[] = '<script>'
 				. 'jQuery(\'#modal-' . $name . '\').on(\'hide\', function () {' . $onClose . ';});'

From 186f9750e39627b08950219b66bd05470fde1474 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 19:42:52 +0300
Subject: [PATCH 05/43] Reverted preg changes. Look into those later again.

---
 libraries/cms/component/router/legacy.php | 2 +-
 libraries/cms/router/router.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/cms/component/router/legacy.php b/libraries/cms/component/router/legacy.php
index 8c8d674f90054..fd8a431d559eb 100644
--- a/libraries/cms/component/router/legacy.php
+++ b/libraries/cms/component/router/legacy.php
@@ -98,7 +98,7 @@ public function parse(&$segments)
 
 			for ($i = 0; $i < $total; $i++)
 			{
-				$segments[$i] = str_replace('-', ':', $segments[$i]);
+				$segments[$i] = preg_replace('/-/', ':', $segments[$i], 1);
 			}
 
 			return $function($segments);
diff --git a/libraries/cms/router/router.php b/libraries/cms/router/router.php
index a6f760b4cfe72..640e42a47ed04 100644
--- a/libraries/cms/router/router.php
+++ b/libraries/cms/router/router.php
@@ -774,7 +774,7 @@ protected function decodeSegments($segments)
 
 		for ($i = 0; $i < $total; $i++)
 		{
-			$segments[$i] = str_replace('-', ':', $segments[$i]);
+			$segments[$i] = preg_replace('/-/', ':', $segments[$i], 1);
 		}
 
 		return $segments;

From 19eb362ed08e8fa991970bc02ee0d13dabad905d Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 20:16:38 +0300
Subject: [PATCH 06/43] Replaced call_user_func_array() with call_user_func()

---
 libraries/cms/router/router.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/cms/router/router.php b/libraries/cms/router/router.php
index 640e42a47ed04..19899eb0b1fa7 100644
--- a/libraries/cms/router/router.php
+++ b/libraries/cms/router/router.php
@@ -635,7 +635,7 @@ protected function processBuildRules(&$uri, $stage = self::PROCESS_DURING)
 
 		foreach ($this->_rules['build' . $stage] as $rule)
 		{
-			call_user_func_array($rule, array(&$this, &$uri));
+			call_user_func($rule, &$this, &$uri);
 		}
 	}
 

From f9cb3fe371c855fa62cf101cac308890500b293c Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 20:19:07 +0300
Subject: [PATCH 07/43] Merge unset() calls

---
 libraries/cms/menu/site.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libraries/cms/menu/site.php b/libraries/cms/menu/site.php
index 1e464dd73b964..0e77a1065516d 100644
--- a/libraries/cms/menu/site.php
+++ b/libraries/cms/menu/site.php
@@ -145,8 +145,7 @@ public function getItems($attributes, $values, $firstonly = false)
 			}
 			elseif ($values[$key] === null)
 			{
-				unset($attributes[$key]);
-				unset($values[$key]);
+				unset($attributes[$key], $values[$key]);
 			}
 
 			// Filter by access level if not set
@@ -157,8 +156,7 @@ public function getItems($attributes, $values, $firstonly = false)
 			}
 			elseif ($values[$key] === null)
 			{
-				unset($attributes[$key]);
-				unset($values[$key]);
+				unset($attributes[$key], $values[$key]);
 			}
 		}
 

From d30d1d763d00d8a2bd1dfed28ed815adc65bcb8a Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 20:19:55 +0300
Subject: [PATCH 08/43] Replaced old intval() call with modern typecasting

---
 libraries/cms/search/helper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/cms/search/helper.php b/libraries/cms/search/helper.php
index 27efcbaeb64a4..85d608cdcc849 100644
--- a/libraries/cms/search/helper.php
+++ b/libraries/cms/search/helper.php
@@ -43,7 +43,7 @@ public static function logSearch($term, $component)
 				->from($db->quoteName('#__core_log_searches'))
 				->where($db->quoteName('search_term') . ' = ' . $db->quote($search_term));
 			$db->setQuery($query);
-			$hits = intval($db->loadResult());
+			$hits = (int) ($db->loadResult());
 
 			// Reset the $query object
 			$query->clear();

From 0d1f128f37e955ea6513b4c25b6cf19d34b6716b Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 20:24:21 +0300
Subject: [PATCH 09/43] Optimize away substr() as index-based access

---
 libraries/cms/helper/media.php  | 4 ++--
 libraries/cms/html/string.php   | 8 ++++----
 libraries/cms/router/router.php | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/cms/helper/media.php b/libraries/cms/helper/media.php
index ff48d93771d79..0e1b94be79301 100644
--- a/libraries/cms/helper/media.php
+++ b/libraries/cms/helper/media.php
@@ -271,13 +271,13 @@ public function countFiles($dir)
 
 			while (false !== ($entry = $d->read()))
 			{
-				if (substr($entry, 0, 1) != '.' && is_file($dir . DIRECTORY_SEPARATOR . $entry)
+				if ($entry[0] !== '.' && is_file($dir . DIRECTORY_SEPARATOR . $entry)
 					&& strpos($entry, '.html') === false && strpos($entry, '.php') === false)
 				{
 					$total_file++;
 				}
 
-				if (substr($entry, 0, 1) != '.' && is_dir($dir . DIRECTORY_SEPARATOR . $entry))
+				if ($entry[0] !== '.' && is_dir($dir . DIRECTORY_SEPARATOR . $entry))
 				{
 					$total_dir++;
 				}
diff --git a/libraries/cms/html/string.php b/libraries/cms/html/string.php
index 8b60a81d54040..0060c2b552c36 100644
--- a/libraries/cms/html/string.php
+++ b/libraries/cms/html/string.php
@@ -34,7 +34,7 @@ abstract class JHtmlString
 	public static function truncate($text, $length = 0, $noSplit = true, $allowHtml = true)
 	{
 		// Assume a lone open tag is invalid HTML.
-		if ($length == 1 && substr($text, 0, 1) == '<')
+		if ($length == 1 && $text[0] === '<')
 		{
 			return '...';
 		}
@@ -61,7 +61,7 @@ public static function truncate($text, $length = 0, $noSplit = true, $allowHtml
 		{
 			$tmp = trim(JString::substr($text, 0, $length));
 
-			if (substr($tmp, 0, 1) == '<' && strpos($tmp, '>') === false)
+			if ($tmp[0] === '<' && strpos($tmp, '>') === false)
 			{
 				return '...';
 			}
@@ -169,13 +169,13 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
 		}
 
 		// Take care of short simple cases.
-		if ($maxLength <= 3 && substr($html, 0, 1) != '<' && strpos(substr($html, 0, $maxLength - 1), '<') === false && $baseLength > $maxLength)
+		if ($maxLength <= 3 && $html[0] !== '<' && strpos(substr($html, 0, $maxLength - 1), '<') === false && $baseLength > $maxLength)
 		{
 			return '...';
 		}
 
 		// Deal with maximum length of 1 where the string starts with a tag.
-		if ($maxLength == 1 && substr($html, 0, 1) == '<')
+		if ($maxLength == 1 && $html[0] === '<')
 		{
 			$endTagPos = strlen(strstr($html, '>', true));
 			$tag = substr($html, 1, $endTagPos);
diff --git a/libraries/cms/router/router.php b/libraries/cms/router/router.php
index 19899eb0b1fa7..b18017c3cc947 100644
--- a/libraries/cms/router/router.php
+++ b/libraries/cms/router/router.php
@@ -666,7 +666,7 @@ protected function _createUri($url)
 	 */
 	protected function createUri($url)
 	{
-		if (!is_array($url) && substr($url, 0, 1) != '&')
+		if (!is_array($url) && $url[0] !== '&')
 		{
 			return new JUri($url);
 		}

From d30fe285b53a12c1928802c47ae6c32304273016 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 20:49:52 +0300
Subject: [PATCH 10/43] Replace some cases of substr() with strpos()

---
 libraries/cms/installer/adapter/component.php  | 2 +-
 libraries/cms/module/helper.php                | 2 +-
 libraries/cms/schema/changeitem/mysql.php      | 7 ++++---
 libraries/cms/schema/changeitem/postgresql.php | 2 +-
 libraries/cms/schema/changeitem/sqlsrv.php     | 2 +-
 libraries/cms/toolbar/button/popup.php         | 2 +-
 libraries/cms/toolbar/button/slider.php        | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/libraries/cms/installer/adapter/component.php b/libraries/cms/installer/adapter/component.php
index 83e42a6d135bb..ca8dda87b8692 100644
--- a/libraries/cms/installer/adapter/component.php
+++ b/libraries/cms/installer/adapter/component.php
@@ -356,7 +356,7 @@ public function getElement($element = null)
 	{
 		$element = parent::getElement($element);
 
-		if (substr($element, 0, 4) != 'com_')
+		if (0 !== strpos($element, 'com_'))
 		{
 			$element = 'com_' . $element;
 		}
diff --git a/libraries/cms/module/helper.php b/libraries/cms/module/helper.php
index cae0e273bd223..f54a679c4a163 100644
--- a/libraries/cms/module/helper.php
+++ b/libraries/cms/module/helper.php
@@ -50,7 +50,7 @@ public static function &getModule($name, $title = null)
 		}
 
 		// If we didn't find it, and the name is mod_something, create a dummy object
-		if (is_null($result) && substr($name, 0, 4) == 'mod_')
+		if (is_null($result) && 0 === strpos($name, 'mod_'))
 		{
 			$result            = new stdClass;
 			$result->id        = 0;
diff --git a/libraries/cms/schema/changeitem/mysql.php b/libraries/cms/schema/changeitem/mysql.php
index 349803d0246ae..895e749e1c59a 100644
--- a/libraries/cms/schema/changeitem/mysql.php
+++ b/libraries/cms/schema/changeitem/mysql.php
@@ -63,7 +63,8 @@ protected function buildCheckQuery()
 		if (($command == 'UPDATE `#__UTF8_CONVERSION`'
 			|| $command == 'UPDATE #__UTF8_CONVERSION')
 			&& strtoupper($wordArray[2]) == 'SET'
-			&& strtolower(substr(str_replace('`', '', $wordArray[3]), 0, 9)) == 'converted')
+			&& 0 === stripos(str_replace('`', '', $wordArray[3]), 'converted')
+		)
 		{
 			// Statement is special statement to reset conversion status
 			$this->queryType = 'UTF8CNV';
@@ -229,11 +230,11 @@ private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
 
-		if (strtolower($type1) == "integer" && strtolower(substr($type2, 0, 8)) == 'unsigned')
+		if (strtolower($type1) == "integer" && 0 === stripos($type2, 'unsigned'))
 		{
 			$result = 'int(10) unsigned';
 		}
-		elseif (strtolower(substr($type2, 0, 8)) == 'unsigned')
+		elseif (0 === stripos($type2, 'unsigned'))
 		{
 			$result = $type1 . ' unsigned';
 		}
diff --git a/libraries/cms/schema/changeitem/postgresql.php b/libraries/cms/schema/changeitem/postgresql.php
index 0ad55207beafc..9ddf03651bfbc 100644
--- a/libraries/cms/schema/changeitem/postgresql.php
+++ b/libraries/cms/schema/changeitem/postgresql.php
@@ -232,7 +232,7 @@ private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
 
-		if (strtolower($type1) == 'integer' && strtolower(substr($type2, 0, 8)) == 'unsigned')
+		if (strtolower($type1) == 'integer' && 0 === stripos($type2, 'unsigned'))
 		{
 			$result = 'unsigned int(10)';
 		}
diff --git a/libraries/cms/schema/changeitem/sqlsrv.php b/libraries/cms/schema/changeitem/sqlsrv.php
index 4acbead276015..1b31af04ec1d4 100644
--- a/libraries/cms/schema/changeitem/sqlsrv.php
+++ b/libraries/cms/schema/changeitem/sqlsrv.php
@@ -121,7 +121,7 @@ private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
 
-		if (strtolower($type1) == 'integer' && strtolower(substr($type2, 0, 8)) == 'unsigned')
+		if (strtolower($type1) == 'integer' && 0 === stripos($type2, 'unsigned'))
 		{
 			$result = 'int';
 		}
diff --git a/libraries/cms/toolbar/button/popup.php b/libraries/cms/toolbar/button/popup.php
index 4c8327153be7a..1b587b0dbb827 100644
--- a/libraries/cms/toolbar/button/popup.php
+++ b/libraries/cms/toolbar/button/popup.php
@@ -121,7 +121,7 @@ public function fetchId($type, $name)
 	 */
 	private function _getCommand($url)
 	{
-		if (substr($url, 0, 4) !== 'http')
+		if (0 !== strpos($url, 'http'))
 		{
 			$url = JUri::base() . $url;
 		}
diff --git a/libraries/cms/toolbar/button/slider.php b/libraries/cms/toolbar/button/slider.php
index 4377b2ca9f346..e32d44b243289 100644
--- a/libraries/cms/toolbar/button/slider.php
+++ b/libraries/cms/toolbar/button/slider.php
@@ -89,7 +89,7 @@ public function fetchId($type, $name)
 	 */
 	private function _getCommand($url)
 	{
-		if (substr($url, 0, 4) !== 'http')
+		if (0 !== strpos($url, 'http'))
 		{
 			$url = JUri::base() . $url;
 		}

From 5dfd4e9e04f71603c650d425eb56d07d8196f00d Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 20:52:03 +0300
Subject: [PATCH 11/43] Replace some stristr() with stripos()

---
 libraries/cms/helper/media.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/cms/helper/media.php b/libraries/cms/helper/media.php
index 0b1e68da37c2e..9a376ea035a3a 100644
--- a/libraries/cms/helper/media.php
+++ b/libraries/cms/helper/media.php
@@ -206,7 +206,7 @@ public function canUpload($file, $component = 'com_media')
 		foreach ($html_tags as $tag)
 		{
 			// A tag is '<tagname ', so we need to add < and a space or '<tagname>'
-			if (stristr($xss_check, '<' . $tag . ' ') || stristr($xss_check, '<' . $tag . '>'))
+			if (false !== stripos($xss_check, '<' . $tag . ' ') || false !== stripos($xss_check, '<' . $tag . '>'))
 			{
 				$app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNIEXSS'), 'notice');
 

From 4c1cfdd2080b31c3b9387f67a7f76293714f46cc Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 20:54:23 +0300
Subject: [PATCH 12/43] Replace is_null() with null === ...

---
 libraries/cms/application/cms.php      | 8 ++++----
 libraries/cms/application/helper.php   | 2 +-
 libraries/cms/captcha/captcha.php      | 4 ++--
 libraries/cms/editor/editor.php        | 8 ++++----
 libraries/cms/form/field/editor.php    | 2 +-
 libraries/cms/form/field/tag.php       | 2 +-
 libraries/cms/form/rule/notequals.php  | 2 +-
 libraries/cms/help/help.php            | 2 +-
 libraries/cms/helper/content.php       | 2 +-
 libraries/cms/helper/route.php         | 2 +-
 libraries/cms/html/access.php          | 2 +-
 libraries/cms/html/bootstrap.php       | 4 ++--
 libraries/cms/html/date.php            | 2 +-
 libraries/cms/html/html.php            | 2 +-
 libraries/cms/html/menu.php            | 4 ++--
 libraries/cms/installer/installer.php  | 4 ++--
 libraries/cms/layout/file.php          | 2 +-
 libraries/cms/module/helper.php        | 6 +++---
 libraries/cms/plugin/helper.php        | 2 +-
 libraries/cms/plugin/plugin.php        | 4 ++--
 libraries/cms/response/json.php        | 2 +-
 libraries/cms/router/site.php          | 2 +-
 libraries/cms/table/contenthistory.php | 6 +++---
 23 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/libraries/cms/application/cms.php b/libraries/cms/application/cms.php
index 35e9c4a3b94c4..8ddfd36a00021 100644
--- a/libraries/cms/application/cms.php
+++ b/libraries/cms/application/cms.php
@@ -114,13 +114,13 @@ public function __construct(JInput $input = null, Registry $config = null, JAppl
 		}
 
 		// Enable sessions by default.
-		if (is_null($this->config->get('session')))
+		if (null === $this->config->get('session'))
 		{
 			$this->config->set('session', true);
 		}
 
 		// Set the session default name.
-		if (is_null($this->config->get('session_name')))
+		if (null === $this->config->get('session_name'))
 		{
 			$this->config->set('session_name', $this->getName());
 		}
@@ -581,7 +581,7 @@ public function getUserState($key, $default = null)
 		$session = JFactory::getSession();
 		$registry = $session->get('registry');
 
-		if (!is_null($registry))
+		if (null !== $registry)
 		{
 			return $registry->get($key, $default);
 		}
@@ -1137,7 +1137,7 @@ public function setUserState($key, $value)
 		$session = JFactory::getSession();
 		$registry = $session->get('registry');
 
-		if (!is_null($registry))
+		if (null !== $registry)
 		{
 			return $registry->set($key, $value);
 		}
diff --git a/libraries/cms/application/helper.php b/libraries/cms/application/helper.php
index d9424be08b66e..5cf17ff97106f 100644
--- a/libraries/cms/application/helper.php
+++ b/libraries/cms/application/helper.php
@@ -141,7 +141,7 @@ public static function getClientInfo($id = null, $byName = false)
 		}
 
 		// If no client id has been passed return the whole array
-		if (is_null($id))
+		if (null === $id)
 		{
 			return self::$_clients;
 		}
diff --git a/libraries/cms/captcha/captcha.php b/libraries/cms/captcha/captcha.php
index d65fea304f730..93321be19d679 100644
--- a/libraries/cms/captcha/captcha.php
+++ b/libraries/cms/captcha/captcha.php
@@ -157,7 +157,7 @@ public function initialise($id)
 	public function display($name, $id, $class = '')
 	{
 		// Check if captcha is already loaded.
-		if (is_null($this->_captcha))
+		if (null === $this->_captcha)
 		{
 			return;
 		}
@@ -188,7 +188,7 @@ public function display($name, $id, $class = '')
 	public function checkAnswer($code)
 	{
 		// Check if captcha is already loaded
-		if (is_null(($this->_captcha)))
+		if (null === ($this->_captcha))
 		{
 			return;
 		}
diff --git a/libraries/cms/editor/editor.php b/libraries/cms/editor/editor.php
index 60a824f166dfe..b155a375713d0 100644
--- a/libraries/cms/editor/editor.php
+++ b/libraries/cms/editor/editor.php
@@ -240,7 +240,7 @@ public function detach($observer)
 	public function initialise()
 	{
 		// Check if editor is already loaded
-		if (is_null(($this->_editor)))
+		if (null === ($this->_editor))
 		{
 			return;
 		}
@@ -293,7 +293,7 @@ public function display($name, $html, $width, $height, $col, $row, $buttons = tr
 		$this->_loadEditor($params);
 
 		// Check whether editor is already loaded
-		if (is_null(($this->_editor)))
+		if (null === ($this->_editor))
 		{
 			JFactory::getApplication()->enqueueMessage(JText::_('JLIB_NO_EDITOR_PLUGIN_PUBLISHED'), 'error');
 
@@ -344,7 +344,7 @@ public function save($editor)
 		$this->_loadEditor();
 
 		// Check whether editor is already loaded
-		if (is_null(($this->_editor)))
+		if (null === ($this->_editor))
 		{
 			return;
 		}
@@ -508,7 +508,7 @@ public function getButtons($editor, $buttons = true)
 	protected function _loadEditor($config = array())
 	{
 		// Check whether editor is already loaded
-		if (!is_null(($this->_editor)))
+		if (null !== ($this->_editor))
 		{
 			return;
 		}
diff --git a/libraries/cms/form/field/editor.php b/libraries/cms/form/field/editor.php
index 1ca0da75434f4..1dba3aafcc279 100644
--- a/libraries/cms/form/field/editor.php
+++ b/libraries/cms/form/field/editor.php
@@ -296,7 +296,7 @@ protected function getEditor()
 			}
 
 			// Create the JEditor instance based on the given editor.
-			if (is_null($editor))
+			if (null === $editor)
 			{
 				$conf = JFactory::getConfig();
 				$editor = $conf->get('editor');
diff --git a/libraries/cms/form/field/tag.php b/libraries/cms/form/field/tag.php
index 4a79e6b7f9db7..4e7d6bca4b403 100644
--- a/libraries/cms/form/field/tag.php
+++ b/libraries/cms/form/field/tag.php
@@ -213,7 +213,7 @@ protected function prepareOptionsNested(&$options)
 	 */
 	public function isNested()
 	{
-		if (is_null($this->isNested))
+		if (null === $this->isNested)
 		{
 			// If mode="nested" || ( mode not set & config = nested )
 			if ((isset($this->element['mode']) && $this->element['mode'] == 'nested')
diff --git a/libraries/cms/form/rule/notequals.php b/libraries/cms/form/rule/notequals.php
index 5cb3d12017c8d..615461086028c 100644
--- a/libraries/cms/form/rule/notequals.php
+++ b/libraries/cms/form/rule/notequals.php
@@ -47,7 +47,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry
 			throw new UnexpectedValueException(sprintf('$field empty in %s::test', get_class($this)));
 		}
 
-		if (is_null($input))
+		if (null === $input)
 		{
 			throw new InvalidArgumentException(sprintf('The value for $input must not be null in %s', get_class($this)));
 		}
diff --git a/libraries/cms/help/help.php b/libraries/cms/help/help.php
index c5012b81229ca..4ddccbaaaf68e 100644
--- a/libraries/cms/help/help.php
+++ b/libraries/cms/help/help.php
@@ -33,7 +33,7 @@ public static function createUrl($ref, $useComponent = false, $override = null,
 		$local = false;
 		$app   = JFactory::getApplication();
 
-		if (is_null($component))
+		if (null === $component)
 		{
 			$component = JApplicationHelper::getComponentName();
 		}
diff --git a/libraries/cms/helper/content.php b/libraries/cms/helper/content.php
index 658aa5536f085..6eeae4670bf9b 100644
--- a/libraries/cms/helper/content.php
+++ b/libraries/cms/helper/content.php
@@ -93,7 +93,7 @@ public static function _getActions($categoryId = 0, $id = 0, $assetName = '')
 	public static function getActions($component = '', $section = '', $id = 0)
 	{
 		// Check for deprecated arguments order
-		if (is_int($component) || is_null($component))
+		if (is_int($component) || null === $component)
 		{
 			$result = self::_getActions($component, $section, $id);
 
diff --git a/libraries/cms/helper/route.php b/libraries/cms/helper/route.php
index 4df3e6750d0ba..71b8f280527ba 100644
--- a/libraries/cms/helper/route.php
+++ b/libraries/cms/helper/route.php
@@ -134,7 +134,7 @@ protected function findItem($needles = array())
 		$language = isset($needles['language']) ? $needles['language'] : '*';
 
 		// $this->extension may not be set if coming from a static method, check it
-		if (is_null($this->extension))
+		if (null === $this->extension)
 		{
 			$this->extension = $app->input->getCmd('option');
 		}
diff --git a/libraries/cms/html/access.php b/libraries/cms/html/access.php
index e8869dd0c5db8..300aba42efa3c 100644
--- a/libraries/cms/html/access.php
+++ b/libraries/cms/html/access.php
@@ -272,7 +272,7 @@ public static function assetgrouplist($name, $selected, $attribs = null, $config
 			$name,
 			array(
 				'id' => isset($config['id']) ? $config['id'] : 'assetgroups_' . (++$count),
-				'list.attr' => (is_null($attribs) ? 'class="inputbox" size="3"' : $attribs),
+				'list.attr' => (null === $attribs ? 'class="inputbox" size="3"' : $attribs),
 				'list.select' => (int) $selected,
 			)
 		);
diff --git a/libraries/cms/html/bootstrap.php b/libraries/cms/html/bootstrap.php
index f88a106aede7c..33dd06da80937 100644
--- a/libraries/cms/html/bootstrap.php
+++ b/libraries/cms/html/bootstrap.php
@@ -763,8 +763,8 @@ public static function addTab($selector, $id, $title)
 		static $tabScriptLayout = null;
 		static $tabLayout = null;
 
-		$tabScriptLayout = is_null($tabScriptLayout) ? new JLayoutFile('libraries.cms.html.bootstrap.addtabscript') : $tabScriptLayout;
-		$tabLayout = is_null($tabLayout) ? new JLayoutFile('libraries.cms.html.bootstrap.addtab') : $tabLayout;
+		$tabScriptLayout = null === $tabScriptLayout ? new JLayoutFile('libraries.cms.html.bootstrap.addtabscript') : $tabScriptLayout;
+		$tabLayout = null === $tabLayout ? new JLayoutFile('libraries.cms.html.bootstrap.addtab') : $tabLayout;
 
 		$active = (static::$loaded['JHtmlBootstrap::startTabSet'][$selector]['active'] == $id) ? ' active' : '';
 
diff --git a/libraries/cms/html/date.php b/libraries/cms/html/date.php
index 43bfe62db25c9..14a0c60d2ba9e 100644
--- a/libraries/cms/html/date.php
+++ b/libraries/cms/html/date.php
@@ -30,7 +30,7 @@ abstract class JHtmlDate
 	 */
 	public static function relative($date, $unit = null, $time = null)
 	{
-		if (is_null($time))
+		if (null === $time)
 		{
 			// Get now
 			$time = new JDate('now');
diff --git a/libraries/cms/html/html.php b/libraries/cms/html/html.php
index c21829e4e41c2..edda3c78cb13a 100644
--- a/libraries/cms/html/html.php
+++ b/libraries/cms/html/html.php
@@ -1074,7 +1074,7 @@ public static function getJSObject(array $array = array())
 		foreach ($array as $k => $v)
 		{
 			// Don't encode either of these types
-			if (is_null($v) || is_resource($v))
+			if (null === $v || is_resource($v))
 			{
 				continue;
 			}
diff --git a/libraries/cms/html/menu.php b/libraries/cms/html/menu.php
index d1f4a6d24e30c..b0621e929c3e9 100644
--- a/libraries/cms/html/menu.php
+++ b/libraries/cms/html/menu.php
@@ -41,7 +41,7 @@ abstract class JHtmlMenu
 	 */
 	public static function menus()
 	{
-		if (is_null(static::$menus))
+		if (null === static::$menus)
 		{
 			$db = JFactory::getDbo();
 
@@ -174,7 +174,7 @@ public static function menuitemlist($name, $selected = null, $attribs = null, $c
 			'select.genericlist', $options, $name,
 			array(
 				'id' => isset($config['id']) ? $config['id'] : 'assetgroups_' . (++$count),
-				'list.attr' => (is_null($attribs) ? 'class="inputbox" size="1"' : $attribs),
+				'list.attr' => (null === $attribs ? 'class="inputbox" size="1"' : $attribs),
 				'list.select' => (int) $selected,
 				'list.translate' => false,
 			)
diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
index d27f771f7d416..1c9f7861a8981 100644
--- a/libraries/cms/installer/installer.php
+++ b/libraries/cms/installer/installer.php
@@ -1593,7 +1593,7 @@ public function copyFiles($files, $overwrite = null)
 		 * allowOverwrite flag.
 		 */
 
-		if (is_null($overwrite) || !is_bool($overwrite))
+		if (null === $overwrite || !is_bool($overwrite))
 		{
 			$overwrite = $this->overwrite;
 		}
@@ -1907,7 +1907,7 @@ public function findManifest()
 				// Is it a valid Joomla installation manifest file?
 				$manifest = $this->isManifest($file);
 
-				if (!is_null($manifest))
+				if (null !== $manifest)
 				{
 					// If the root method attribute is set to upgrade, allow file overwrite
 					if ((string) $manifest->attributes()->method == 'upgrade')
diff --git a/libraries/cms/layout/file.php b/libraries/cms/layout/file.php
index 88969a764ff57..42bd0ff9192c8 100644
--- a/libraries/cms/layout/file.php
+++ b/libraries/cms/layout/file.php
@@ -572,7 +572,7 @@ public function getDefaultIncludePaths()
 		$paths = array();
 
 		// (1 - highest priority) Received a custom high priority path
-		if (!is_null($this->basePath))
+		if (null !== $this->basePath)
 		{
 			$paths[] = rtrim($this->basePath, DIRECTORY_SEPARATOR);
 		}
diff --git a/libraries/cms/module/helper.php b/libraries/cms/module/helper.php
index f54a679c4a163..8aa4b71bc4bc1 100644
--- a/libraries/cms/module/helper.php
+++ b/libraries/cms/module/helper.php
@@ -50,7 +50,7 @@ public static function &getModule($name, $title = null)
 		}
 
 		// If we didn't find it, and the name is mod_something, create a dummy object
-		if (is_null($result) && 0 === strpos($name, 'mod_'))
+		if (null === $result && 0 === strpos($name, 'mod_'))
 		{
 			$result            = new stdClass;
 			$result->id        = 0;
@@ -123,7 +123,7 @@ public static function isEnabled($module)
 	{
 		$result = static::getModule($module);
 
-		return !is_null($result) && $result->id !== 0;
+		return null !== $result && $result->id !== 0;
 	}
 
 	/**
@@ -243,7 +243,7 @@ public static function renderModule($module, $attribs = array())
 		// If the $module is nulled it will return an empty content, otherwise it will render the module normally.
 		$app->triggerEvent('onRenderModule', array(&$module, &$attribs));
 
-		if (is_null($module) || !isset($module->content))
+		if (null === $module || !isset($module->content))
 		{
 			return '';
 		}
diff --git a/libraries/cms/plugin/helper.php b/libraries/cms/plugin/helper.php
index 1b6e1f5869713..b2132ddac1bd8 100644
--- a/libraries/cms/plugin/helper.php
+++ b/libraries/cms/plugin/helper.php
@@ -150,7 +150,7 @@ public static function importPlugin($type, $plugin = null, $autocreate = true, J
 		// Check for the default args, if so we can optimise cheaply
 		$defaults = false;
 
-		if (is_null($plugin) && $autocreate == true && is_null($dispatcher))
+		if (null === $plugin && $autocreate == true && null === $dispatcher)
 		{
 			$defaults = true;
 		}
diff --git a/libraries/cms/plugin/plugin.php b/libraries/cms/plugin/plugin.php
index 16e6c83d62da2..af328baa9e0d0 100644
--- a/libraries/cms/plugin/plugin.php
+++ b/libraries/cms/plugin/plugin.php
@@ -99,7 +99,7 @@ public function __construct(&$subject, $config = array())
 			$reflection = new ReflectionClass($this);
 			$appProperty = $reflection->getProperty('app');
 
-			if ($appProperty->isPrivate() === false && is_null($this->app))
+			if ($appProperty->isPrivate() === false && null === $this->app)
 			{
 				$this->app = JFactory::getApplication();
 			}
@@ -110,7 +110,7 @@ public function __construct(&$subject, $config = array())
 			$reflection = new ReflectionClass($this);
 			$dbProperty = $reflection->getProperty('db');
 
-			if ($dbProperty->isPrivate() === false && is_null($this->db))
+			if ($dbProperty->isPrivate() === false && null === $this->db)
 			{
 				$this->db = JFactory::getDbo();
 			}
diff --git a/libraries/cms/response/json.php b/libraries/cms/response/json.php
index 204eb6cb908be..4d93123bd553e 100644
--- a/libraries/cms/response/json.php
+++ b/libraries/cms/response/json.php
@@ -68,7 +68,7 @@ public function __construct($response = null, $message = null, $error = false, $
 		// Get the message queue if requested and available
 		$app = JFactory::getApplication();
 
-		if (!$ignoreMessages && !is_null($app) && is_callable(array($app, 'getMessageQueue')))
+		if (!$ignoreMessages && null !== $app && is_callable(array($app, 'getMessageQueue')))
 		{
 			$messages = $app->getMessageQueue();
 
diff --git a/libraries/cms/router/site.php b/libraries/cms/router/site.php
index 5b257dc7f6b01..8cbf66e4bbc07 100644
--- a/libraries/cms/router/site.php
+++ b/libraries/cms/router/site.php
@@ -673,7 +673,7 @@ protected function createUri($url)
 		// Get the itemid form the URI
 		$itemid = $uri->getVar('Itemid');
 
-		if (is_null($itemid))
+		if (null === $itemid)
 		{
 			if ($option = $uri->getVar('option'))
 			{
diff --git a/libraries/cms/table/contenthistory.php b/libraries/cms/table/contenthistory.php
index 7570166ba7a95..41adc734740a6 100644
--- a/libraries/cms/table/contenthistory.php
+++ b/libraries/cms/table/contenthistory.php
@@ -80,7 +80,7 @@ public function store($updateNulls = false)
 		}
 
 		// Modify author and date only when not toggling Keep Forever
-		if (is_null($this->get('keep_forever')))
+		if (null === $this->get('keep_forever'))
 		{
 			$this->set('editor_user_id', JFactory::getUser()->id);
 			$this->set('save_date', JFactory::getDate()->toSql());
@@ -127,12 +127,12 @@ public function getSha1($jsonData, JTableContenttype $typeTable)
 				// Go one level down for JSON column values
 				foreach ($value as $subName => $subValue)
 				{
-					$object->$subName = (is_int($subValue) || is_bool($subValue) || is_null($subValue)) ? (string) $subValue : $subValue;
+					$object->$subName = (is_int($subValue) || is_bool($subValue) || null === $subValue) ? (string) $subValue : $subValue;
 				}
 			}
 			else
 			{
-				$object->$name = (is_int($value) || is_bool($value) || is_null($value)) ? (string) $value : $value;
+				$object->$name = (is_int($value) || is_bool($value) || null === $value) ? (string) $value : $value;
 			}
 		}
 

From 271d02a8e0617b1b59e6cbe0165963c6ae03b328 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 21:00:09 +0300
Subject: [PATCH 13/43] Removed unnecessary ternary operators

---
 libraries/cms/html/behavior.php  |  2 +-
 libraries/cms/html/bootstrap.php |  2 +-
 libraries/cms/html/tabs.php      | 15 ++++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
index 9d74142dbf183..a218c1bde38d8 100644
--- a/libraries/cms/html/behavior.php
+++ b/libraries/cms/html/behavior.php
@@ -295,7 +295,7 @@ public static function tooltip($selector = '.hasTip', $params = array())
 		$opt['showDelay'] = (isset($params['showDelay'])) ? (int) $params['showDelay'] : null;
 		$opt['hideDelay'] = (isset($params['hideDelay'])) ? (int) $params['hideDelay'] : null;
 		$opt['className'] = (isset($params['className'])) ? $params['className'] : null;
-		$opt['fixed']     = (isset($params['fixed']) && ($params['fixed'])) ? true : false;
+		$opt['fixed']     = isset($params['fixed']) && $params['fixed'];
 		$opt['onShow']    = (isset($params['onShow'])) ? '\\' . $params['onShow'] : null;
 		$opt['onHide']    = (isset($params['onHide'])) ? '\\' . $params['onHide'] : null;
 
diff --git a/libraries/cms/html/bootstrap.php b/libraries/cms/html/bootstrap.php
index 33dd06da80937..df6ccb0f527c2 100644
--- a/libraries/cms/html/bootstrap.php
+++ b/libraries/cms/html/bootstrap.php
@@ -598,7 +598,7 @@ public static function startAccordion($selector = 'myAccordian', $params = array
 
 			// Setup options object
 			$opt['parent'] = isset($params['parent']) ? ($params['parent'] == true ? '#' . $selector : $params['parent']) : false;
-			$opt['toggle'] = isset($params['toggle']) ? (boolean) $params['toggle'] : ($opt['parent'] === false || isset($params['active']) ? false : true);
+			$opt['toggle'] = isset($params['toggle']) ? (boolean) $params['toggle'] : ($opt['parent'] === false || isset($params['active']));
 			$onShow = isset($params['onShow']) ? (string) $params['onShow'] : null;
 			$onShown = isset($params['onShown']) ? (string) $params['onShown'] : null;
 			$onHide = isset($params['onHide']) ? (string) $params['onHide'] : null;
diff --git a/libraries/cms/html/tabs.php b/libraries/cms/html/tabs.php
index 7e47f13359921..7007c1327d505 100644
--- a/libraries/cms/html/tabs.php
+++ b/libraries/cms/html/tabs.php
@@ -9,6 +9,7 @@
 
 defined('JPATH_PLATFORM') or die;
 
+
 /**
  * Utility class for Tabs elements.
  *
@@ -19,8 +20,8 @@ abstract class JHtmlTabs
 	/**
 	 * Creates a panes and creates the JavaScript object for it.
 	 *
-	 * @param   string  $group   The pane identifier.
-	 * @param   array   $params  An array of option.
+	 * @param   string $group  The pane identifier.
+	 * @param   array  $params An array of option.
 	 *
 	 * @return  string
 	 *
@@ -48,8 +49,8 @@ public static function end()
 	/**
 	 * Begins the display of a new panel.
 	 *
-	 * @param   string  $text  Text to display.
-	 * @param   string  $id    Identifier of the panel.
+	 * @param   string $text Text to display.
+	 * @param   string $id   Identifier of the panel.
 	 *
 	 * @return  string  HTML to start a new panel
 	 *
@@ -63,8 +64,8 @@ public static function panel($text, $id)
 	/**
 	 * Load the JavaScript behavior.
 	 *
-	 * @param   string  $group   The pane identifier.
-	 * @param   array   $params  Array of options.
+	 * @param   string $group  The pane identifier.
+	 * @param   array  $params Array of options.
 	 *
 	 * @return  void
 	 *
@@ -86,7 +87,7 @@ protected static function loadBehavior($group, $params = array())
 			$opt['descriptionSelector'] = "dd.tabs";
 
 			// When use storage is set and value is false - By default we allow to use storage
-			$opt['useStorage'] = (isset($params['useCookie']) && !$params['useCookie']) ? false : true;
+			$opt['useStorage'] = (isset($params['useCookie']) && !$params['useCookie']);
 
 			$options = JHtml::getJSObject($opt);
 

From c500e836964cdbc345865d44f7ca1697ecbc7d87 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 21:13:26 +0300
Subject: [PATCH 14/43] Fix for Juri...

---
 libraries/cms/router/router.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/cms/router/router.php b/libraries/cms/router/router.php
index b18017c3cc947..98ccb1d318f68 100644
--- a/libraries/cms/router/router.php
+++ b/libraries/cms/router/router.php
@@ -666,7 +666,7 @@ protected function _createUri($url)
 	 */
 	protected function createUri($url)
 	{
-		if (!is_array($url) && $url[0] !== '&')
+		if (!is_array($url) && (string) $url[0] !== '&')
 		{
 			return new JUri($url);
 		}

From 44d234da41219aada406e7aaa5195a83ffff8121 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 21:21:38 +0300
Subject: [PATCH 15/43] Revert some changes for ... PHP5.3 compatibility

---
 libraries/cms/router/router.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/cms/router/router.php b/libraries/cms/router/router.php
index 98ccb1d318f68..640e42a47ed04 100644
--- a/libraries/cms/router/router.php
+++ b/libraries/cms/router/router.php
@@ -635,7 +635,7 @@ protected function processBuildRules(&$uri, $stage = self::PROCESS_DURING)
 
 		foreach ($this->_rules['build' . $stage] as $rule)
 		{
-			call_user_func($rule, &$this, &$uri);
+			call_user_func_array($rule, array(&$this, &$uri));
 		}
 	}
 
@@ -666,7 +666,7 @@ protected function _createUri($url)
 	 */
 	protected function createUri($url)
 	{
-		if (!is_array($url) && (string) $url[0] !== '&')
+		if (!is_array($url) && substr($url, 0, 1) != '&')
 		{
 			return new JUri($url);
 		}

From 6fb499bec91416ee47318e0be99103baa77fb075 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 21:39:33 +0300
Subject: [PATCH 16/43] Make travis happy ....

---
 libraries/cms/html/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/cms/html/bootstrap.php b/libraries/cms/html/bootstrap.php
index df6ccb0f527c2..33dd06da80937 100644
--- a/libraries/cms/html/bootstrap.php
+++ b/libraries/cms/html/bootstrap.php
@@ -598,7 +598,7 @@ public static function startAccordion($selector = 'myAccordian', $params = array
 
 			// Setup options object
 			$opt['parent'] = isset($params['parent']) ? ($params['parent'] == true ? '#' . $selector : $params['parent']) : false;
-			$opt['toggle'] = isset($params['toggle']) ? (boolean) $params['toggle'] : ($opt['parent'] === false || isset($params['active']));
+			$opt['toggle'] = isset($params['toggle']) ? (boolean) $params['toggle'] : ($opt['parent'] === false || isset($params['active']) ? false : true);
 			$onShow = isset($params['onShow']) ? (string) $params['onShow'] : null;
 			$onShown = isset($params['onShown']) ? (string) $params['onShown'] : null;
 			$onHide = isset($params['onHide']) ? (string) $params['onHide'] : null;

From 5ada9b936a669fb190cb1d43f47bc6e0496ff411 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 21:49:22 +0300
Subject: [PATCH 17/43] Make codesniffer happy...

---
 libraries/cms/html/tabs.php               | 12 ++++++------
 libraries/cms/schema/changeitem/mysql.php |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/libraries/cms/html/tabs.php b/libraries/cms/html/tabs.php
index 7007c1327d505..874e4453935ee 100644
--- a/libraries/cms/html/tabs.php
+++ b/libraries/cms/html/tabs.php
@@ -20,8 +20,8 @@ abstract class JHtmlTabs
 	/**
 	 * Creates a panes and creates the JavaScript object for it.
 	 *
-	 * @param   string $group  The pane identifier.
-	 * @param   array  $params An array of option.
+	 * @param   string  $group   The pane identifier.
+	 * @param   array   $params  An array of option.
 	 *
 	 * @return  string
 	 *
@@ -49,8 +49,8 @@ public static function end()
 	/**
 	 * Begins the display of a new panel.
 	 *
-	 * @param   string $text Text to display.
-	 * @param   string $id   Identifier of the panel.
+	 * @param   string  $text  Text to display.
+	 * @param   string  $id    Identifier of the panel.
 	 *
 	 * @return  string  HTML to start a new panel
 	 *
@@ -64,8 +64,8 @@ public static function panel($text, $id)
 	/**
 	 * Load the JavaScript behavior.
 	 *
-	 * @param   string $group  The pane identifier.
-	 * @param   array  $params Array of options.
+	 * @param   string  $group   The pane identifier.
+	 * @param   array   $params  Array of options.
 	 *
 	 * @return  void
 	 *
diff --git a/libraries/cms/schema/changeitem/mysql.php b/libraries/cms/schema/changeitem/mysql.php
index 895e749e1c59a..23c4b84e9e1f1 100644
--- a/libraries/cms/schema/changeitem/mysql.php
+++ b/libraries/cms/schema/changeitem/mysql.php
@@ -61,10 +61,9 @@ protected function buildCheckQuery()
 
 		// Check for special update statement to reset utf8mb4 conversion status
 		if (($command == 'UPDATE `#__UTF8_CONVERSION`'
-			|| $command == 'UPDATE #__UTF8_CONVERSION')
+				|| $command == 'UPDATE #__UTF8_CONVERSION')
 			&& strtoupper($wordArray[2]) == 'SET'
-			&& 0 === stripos(str_replace('`', '', $wordArray[3]), 'converted')
-		)
+			&& 0 === stripos(str_replace('`', '', $wordArray[3]), 'converted'))
 		{
 			// Statement is special statement to reset conversion status
 			$this->queryType = 'UTF8CNV';

From c2fd895754852bfafcd355b4982182c9b7005f53 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 21:53:41 +0300
Subject: [PATCH 18/43] DYC!

---
 libraries/cms/schema/changeitem/mysql.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/cms/schema/changeitem/mysql.php b/libraries/cms/schema/changeitem/mysql.php
index 23c4b84e9e1f1..3033c54d58a9d 100644
--- a/libraries/cms/schema/changeitem/mysql.php
+++ b/libraries/cms/schema/changeitem/mysql.php
@@ -61,7 +61,7 @@ protected function buildCheckQuery()
 
 		// Check for special update statement to reset utf8mb4 conversion status
 		if (($command == 'UPDATE `#__UTF8_CONVERSION`'
-				|| $command == 'UPDATE #__UTF8_CONVERSION')
+			|| $command == 'UPDATE #__UTF8_CONVERSION')
 			&& strtoupper($wordArray[2]) == 'SET'
 			&& 0 === stripos(str_replace('`', '', $wordArray[3]), 'converted'))
 		{

From de1a93e2e0f5116a1b029a75d8158ab9d8592e50 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 22:24:25 +0300
Subject: [PATCH 19/43] Optimize non-optimal if conditions.

---
 libraries/cms/application/administrator.php   | 2 +-
 libraries/cms/application/site.php            | 6 +++---
 libraries/cms/editor/editor.php               | 2 +-
 libraries/cms/helper/route.php                | 2 +-
 libraries/cms/helper/tags.php                 | 2 +-
 libraries/cms/html/behavior.php               | 2 +-
 libraries/cms/html/menu.php                   | 2 +-
 libraries/cms/html/select.php                 | 6 +++---
 libraries/cms/installer/adapter.php           | 4 ++--
 libraries/cms/installer/adapter/component.php | 7 ++++---
 libraries/cms/installer/adapter/file.php      | 2 +-
 libraries/cms/installer/adapter/language.php  | 2 +-
 libraries/cms/installer/adapter/library.php   | 2 +-
 libraries/cms/installer/adapter/module.php    | 2 +-
 libraries/cms/installer/adapter/package.php   | 7 ++++---
 libraries/cms/installer/adapter/plugin.php    | 2 +-
 libraries/cms/installer/adapter/template.php  | 2 +-
 libraries/cms/installer/helper.php            | 2 +-
 libraries/cms/installer/installer.php         | 3 ++-
 libraries/cms/installer/script.php            | 2 +-
 libraries/cms/plugin/helper.php               | 2 +-
 libraries/cms/table/corecontent.php           | 2 +-
 libraries/cms/toolbar/toolbar.php             | 2 +-
 23 files changed, 35 insertions(+), 32 deletions(-)

diff --git a/libraries/cms/application/administrator.php b/libraries/cms/application/administrator.php
index de59ef7b34734..7ae4816fc5064 100644
--- a/libraries/cms/application/administrator.php
+++ b/libraries/cms/application/administrator.php
@@ -361,7 +361,7 @@ public static function purgeMessages()
 		$config = $db->loadObject();
 
 		// Check if auto_purge value set
-		if (is_object($config) and $config->cfg_name == 'auto_purge')
+		if (is_object($config) && $config->cfg_name === 'auto_purge')
 		{
 			$purge = $config->cfg_value;
 		}
diff --git a/libraries/cms/application/site.php b/libraries/cms/application/site.php
index 3cc6e61858b99..f79937ff3278e 100644
--- a/libraries/cms/application/site.php
+++ b/libraries/cms/application/site.php
@@ -618,7 +618,7 @@ protected function initialiseApp($options = array())
 			}
 		}
 
-		if ($this->getLanguageFilter() && empty($options['language']))
+		if (empty($options['language']) && $this->getLanguageFilter())
 		{
 			// Detect cookie language
 			$lang = $this->input->cookie->get(md5($this->get('secret') . 'language'), null, 'string');
@@ -642,7 +642,7 @@ protected function initialiseApp($options = array())
 			}
 		}
 
-		if ($this->getDetectBrowser() && empty($options['language']))
+		if (empty($options['language']) && $this->getDetectBrowser())
 		{
 			// Detect browser language
 			$lang = JLanguageHelper::detectLanguage();
@@ -744,7 +744,7 @@ protected function render()
 				$template = $this->getTemplate(true);
 				$file     = $this->input->get('tmpl', 'index');
 
-				if (!$this->get('offline') && ($file == 'offline'))
+				if (($file === 'offline') && !$this->get('offline'))
 				{
 					$this->set('themeFile', 'index.php');
 				}
diff --git a/libraries/cms/editor/editor.php b/libraries/cms/editor/editor.php
index b155a375713d0..02c5bb42ed144 100644
--- a/libraries/cms/editor/editor.php
+++ b/libraries/cms/editor/editor.php
@@ -261,7 +261,7 @@ public function initialise()
 
 		$document = JFactory::getDocument();
 
-		if (method_exists($document, "addCustomTag") && !empty($return))
+		if (!empty($return) && method_exists($document, 'addCustomTag'))
 		{
 			$document->addCustomTag($return);
 		}
diff --git a/libraries/cms/helper/route.php b/libraries/cms/helper/route.php
index 71b8f280527ba..442d6266eb186 100644
--- a/libraries/cms/helper/route.php
+++ b/libraries/cms/helper/route.php
@@ -180,7 +180,7 @@ protected function findItem($needles = array())
 						 * $language != * can override existing entries
 						 * $language == * cannot override existing entries
 						 */
-						if (!isset(static::$lookup[$language][$view][$item->query['id']]) || $item->language != '*')
+						if ($item->language != '*' || !isset(static::$lookup[$language][$view][$item->query['id']]))
 						{
 							static::$lookup[$language][$view][$item->query['id']] = $item->id;
 						}
diff --git a/libraries/cms/helper/tags.php b/libraries/cms/helper/tags.php
index f12a795ab125a..1da4f4d0a4d73 100644
--- a/libraries/cms/helper/tags.php
+++ b/libraries/cms/helper/tags.php
@@ -211,7 +211,7 @@ public function createTagsFromField($tags)
 			foreach ($tags as $key => $tag)
 			{
 				// User is not allowed to create tags, so don't create.
-				if (strpos($tag, '#new#') !== false && !$canCreate)
+				if (!$canCreate && strpos($tag, '#new#') !== false)
 				{
 					continue;
 				}
diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
index a218c1bde38d8..8364468b04373 100644
--- a/libraries/cms/html/behavior.php
+++ b/libraries/cms/html/behavior.php
@@ -699,7 +699,7 @@ public static function keepalive()
 		$url = JUri::base(true) . '/index.php';
 
 		// If we are in the frontend or logged in as a user, we can use the ajax component to reduce the load
-		if (JFactory::getApplication()->isSite() || !JFactory::getUser()->guest)
+		if (!JFactory::getUser()->guest || JFactory::getApplication()->isSite())
 		{
 			$url .= '?option=com_ajax&format=json';
 		}
diff --git a/libraries/cms/html/menu.php b/libraries/cms/html/menu.php
index b0621e929c3e9..e86845390f55a 100644
--- a/libraries/cms/html/menu.php
+++ b/libraries/cms/html/menu.php
@@ -326,7 +326,7 @@ public static function linkoptions($all = false, $unassigned = false)
 	 */
 	public static function treerecurse($id, $indent, $list, &$children, $maxlevel = 9999, $level = 0, $type = 1)
 	{
-		if (@$children[$id] && $level <= $maxlevel)
+		if ($level <= $maxlevel && @$children[$id])
 		{
 			foreach ($children[$id] as $v)
 			{
diff --git a/libraries/cms/html/select.php b/libraries/cms/html/select.php
index cc0f5dfc61ad5..3800011b7799a 100644
--- a/libraries/cms/html/select.php
+++ b/libraries/cms/html/select.php
@@ -670,12 +670,12 @@ public static function options($arr, $optKey = 'value', $optText = 'text', $sele
 
 			$key = (string) $key;
 
-			if ($options['groups'] && $key == '<OPTGROUP>')
+			if ($key === '<OPTGROUP>' && $options['groups'])
 			{
 				$html .= $baseIndent . '<optgroup label="' . ($options['list.translate'] ? JText::_($text) : $text) . '">' . $options['format.eol'];
 				$baseIndent = str_repeat($options['format.indent'], ++$options['format.depth']);
 			}
-			elseif ($options['groups'] && $key == '</OPTGROUP>')
+			elseif ($key === '</OPTGROUP>' && $options['groups'])
 			{
 				$baseIndent = str_repeat($options['format.indent'], --$options['format.depth']);
 				$html .= $baseIndent . '</optgroup>' . $options['format.eol'];
@@ -691,7 +691,7 @@ public static function options($arr, $optKey = 'value', $optText = 'text', $sele
 					$text .= ' - ' . $splitText[1];
 				}
 
-				if ($options['list.translate'] && !empty($label))
+				if (!empty($label) && $options['list.translate'])
 				{
 					$label = JText::_($label);
 				}
diff --git a/libraries/cms/installer/adapter.php b/libraries/cms/installer/adapter.php
index 597ba4082fe8f..92fe5983a89f6 100644
--- a/libraries/cms/installer/adapter.php
+++ b/libraries/cms/installer/adapter.php
@@ -185,8 +185,8 @@ protected function checkExtensionInFilesystem()
 			$updateElement = $this->getManifest()->update;
 
 			// Upgrade manually set or update function available or update tag detected
-			if ($this->parent->isUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
-				|| $updateElement)
+			if ($updateElement || $this->parent->isUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
+			)
 			{
 				// Force this one
 				$this->parent->setOverwrite(true);
diff --git a/libraries/cms/installer/adapter/component.php b/libraries/cms/installer/adapter/component.php
index ca8dda87b8692..84502d2f4ce19 100644
--- a/libraries/cms/installer/adapter/component.php
+++ b/libraries/cms/installer/adapter/component.php
@@ -78,8 +78,9 @@ protected function checkExtensionInFilesystem()
 			$updateElement = $this->getManifest()->update;
 
 			// Upgrade manually set or update function available or update tag detected
-			if ($this->parent->isUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
-				|| $updateElement)
+			if ($updateElement || $this->parent->isUpgrade()
+				|| ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
+			)
 			{
 				// If there is a matching extension mark this as an update
 				$this->setRoute('update');
@@ -173,7 +174,7 @@ protected function copyBaseFiles()
 			$path['src']  = $this->parent->getPath('source') . '/' . $this->manifest_script;
 			$path['dest'] = $this->parent->getPath('extension_administrator') . '/' . $this->manifest_script;
 
-			if (!file_exists($path['dest']) || $this->parent->isOverwrite())
+			if ($this->parent->isOverwrite() || !file_exists($path['dest']))
 			{
 				if (!$this->parent->copyFiles(array($path)))
 				{
diff --git a/libraries/cms/installer/adapter/file.php b/libraries/cms/installer/adapter/file.php
index f87c811156c24..deb31514444f2 100644
--- a/libraries/cms/installer/adapter/file.php
+++ b/libraries/cms/installer/adapter/file.php
@@ -122,7 +122,7 @@ protected function finaliseInstall()
 			$path['src'] = $this->parent->getPath('source') . '/' . $this->manifest_script;
 			$path['dest'] = $this->parent->getPath('extension_root') . '/' . $this->manifest_script;
 
-			if (!file_exists($path['dest']) || $this->parent->isOverwrite())
+			if ($this->parent->isOverwrite() || !file_exists($path['dest']))
 			{
 				if (!$this->parent->copyFiles(array($path)))
 				{
diff --git a/libraries/cms/installer/adapter/language.php b/libraries/cms/installer/adapter/language.php
index b403abec808b1..e726de0d640e7 100644
--- a/libraries/cms/installer/adapter/language.php
+++ b/libraries/cms/installer/adapter/language.php
@@ -199,7 +199,7 @@ protected function _install($cname, $basePath, $clientId, &$element)
 			$updateElement = $this->getManifest()->update;
 
 			// Upgrade manually set or update tag detected
-			if ($this->parent->isUpgrade() || $updateElement)
+			if ($updateElement || $this->parent->isUpgrade())
 			{
 				// Transfer control to the update function
 				return $this->update();
diff --git a/libraries/cms/installer/adapter/library.php b/libraries/cms/installer/adapter/library.php
index 098879f05cd4d..80f959902c62b 100644
--- a/libraries/cms/installer/adapter/library.php
+++ b/libraries/cms/installer/adapter/library.php
@@ -112,7 +112,7 @@ protected function finaliseInstall()
 				$path['src'] = $this->parent->getPath('source') . '/' . $this->manifest_script;
 				$path['dest'] = $this->parent->getPath('extension_root') . '/' . $this->manifest_script;
 
-				if (!file_exists($path['dest']) || $this->parent->isOverwrite())
+				if ($this->parent->isOverwrite() || !file_exists($path['dest']))
 				{
 					if (!$this->parent->copyFiles(array($path)))
 					{
diff --git a/libraries/cms/installer/adapter/module.php b/libraries/cms/installer/adapter/module.php
index acbb0679ce763..984d264413aeb 100644
--- a/libraries/cms/installer/adapter/module.php
+++ b/libraries/cms/installer/adapter/module.php
@@ -93,7 +93,7 @@ protected function copyBaseFiles()
 			$path['src']  = $this->parent->getPath('source') . '/' . $this->manifest_script;
 			$path['dest'] = $this->parent->getPath('extension_root') . '/' . $this->manifest_script;
 
-			if (!file_exists($path['dest']) || $this->parent->isOverwrite())
+			if ($this->parent->isOverwrite() || !file_exists($path['dest']))
 			{
 				if (!$this->parent->copyFiles(array($path)))
 				{
diff --git a/libraries/cms/installer/adapter/package.php b/libraries/cms/installer/adapter/package.php
index fbb83761fe0f1..61879004cfe93 100644
--- a/libraries/cms/installer/adapter/package.php
+++ b/libraries/cms/installer/adapter/package.php
@@ -51,8 +51,9 @@ protected function checkExtensionInFilesystem()
 			$updateElement = $this->manifest->update;
 
 			// Upgrade manually set or update function available or update tag detected
-			if ($this->parent->isUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
-				|| $updateElement)
+			if ($updateElement || $this->parent->isUpgrade()
+				|| ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
+			)
 			{
 				// Force this one
 				$this->parent->setOverwrite(true);
@@ -236,7 +237,7 @@ protected function finaliseInstall()
 			$path['src'] = $this->parent->getPath('source') . '/' . $this->manifest_script;
 			$path['dest'] = $this->parent->getPath('extension_root') . '/' . $this->manifest_script;
 
-			if (!file_exists($path['dest']) || $this->parent->isOverwrite())
+			if ($this->parent->isOverwrite() || !file_exists($path['dest']))
 			{
 				if (!$this->parent->copyFiles(array($path)))
 				{
diff --git a/libraries/cms/installer/adapter/plugin.php b/libraries/cms/installer/adapter/plugin.php
index 1865100ade9da..ebc1c74d8be8c 100644
--- a/libraries/cms/installer/adapter/plugin.php
+++ b/libraries/cms/installer/adapter/plugin.php
@@ -92,7 +92,7 @@ protected function copyBaseFiles()
 			$path['src']  = $this->parent->getPath('source') . '/' . $this->manifest_script;
 			$path['dest'] = $this->parent->getPath('extension_root') . '/' . $this->manifest_script;
 
-			if (!file_exists($path['dest']) || $this->parent->isOverwrite())
+			if ($this->parent->isOverwrite() || !file_exists($path['dest']))
 			{
 				if (!$this->parent->copyFiles(array($path)))
 				{
diff --git a/libraries/cms/installer/adapter/template.php b/libraries/cms/installer/adapter/template.php
index de65c247f56e6..ad412132e2735 100644
--- a/libraries/cms/installer/adapter/template.php
+++ b/libraries/cms/installer/adapter/template.php
@@ -108,7 +108,7 @@ protected function copyBaseFiles()
 			$path['src']  = $this->parent->getPath('source') . '/' . $this->manifest_script;
 			$path['dest'] = $this->parent->getPath('extension_root') . '/' . $this->manifest_script;
 
-			if (!file_exists($path['dest']) || $this->parent->isOverwrite())
+			if ($this->parent->isOverwrite() || !file_exists($path['dest']))
 			{
 				if (!$this->parent->copyFiles(array($path)))
 				{
diff --git a/libraries/cms/installer/helper.php b/libraries/cms/installer/helper.php
index bfb4879d102a6..2e2251b1fcabc 100644
--- a/libraries/cms/installer/helper.php
+++ b/libraries/cms/installer/helper.php
@@ -193,7 +193,7 @@ public static function unpack($p_filename, $alwaysReturnArray = false)
 		 */
 		$retval['type'] = self::detectType($extractdir);
 
-		if ($retval['type'] || $alwaysReturnArray)
+		if ($alwaysReturnArray || $retval['type'])
 		{
 			return $retval;
 		}
diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
index 1c9f7861a8981..d17d402780227 100644
--- a/libraries/cms/installer/installer.php
+++ b/libraries/cms/installer/installer.php
@@ -2187,7 +2187,8 @@ public static function parseXMLInstallFile($path)
 
 		// Extensions use 'extension' as the root tag.  Languages use 'metafile' instead
 
-		if ($xml->getName() != 'extension' && $xml->getName() != 'metafile')
+		$name = $xml->getName();
+		if ($name !== 'extension' && $name !== 'metafile')
 		{
 			unset($xml);
 
diff --git a/libraries/cms/installer/script.php b/libraries/cms/installer/script.php
index 0bda11fe43f8d..b537cabbdc8d4 100644
--- a/libraries/cms/installer/script.php
+++ b/libraries/cms/installer/script.php
@@ -132,7 +132,7 @@ public function preflight($type, $parent)
 		}
 
 		// Abort if the extension being installed is not newer than the currently installed version
-		if (strtolower($type) == 'update' && !$this->allowDowngrades)
+		if (!$this->allowDowngrades && strtolower($type) === 'update')
 		{
 			$manifest = $this->getItemArray('manifest_cache', '#__extensions', 'element', JFactory::getDbo()->quote($this->extension));
 			$oldRelease = $manifest['version'];
diff --git a/libraries/cms/plugin/helper.php b/libraries/cms/plugin/helper.php
index b2132ddac1bd8..b81a310376015 100644
--- a/libraries/cms/plugin/helper.php
+++ b/libraries/cms/plugin/helper.php
@@ -155,7 +155,7 @@ public static function importPlugin($type, $plugin = null, $autocreate = true, J
 			$defaults = true;
 		}
 
-		if (!isset($loaded[$type]) || !$defaults)
+		if (!$defaults || !isset($loaded[$type]))
 		{
 			$results = null;
 
diff --git a/libraries/cms/table/corecontent.php b/libraries/cms/table/corecontent.php
index 12afc6bede354..f850d96fd1602 100644
--- a/libraries/cms/table/corecontent.php
+++ b/libraries/cms/table/corecontent.php
@@ -121,7 +121,7 @@ public function check()
 			$this->core_urls = '{}';
 		}
 		// Check the publish down date is not earlier than publish up.
-		if ($this->core_publish_down > $this->_db->getNullDate() && $this->core_publish_down < $this->core_publish_up)
+		if ($this->core_publish_down < $this->core_publish_up && $this->core_publish_down > $this->_db->getNullDate())
 		{
 			// Swap the dates.
 			$temp = $this->core_publish_up;
diff --git a/libraries/cms/toolbar/toolbar.php b/libraries/cms/toolbar/toolbar.php
index b64e922f14982..1438e9d857019 100644
--- a/libraries/cms/toolbar/toolbar.php
+++ b/libraries/cms/toolbar/toolbar.php
@@ -212,7 +212,7 @@ public function loadButtonType($type, $new = false)
 	{
 		$signature = md5($type);
 
-		if (isset($this->_buttons[$signature]) && $new === false)
+		if ($new === false && isset($this->_buttons[$signature]))
 		{
 			return $this->_buttons[$signature];
 		}

From 2aa353bac1f52cc5179717c9b95af7dbfca4a711 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 22:30:11 +0300
Subject: [PATCH 20/43] codsniffer...

---
 libraries/cms/installer/adapter.php           | 4 ++--
 libraries/cms/installer/adapter/component.php | 3 +--
 libraries/cms/installer/adapter/package.php   | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/libraries/cms/installer/adapter.php b/libraries/cms/installer/adapter.php
index 92fe5983a89f6..6c61b22303441 100644
--- a/libraries/cms/installer/adapter.php
+++ b/libraries/cms/installer/adapter.php
@@ -185,8 +185,8 @@ protected function checkExtensionInFilesystem()
 			$updateElement = $this->getManifest()->update;
 
 			// Upgrade manually set or update function available or update tag detected
-			if ($updateElement || $this->parent->isUpgrade() || ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
-			)
+			if ($updateElement || $this->parent->isUpgrade()
+				|| ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update')))
 			{
 				// Force this one
 				$this->parent->setOverwrite(true);
diff --git a/libraries/cms/installer/adapter/component.php b/libraries/cms/installer/adapter/component.php
index 84502d2f4ce19..bc491bd3cd190 100644
--- a/libraries/cms/installer/adapter/component.php
+++ b/libraries/cms/installer/adapter/component.php
@@ -79,8 +79,7 @@ protected function checkExtensionInFilesystem()
 
 			// Upgrade manually set or update function available or update tag detected
 			if ($updateElement || $this->parent->isUpgrade()
-				|| ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
-			)
+				|| ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update')))
 			{
 				// If there is a matching extension mark this as an update
 				$this->setRoute('update');
diff --git a/libraries/cms/installer/adapter/package.php b/libraries/cms/installer/adapter/package.php
index 61879004cfe93..11414929d728b 100644
--- a/libraries/cms/installer/adapter/package.php
+++ b/libraries/cms/installer/adapter/package.php
@@ -52,8 +52,7 @@ protected function checkExtensionInFilesystem()
 
 			// Upgrade manually set or update function available or update tag detected
 			if ($updateElement || $this->parent->isUpgrade()
-				|| ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update'))
-			)
+				|| ($this->parent->manifestClass && method_exists($this->parent->manifestClass, 'update')))
 			{
 				// Force this one
 				$this->parent->setOverwrite(true);

From 307cd94e9da98dd52a4038a07df275774683d77e Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 22:53:24 +0300
Subject: [PATCH 21/43] Inline one-time use variables

---
 libraries/cms/application/site.php             |  4 +---
 libraries/cms/component/helper.php             | 11 +++--------
 libraries/cms/form/field/chromestyle.php       |  3 +--
 libraries/cms/form/field/frontend_language.php |  4 +---
 libraries/cms/form/field/menu.php              |  4 +---
 libraries/cms/helper/content.php               |  4 +---
 libraries/cms/helper/helper.php                |  4 +---
 libraries/cms/html/sidebar.php                 |  3 +--
 libraries/cms/html/tel.php                     |  4 +---
 libraries/cms/html/user.php                    |  3 +--
 libraries/cms/installer/adapter/package.php    |  4 +---
 libraries/cms/layout/helper.php                |  6 ++----
 libraries/cms/library/helper.php               |  8 ++------
 libraries/cms/menu/menu.php                    |  7 ++-----
 libraries/cms/ucm/content.php                  |  3 +--
 libraries/cms/ucm/type.php                     |  8 ++------
 16 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/libraries/cms/application/site.php b/libraries/cms/application/site.php
index f79937ff3278e..b00409514efe1 100644
--- a/libraries/cms/application/site.php
+++ b/libraries/cms/application/site.php
@@ -269,9 +269,7 @@ public function getLanguageFilter()
 	 */
 	public function getMenu($name = 'site', $options = array())
 	{
-		$menu = parent::getMenu($name, $options);
-
-		return $menu;
+		return parent::getMenu($name, $options);
 	}
 
 	/**
diff --git a/libraries/cms/component/helper.php b/libraries/cms/component/helper.php
index 0274405e9e34a..c87373dd92e92 100644
--- a/libraries/cms/component/helper.php
+++ b/libraries/cms/component/helper.php
@@ -77,9 +77,7 @@ public static function getComponent($option, $strict = false)
 	 */
 	public static function isEnabled($option)
 	{
-		$result = static::getComponent($option, true);
-
-		return $result->enabled;
+		return static::getComponent($option, true)->enabled;
 	}
 
 	/**
@@ -117,9 +115,7 @@ public static function isInstalled($option)
 	 */
 	public static function getParams($option, $strict = false)
 	{
-		$component = static::getComponent($option, $strict);
-
-		return $component->params;
+		return static::getComponent($option, $strict)->params;
 	}
 
 	/**
@@ -403,9 +399,8 @@ protected static function executeComponent($path)
 	{
 		ob_start();
 		require_once $path;
-		$contents = ob_get_clean();
 
-		return $contents;
+		return ob_get_clean();
 	}
 
 	/**
diff --git a/libraries/cms/form/field/chromestyle.php b/libraries/cms/form/field/chromestyle.php
index 3acd92ebd605d..3547381627246 100644
--- a/libraries/cms/form/field/chromestyle.php
+++ b/libraries/cms/form/field/chromestyle.php
@@ -138,8 +138,7 @@ protected function getTemplates()
 
 		// Set the query and load the templates.
 		$db->setQuery($query);
-		$templates = $db->loadObjectList('element');
 
-		return $templates;
+		return $db->loadObjectList('element');
 	}
 }
diff --git a/libraries/cms/form/field/frontend_language.php b/libraries/cms/form/field/frontend_language.php
index 0c8959fabe022..6fa9ca0b64564 100644
--- a/libraries/cms/form/field/frontend_language.php
+++ b/libraries/cms/form/field/frontend_language.php
@@ -71,11 +71,9 @@ protected function getOptions()
 		}
 
 		// Merge any additional options in the XML definition.
-		$options = array_merge(
+		return array_merge(
 			parent::getOptions(),
 			$languages
 		);
-
-		return $options;
 	}
 }
diff --git a/libraries/cms/form/field/menu.php b/libraries/cms/form/field/menu.php
index d8fdc2e183d99..6869ea329d596 100644
--- a/libraries/cms/form/field/menu.php
+++ b/libraries/cms/form/field/menu.php
@@ -73,8 +73,6 @@ protected function getOptions()
 		}
 
 		// Merge any additional options in the XML definition.
-		$options = array_merge(parent::getOptions(), $menus);
-
-		return $options;
+		return array_merge(parent::getOptions(), $menus);
 	}
 }
diff --git a/libraries/cms/helper/content.php b/libraries/cms/helper/content.php
index 6eeae4670bf9b..00d038405f79c 100644
--- a/libraries/cms/helper/content.php
+++ b/libraries/cms/helper/content.php
@@ -174,9 +174,7 @@ public static function getLanguageId($langCode)
 			->where($db->quoteName('lang_code') . ' = ' . $db->quote($langCode));
 		$db->setQuery($query);
 
-		$id = $db->loadResult();
-
-		return $id;
+		return $db->loadResult();
 	}
 
 	/**
diff --git a/libraries/cms/helper/helper.php b/libraries/cms/helper/helper.php
index e261af0227c7b..38afe32668eb4 100644
--- a/libraries/cms/helper/helper.php
+++ b/libraries/cms/helper/helper.php
@@ -64,9 +64,7 @@ public function getLanguageId($langCode)
 			->where($db->quoteName('lang_code') . ' = ' . $db->quote($langCode));
 		$db->setQuery($query);
 
-		$id = $db->loadResult();
-
-		return $id;
+		return $db->loadResult();
 	}
 
 	/**
diff --git a/libraries/cms/html/sidebar.php b/libraries/cms/html/sidebar.php
index 5d3897c0a2a80..49cf8188f5719 100644
--- a/libraries/cms/html/sidebar.php
+++ b/libraries/cms/html/sidebar.php
@@ -60,9 +60,8 @@ public static function render()
 
 		// Create a layout object and ask it to render the sidebar
 		$layout      = new JLayoutFile('joomla.sidebars.submenu');
-		$sidebarHtml = $layout->render($data);
 
-		return $sidebarHtml;
+		return $layout->render($data);
 	}
 
 	/**
diff --git a/libraries/cms/html/tel.php b/libraries/cms/html/tel.php
index 61c8609fa2885..78fa822fb8d3e 100644
--- a/libraries/cms/html/tel.php
+++ b/libraries/cms/html/tel.php
@@ -70,8 +70,6 @@ public static function tel($number, $displayplan)
 			$display[4] = '.e164.arpa';
 		}
 
-		$display = implode($display, '');
-
-		return $display;
+		return implode($display, '');
 	}
 }
diff --git a/libraries/cms/html/user.php b/libraries/cms/html/user.php
index 3da35b28e40af..7bb9e519d2151 100644
--- a/libraries/cms/html/user.php
+++ b/libraries/cms/html/user.php
@@ -71,8 +71,7 @@ public static function userlist()
 			->where('a.block = 0')
 			->order('a.name');
 		$db->setQuery($query);
-		$items = $db->loadObjectList();
 
-		return $items;
+		return $db->loadObjectList();
 	}
 }
diff --git a/libraries/cms/installer/adapter/package.php b/libraries/cms/installer/adapter/package.php
index 11414929d728b..3c5ea839b7d57 100644
--- a/libraries/cms/installer/adapter/package.php
+++ b/libraries/cms/installer/adapter/package.php
@@ -652,11 +652,9 @@ protected function _getExtensionId($type, $id, $client, $group)
 		}
 
 		$db->setQuery($query);
-		$result = $db->loadResult();
-
 		// Note: For templates, libraries and packages their unique name is their key.
 		// This means they come out the same way they came in.
-		return $result;
+		return $db->loadResult();
 	}
 
 	/**
diff --git a/libraries/cms/layout/helper.php b/libraries/cms/layout/helper.php
index e18a1f8780c33..a6f1c18a7cc1f 100644
--- a/libraries/cms/layout/helper.php
+++ b/libraries/cms/layout/helper.php
@@ -45,9 +45,8 @@ public static function debug($layoutFile, $displayData = null, $basePath = '', $
 		// Make sure we send null to JLayoutFile if no path set
 		$basePath = empty($basePath) ? null : $basePath;
 		$layout = new JLayoutFile($layoutFile, $basePath, $options);
-		$renderedLayout = $layout->debug($displayData);
 
-		return $renderedLayout;
+		return $layout->debug($displayData);
 	}
 
 	/**
@@ -69,8 +68,7 @@ public static function render($layoutFile, $displayData = null, $basePath = '',
 		// Make sure we send null to JLayoutFile if no path set
 		$basePath = empty($basePath) ? null : $basePath;
 		$layout = new JLayoutFile($layoutFile, $basePath, $options);
-		$renderedLayout = $layout->render($displayData);
 
-		return $renderedLayout;
+		return $layout->render($displayData);
 	}
 }
diff --git a/libraries/cms/library/helper.php b/libraries/cms/library/helper.php
index 65fb44582223f..f34ee2ec0b14f 100644
--- a/libraries/cms/library/helper.php
+++ b/libraries/cms/library/helper.php
@@ -69,9 +69,7 @@ public static function getLibrary($element, $strict = false)
 	 */
 	public static function isEnabled($element)
 	{
-		$result = static::getLibrary($element, true);
-
-		return $result->enabled;
+		return static::getLibrary($element, true)->enabled;
 	}
 
 	/**
@@ -87,9 +85,7 @@ public static function isEnabled($element)
 	 */
 	public static function getParams($element, $strict = false)
 	{
-		$library = static::getLibrary($element, $strict);
-
-		return $library->params;
+		return static::getLibrary($element, $strict)->params;
 	}
 
 	/**
diff --git a/libraries/cms/menu/menu.php b/libraries/cms/menu/menu.php
index cdade25890ab4..079bd28bd3679 100644
--- a/libraries/cms/menu/menu.php
+++ b/libraries/cms/menu/menu.php
@@ -229,9 +229,8 @@ public function setActive($id)
 		if (isset($this->_items[$id]))
 		{
 			$this->_active = $id;
-			$result = &$this->_items[$id];
 
-			return $result;
+			return $this->_items[$id];
 		}
 
 		return;
@@ -248,9 +247,7 @@ public function getActive()
 	{
 		if ($this->_active)
 		{
-			$item = &$this->_items[$this->_active];
-
-			return $item;
+			return $this->_items[$this->_active];
 		}
 
 		return;
diff --git a/libraries/cms/ucm/content.php b/libraries/cms/ucm/content.php
index fbc1c77c17371..b9d3e0225ace5 100644
--- a/libraries/cms/ucm/content.php
+++ b/libraries/cms/ucm/content.php
@@ -227,8 +227,7 @@ public function getPrimaryKey($typeId, $contentItemId)
 				)
 			);
 		$db->setQuery($queryccid);
-		$primaryKey = $db->loadResult();
 
-		return $primaryKey;
+		return $db->loadResult();
 	}
 }
diff --git a/libraries/cms/ucm/type.php b/libraries/cms/ucm/type.php
index 545435e344a90..bfbe6a74f7830 100644
--- a/libraries/cms/ucm/type.php
+++ b/libraries/cms/ucm/type.php
@@ -116,9 +116,7 @@ public function getType($pk = null)
 		$query->where($this->db->quoteName('ct.type_id') . ' = ' . (int) $pk);
 		$this->db->setQuery($query);
 
-		$type = $this->db->loadObject();
-
-		return $type;
+		return $this->db->loadObject();
 	}
 
 	/**
@@ -139,9 +137,7 @@ public function getTypeByAlias($typeAlias = null)
 
 		$this->db->setQuery($query);
 
-		$type = $this->db->loadObject();
-
-		return $type;
+		return $this->db->loadObject();
 	}
 
 	/**

From 062ef22f7608f82d7fe47cfe9f6b20ea13d0e1e1 Mon Sep 17 00:00:00 2001
From: frank <frank@frankmayer.net>
Date: Sun, 25 Sep 2016 23:12:14 +0300
Subject: [PATCH 22/43] Codesniffer...

---
 libraries/cms/installer/adapter/package.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/cms/installer/adapter/package.php b/libraries/cms/installer/adapter/package.php
index 3c5ea839b7d57..de9daf4577aed 100644
--- a/libraries/cms/installer/adapter/package.php
+++ b/libraries/cms/installer/adapter/package.php
@@ -652,8 +652,10 @@ protected function _getExtensionId($type, $id, $client, $group)
 		}
 
 		$db->setQuery($query);
+
 		// Note: For templates, libraries and packages their unique name is their key.
 		// This means they come out the same way they came in.
+
 		return $db->loadResult();
 	}
 

From 1bc9d8f333c22cc09e3574b72e9165c7364413c3 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Wed, 28 Sep 2016 21:29:12 +0300
Subject: [PATCH 23/43] Flipped comparisons `null === ...`  to Joomla Style
 `... === null` `null !== ...`  to Joomla Style `... !== null`

---
 libraries/cms/application/cms.php       |  8 ++++----
 libraries/cms/application/helper.php    |  2 +-
 libraries/cms/captcha/captcha.php       |  4 ++--
 libraries/cms/editor/editor.php         |  8 ++++----
 libraries/cms/form/field/editor.php     |  2 +-
 libraries/cms/form/field/tag.php        |  2 +-
 libraries/cms/form/rule/notequals.php   |  2 +-
 libraries/cms/help/help.php             |  2 +-
 libraries/cms/helper/content.php        |  2 +-
 libraries/cms/helper/route.php          |  2 +-
 libraries/cms/helper/usergroups.php     |  4 ++--
 libraries/cms/html/access.php           |  2 +-
 libraries/cms/html/bootstrap.php        |  4 ++--
 libraries/cms/html/date.php             |  2 +-
 libraries/cms/html/html.php             |  2 +-
 libraries/cms/html/menu.php             |  4 ++--
 libraries/cms/html/sortablelist.php     |  2 +-
 libraries/cms/installer/installer.php   |  4 ++--
 libraries/cms/layout/file.php           |  2 +-
 libraries/cms/module/helper.php         |  6 +++---
 libraries/cms/pagination/pagination.php | 14 +++++++-------
 libraries/cms/plugin/helper.php         |  2 +-
 libraries/cms/plugin/plugin.php         |  4 ++--
 libraries/cms/response/json.php         |  2 +-
 libraries/cms/router/site.php           |  2 +-
 libraries/cms/table/contenthistory.php  |  6 +++---
 26 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/libraries/cms/application/cms.php b/libraries/cms/application/cms.php
index 8ddfd36a00021..6ec5698886771 100644
--- a/libraries/cms/application/cms.php
+++ b/libraries/cms/application/cms.php
@@ -114,13 +114,13 @@ public function __construct(JInput $input = null, Registry $config = null, JAppl
 		}
 
 		// Enable sessions by default.
-		if (null === $this->config->get('session'))
+		if ($this->config->get('session') === null)
 		{
 			$this->config->set('session', true);
 		}
 
 		// Set the session default name.
-		if (null === $this->config->get('session_name'))
+		if ($this->config->get('session_name') === null)
 		{
 			$this->config->set('session_name', $this->getName());
 		}
@@ -581,7 +581,7 @@ public function getUserState($key, $default = null)
 		$session = JFactory::getSession();
 		$registry = $session->get('registry');
 
-		if (null !== $registry)
+		if ($registry !== null)
 		{
 			return $registry->get($key, $default);
 		}
@@ -1137,7 +1137,7 @@ public function setUserState($key, $value)
 		$session = JFactory::getSession();
 		$registry = $session->get('registry');
 
-		if (null !== $registry)
+		if ($registry !== null)
 		{
 			return $registry->set($key, $value);
 		}
diff --git a/libraries/cms/application/helper.php b/libraries/cms/application/helper.php
index 5cf17ff97106f..3d96bf6f1ed83 100644
--- a/libraries/cms/application/helper.php
+++ b/libraries/cms/application/helper.php
@@ -141,7 +141,7 @@ public static function getClientInfo($id = null, $byName = false)
 		}
 
 		// If no client id has been passed return the whole array
-		if (null === $id)
+		if ($id === null)
 		{
 			return self::$_clients;
 		}
diff --git a/libraries/cms/captcha/captcha.php b/libraries/cms/captcha/captcha.php
index 93321be19d679..3d0fbc9ffb642 100644
--- a/libraries/cms/captcha/captcha.php
+++ b/libraries/cms/captcha/captcha.php
@@ -157,7 +157,7 @@ public function initialise($id)
 	public function display($name, $id, $class = '')
 	{
 		// Check if captcha is already loaded.
-		if (null === $this->_captcha)
+		if ($this->_captcha === null)
 		{
 			return;
 		}
@@ -188,7 +188,7 @@ public function display($name, $id, $class = '')
 	public function checkAnswer($code)
 	{
 		// Check if captcha is already loaded
-		if (null === ($this->_captcha))
+		if ($this->_captcha === null)
 		{
 			return;
 		}
diff --git a/libraries/cms/editor/editor.php b/libraries/cms/editor/editor.php
index 02c5bb42ed144..e9ea79bd788b8 100644
--- a/libraries/cms/editor/editor.php
+++ b/libraries/cms/editor/editor.php
@@ -240,7 +240,7 @@ public function detach($observer)
 	public function initialise()
 	{
 		// Check if editor is already loaded
-		if (null === ($this->_editor))
+		if ($this->_editor === null)
 		{
 			return;
 		}
@@ -293,7 +293,7 @@ public function display($name, $html, $width, $height, $col, $row, $buttons = tr
 		$this->_loadEditor($params);
 
 		// Check whether editor is already loaded
-		if (null === ($this->_editor))
+		if ($this->_editor === null)
 		{
 			JFactory::getApplication()->enqueueMessage(JText::_('JLIB_NO_EDITOR_PLUGIN_PUBLISHED'), 'error');
 
@@ -344,7 +344,7 @@ public function save($editor)
 		$this->_loadEditor();
 
 		// Check whether editor is already loaded
-		if (null === ($this->_editor))
+		if ($this->_editor === null)
 		{
 			return;
 		}
@@ -508,7 +508,7 @@ public function getButtons($editor, $buttons = true)
 	protected function _loadEditor($config = array())
 	{
 		// Check whether editor is already loaded
-		if (null !== ($this->_editor))
+		if ($this->_editor !== null)
 		{
 			return;
 		}
diff --git a/libraries/cms/form/field/editor.php b/libraries/cms/form/field/editor.php
index 1dba3aafcc279..2a706249d4190 100644
--- a/libraries/cms/form/field/editor.php
+++ b/libraries/cms/form/field/editor.php
@@ -296,7 +296,7 @@ protected function getEditor()
 			}
 
 			// Create the JEditor instance based on the given editor.
-			if (null === $editor)
+			if ($editor === null)
 			{
 				$conf = JFactory::getConfig();
 				$editor = $conf->get('editor');
diff --git a/libraries/cms/form/field/tag.php b/libraries/cms/form/field/tag.php
index 4e7d6bca4b403..e7a3d4f8b0951 100644
--- a/libraries/cms/form/field/tag.php
+++ b/libraries/cms/form/field/tag.php
@@ -213,7 +213,7 @@ protected function prepareOptionsNested(&$options)
 	 */
 	public function isNested()
 	{
-		if (null === $this->isNested)
+		if ($this->isNested === null)
 		{
 			// If mode="nested" || ( mode not set & config = nested )
 			if ((isset($this->element['mode']) && $this->element['mode'] == 'nested')
diff --git a/libraries/cms/form/rule/notequals.php b/libraries/cms/form/rule/notequals.php
index 615461086028c..f25cfe86beb0f 100644
--- a/libraries/cms/form/rule/notequals.php
+++ b/libraries/cms/form/rule/notequals.php
@@ -47,7 +47,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry
 			throw new UnexpectedValueException(sprintf('$field empty in %s::test', get_class($this)));
 		}
 
-		if (null === $input)
+		if ($input === null)
 		{
 			throw new InvalidArgumentException(sprintf('The value for $input must not be null in %s', get_class($this)));
 		}
diff --git a/libraries/cms/help/help.php b/libraries/cms/help/help.php
index 4ddccbaaaf68e..7176fb2e05389 100644
--- a/libraries/cms/help/help.php
+++ b/libraries/cms/help/help.php
@@ -33,7 +33,7 @@ public static function createUrl($ref, $useComponent = false, $override = null,
 		$local = false;
 		$app   = JFactory::getApplication();
 
-		if (null === $component)
+		if ($component === null)
 		{
 			$component = JApplicationHelper::getComponentName();
 		}
diff --git a/libraries/cms/helper/content.php b/libraries/cms/helper/content.php
index 00d038405f79c..110d3b2433f09 100644
--- a/libraries/cms/helper/content.php
+++ b/libraries/cms/helper/content.php
@@ -93,7 +93,7 @@ public static function _getActions($categoryId = 0, $id = 0, $assetName = '')
 	public static function getActions($component = '', $section = '', $id = 0)
 	{
 		// Check for deprecated arguments order
-		if (is_int($component) || null === $component)
+		if (is_int($component) || $component === null)
 		{
 			$result = self::_getActions($component, $section, $id);
 
diff --git a/libraries/cms/helper/route.php b/libraries/cms/helper/route.php
index 442d6266eb186..1e9fcfe37c28b 100644
--- a/libraries/cms/helper/route.php
+++ b/libraries/cms/helper/route.php
@@ -134,7 +134,7 @@ protected function findItem($needles = array())
 		$language = isset($needles['language']) ? $needles['language'] : '*';
 
 		// $this->extension may not be set if coming from a static method, check it
-		if (null === $this->extension)
+		if ($this->extension === null)
 		{
 			$this->extension = $app->input->getCmd('option');
 		}
diff --git a/libraries/cms/helper/usergroups.php b/libraries/cms/helper/usergroups.php
index 2f1b12dc5c328..1fe9c878c9437 100644
--- a/libraries/cms/helper/usergroups.php
+++ b/libraries/cms/helper/usergroups.php
@@ -99,7 +99,7 @@ public function count()
 	 */
 	public static function getInstance()
 	{
-		if (null === static::$instance)
+		if (static::$instance === null)
 		{
 			// Only here to avoid code style issues...
 			$groups = array();
@@ -189,7 +189,7 @@ private function isSingleton()
 	 */
 	public function total()
 	{
-		if (null === $this->total)
+		if ($this->total === null)
 		{
 			$db = JFactory::getDbo();
 
diff --git a/libraries/cms/html/access.php b/libraries/cms/html/access.php
index 300aba42efa3c..050402cc195ca 100644
--- a/libraries/cms/html/access.php
+++ b/libraries/cms/html/access.php
@@ -272,7 +272,7 @@ public static function assetgrouplist($name, $selected, $attribs = null, $config
 			$name,
 			array(
 				'id' => isset($config['id']) ? $config['id'] : 'assetgroups_' . (++$count),
-				'list.attr' => (null === $attribs ? 'class="inputbox" size="3"' : $attribs),
+				'list.attr' => ($attribs === null ? 'class="inputbox" size="3"' : $attribs),
 				'list.select' => (int) $selected,
 			)
 		);
diff --git a/libraries/cms/html/bootstrap.php b/libraries/cms/html/bootstrap.php
index 33dd06da80937..1f7b8e34fd525 100644
--- a/libraries/cms/html/bootstrap.php
+++ b/libraries/cms/html/bootstrap.php
@@ -763,8 +763,8 @@ public static function addTab($selector, $id, $title)
 		static $tabScriptLayout = null;
 		static $tabLayout = null;
 
-		$tabScriptLayout = null === $tabScriptLayout ? new JLayoutFile('libraries.cms.html.bootstrap.addtabscript') : $tabScriptLayout;
-		$tabLayout = null === $tabLayout ? new JLayoutFile('libraries.cms.html.bootstrap.addtab') : $tabLayout;
+		$tabScriptLayout = $tabScriptLayout === null ? new JLayoutFile('libraries.cms.html.bootstrap.addtabscript') : $tabScriptLayout;
+		$tabLayout = $tabLayout === null ? new JLayoutFile('libraries.cms.html.bootstrap.addtab') : $tabLayout;
 
 		$active = (static::$loaded['JHtmlBootstrap::startTabSet'][$selector]['active'] == $id) ? ' active' : '';
 
diff --git a/libraries/cms/html/date.php b/libraries/cms/html/date.php
index 14a0c60d2ba9e..c3eb43e91be5e 100644
--- a/libraries/cms/html/date.php
+++ b/libraries/cms/html/date.php
@@ -30,7 +30,7 @@ abstract class JHtmlDate
 	 */
 	public static function relative($date, $unit = null, $time = null)
 	{
-		if (null === $time)
+		if ($time === null)
 		{
 			// Get now
 			$time = new JDate('now');
diff --git a/libraries/cms/html/html.php b/libraries/cms/html/html.php
index edda3c78cb13a..c4438c74067d0 100644
--- a/libraries/cms/html/html.php
+++ b/libraries/cms/html/html.php
@@ -1074,7 +1074,7 @@ public static function getJSObject(array $array = array())
 		foreach ($array as $k => $v)
 		{
 			// Don't encode either of these types
-			if (null === $v || is_resource($v))
+			if ($v === null || is_resource($v))
 			{
 				continue;
 			}
diff --git a/libraries/cms/html/menu.php b/libraries/cms/html/menu.php
index e86845390f55a..4768226ee5b0b 100644
--- a/libraries/cms/html/menu.php
+++ b/libraries/cms/html/menu.php
@@ -41,7 +41,7 @@ abstract class JHtmlMenu
 	 */
 	public static function menus()
 	{
-		if (null === static::$menus)
+		if (static::$menus === null)
 		{
 			$db = JFactory::getDbo();
 
@@ -174,7 +174,7 @@ public static function menuitemlist($name, $selected = null, $attribs = null, $c
 			'select.genericlist', $options, $name,
 			array(
 				'id' => isset($config['id']) ? $config['id'] : 'assetgroups_' . (++$count),
-				'list.attr' => (null === $attribs ? 'class="inputbox" size="1"' : $attribs),
+				'list.attr' => ($attribs === null ? 'class="inputbox" size="1"' : $attribs),
 				'list.select' => (int) $selected,
 				'list.translate' => false,
 			)
diff --git a/libraries/cms/html/sortablelist.php b/libraries/cms/html/sortablelist.php
index a31f9dc093231..d5fe46065ff86 100644
--- a/libraries/cms/html/sortablelist.php
+++ b/libraries/cms/html/sortablelist.php
@@ -47,7 +47,7 @@ public static function sortable($tableId, $formId, $sortDir = 'asc', $saveOrderi
 		}
 
 		// Note: $i is required but has to be an optional argument in the function call due to argument order
-		if (null === $saveOrderingUrl)
+		if ($saveOrderingUrl === null)
 		{
 			throw new InvalidArgumentException('$saveOrderingUrl is a required argument in JHtmlSortablelist::sortable');
 		}
diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
index d17d402780227..92c34227919c4 100644
--- a/libraries/cms/installer/installer.php
+++ b/libraries/cms/installer/installer.php
@@ -1593,7 +1593,7 @@ public function copyFiles($files, $overwrite = null)
 		 * allowOverwrite flag.
 		 */
 
-		if (null === $overwrite || !is_bool($overwrite))
+		if ($overwrite === null || !is_bool($overwrite))
 		{
 			$overwrite = $this->overwrite;
 		}
@@ -1907,7 +1907,7 @@ public function findManifest()
 				// Is it a valid Joomla installation manifest file?
 				$manifest = $this->isManifest($file);
 
-				if (null !== $manifest)
+				if ($manifest !== null)
 				{
 					// If the root method attribute is set to upgrade, allow file overwrite
 					if ((string) $manifest->attributes()->method == 'upgrade')
diff --git a/libraries/cms/layout/file.php b/libraries/cms/layout/file.php
index 42bd0ff9192c8..1526c7734a2ac 100644
--- a/libraries/cms/layout/file.php
+++ b/libraries/cms/layout/file.php
@@ -572,7 +572,7 @@ public function getDefaultIncludePaths()
 		$paths = array();
 
 		// (1 - highest priority) Received a custom high priority path
-		if (null !== $this->basePath)
+		if ($this->basePath !== null)
 		{
 			$paths[] = rtrim($this->basePath, DIRECTORY_SEPARATOR);
 		}
diff --git a/libraries/cms/module/helper.php b/libraries/cms/module/helper.php
index 8aa4b71bc4bc1..6b538a8460863 100644
--- a/libraries/cms/module/helper.php
+++ b/libraries/cms/module/helper.php
@@ -50,7 +50,7 @@ public static function &getModule($name, $title = null)
 		}
 
 		// If we didn't find it, and the name is mod_something, create a dummy object
-		if (null === $result && 0 === strpos($name, 'mod_'))
+		if ($result === null && 0 === strpos($name, 'mod_'))
 		{
 			$result            = new stdClass;
 			$result->id        = 0;
@@ -123,7 +123,7 @@ public static function isEnabled($module)
 	{
 		$result = static::getModule($module);
 
-		return null !== $result && $result->id !== 0;
+		return $result !== null && $result->id !== 0;
 	}
 
 	/**
@@ -243,7 +243,7 @@ public static function renderModule($module, $attribs = array())
 		// If the $module is nulled it will return an empty content, otherwise it will render the module normally.
 		$app->triggerEvent('onRenderModule', array(&$module, &$attribs));
 
-		if (null === $module || !isset($module->content))
+		if ($module === null || !isset($module->content))
 		{
 			return '';
 		}
diff --git a/libraries/cms/pagination/pagination.php b/libraries/cms/pagination/pagination.php
index 9edc7caf2b0ba..c9a9331ebbfc8 100644
--- a/libraries/cms/pagination/pagination.php
+++ b/libraries/cms/pagination/pagination.php
@@ -437,7 +437,7 @@ public function getPagesLinks()
 	public function getPaginationLinks($layoutId = 'joomla.pagination.links', $options = array())
 	{
 		// Allow to receive a null layout
-		$layoutId = (null === $layoutId) ? 'joomla.pagination.links' : $layoutId;
+		$layoutId = ($layoutId === null) ? 'joomla.pagination.links' : $layoutId;
 
 		$list = array(
 			'prefix'       => $this->prefix,
@@ -469,15 +469,15 @@ public function getPaginationPages()
 			$data = $this->_buildDataObject();
 
 			// All
-			$list['all']['active'] = (null !== $data->all->base);
+			$list['all']['active'] = ($data->all->base !== null);
 			$list['all']['data']   = $data->all;
 
 			// Start
-			$list['start']['active'] = (null !== $data->start->base);
+			$list['start']['active'] = ($data->start->base !== null);
 			$list['start']['data']   = $data->start;
 
 			// Previous link
-			$list['previous']['active'] = (null !== $data->previous->base);
+			$list['previous']['active'] = ($data->previous->base !== null);
 			$list['previous']['data']   = $data->previous;
 
 			// Make sure it exists
@@ -485,14 +485,14 @@ public function getPaginationPages()
 
 			foreach ($data->pages as $i => $page)
 			{
-				$list['pages'][$i]['active'] = (null !== $page->base);
+				$list['pages'][$i]['active'] = ($page->base !== null);
 				$list['pages'][$i]['data']   = $page;
 			}
 
-			$list['next']['active'] = (null !== $data->next->base);
+			$list['next']['active'] = ($data->next->base !== null);
 			$list['next']['data']   = $data->next;
 
-			$list['end']['active'] = (null !== $data->end->base);
+			$list['end']['active'] = ($data->end->base !== null);
 			$list['end']['data']   = $data->end;
 		}
 
diff --git a/libraries/cms/plugin/helper.php b/libraries/cms/plugin/helper.php
index b81a310376015..a4096a9989be1 100644
--- a/libraries/cms/plugin/helper.php
+++ b/libraries/cms/plugin/helper.php
@@ -150,7 +150,7 @@ public static function importPlugin($type, $plugin = null, $autocreate = true, J
 		// Check for the default args, if so we can optimise cheaply
 		$defaults = false;
 
-		if (null === $plugin && $autocreate == true && null === $dispatcher)
+		if ($plugin === null && $autocreate == true && $dispatcher === null)
 		{
 			$defaults = true;
 		}
diff --git a/libraries/cms/plugin/plugin.php b/libraries/cms/plugin/plugin.php
index af328baa9e0d0..7759aa68b7ab8 100644
--- a/libraries/cms/plugin/plugin.php
+++ b/libraries/cms/plugin/plugin.php
@@ -99,7 +99,7 @@ public function __construct(&$subject, $config = array())
 			$reflection = new ReflectionClass($this);
 			$appProperty = $reflection->getProperty('app');
 
-			if ($appProperty->isPrivate() === false && null === $this->app)
+			if ($appProperty->isPrivate() === false && $this->app === null)
 			{
 				$this->app = JFactory::getApplication();
 			}
@@ -110,7 +110,7 @@ public function __construct(&$subject, $config = array())
 			$reflection = new ReflectionClass($this);
 			$dbProperty = $reflection->getProperty('db');
 
-			if ($dbProperty->isPrivate() === false && null === $this->db)
+			if ($dbProperty->isPrivate() === false && $this->db === null)
 			{
 				$this->db = JFactory::getDbo();
 			}
diff --git a/libraries/cms/response/json.php b/libraries/cms/response/json.php
index 4d93123bd553e..551ef73277560 100644
--- a/libraries/cms/response/json.php
+++ b/libraries/cms/response/json.php
@@ -68,7 +68,7 @@ public function __construct($response = null, $message = null, $error = false, $
 		// Get the message queue if requested and available
 		$app = JFactory::getApplication();
 
-		if (!$ignoreMessages && null !== $app && is_callable(array($app, 'getMessageQueue')))
+		if (!$ignoreMessages && $app !== null && is_callable(array($app, 'getMessageQueue')))
 		{
 			$messages = $app->getMessageQueue();
 
diff --git a/libraries/cms/router/site.php b/libraries/cms/router/site.php
index 8cbf66e4bbc07..cf8ab62f398fc 100644
--- a/libraries/cms/router/site.php
+++ b/libraries/cms/router/site.php
@@ -673,7 +673,7 @@ protected function createUri($url)
 		// Get the itemid form the URI
 		$itemid = $uri->getVar('Itemid');
 
-		if (null === $itemid)
+		if ($itemid === null)
 		{
 			if ($option = $uri->getVar('option'))
 			{
diff --git a/libraries/cms/table/contenthistory.php b/libraries/cms/table/contenthistory.php
index 41adc734740a6..8ae796042b5a4 100644
--- a/libraries/cms/table/contenthistory.php
+++ b/libraries/cms/table/contenthistory.php
@@ -80,7 +80,7 @@ public function store($updateNulls = false)
 		}
 
 		// Modify author and date only when not toggling Keep Forever
-		if (null === $this->get('keep_forever'))
+		if ($this->get('keep_forever') === null)
 		{
 			$this->set('editor_user_id', JFactory::getUser()->id);
 			$this->set('save_date', JFactory::getDate()->toSql());
@@ -127,12 +127,12 @@ public function getSha1($jsonData, JTableContenttype $typeTable)
 				// Go one level down for JSON column values
 				foreach ($value as $subName => $subValue)
 				{
-					$object->$subName = (is_int($subValue) || is_bool($subValue) || null === $subValue) ? (string) $subValue : $subValue;
+					$object->$subName = (is_int($subValue) || is_bool($subValue) || $subValue === null) ? (string) $subValue : $subValue;
 				}
 			}
 			else
 			{
-				$object->$name = (is_int($value) || is_bool($value) || null === $value) ? (string) $value : $value;
+				$object->$name = (is_int($value) || is_bool($value) || $value === null) ? (string) $value : $value;
 			}
 		}
 

From 7d287f0222e5a792bbde158797cf26a6cff65140 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Thu, 29 Sep 2016 00:08:04 +0300
Subject: [PATCH 24/43] Flipped comparisons `false !== ...`  to Joomla Style
 `... !== falsel`

---
 libraries/cms/helper/media.php      | 4 ++--
 libraries/cms/helper/usergroups.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/cms/helper/media.php b/libraries/cms/helper/media.php
index 9a376ea035a3a..7672c24af8aeb 100644
--- a/libraries/cms/helper/media.php
+++ b/libraries/cms/helper/media.php
@@ -206,7 +206,7 @@ public function canUpload($file, $component = 'com_media')
 		foreach ($html_tags as $tag)
 		{
 			// A tag is '<tagname ', so we need to add < and a space or '<tagname>'
-			if (false !== stripos($xss_check, '<' . $tag . ' ') || false !== stripos($xss_check, '<' . $tag . '>'))
+			if (stripos($xss_check, '<' . $tag . ' ') !== false || stripos($xss_check, '<' . $tag . '>') !== false)
 			{
 				$app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNIEXSS'), 'notice');
 
@@ -269,7 +269,7 @@ public function countFiles($dir)
 		{
 			$d = dir($dir);
 
-			while (false !== ($entry = $d->read()))
+			while (($entry = $d->read()) !== false)
 			{
 				if ($entry[0] !== '.' && is_file($dir . DIRECTORY_SEPARATOR . $entry)
 					&& strpos($entry, '.html') === false && strpos($entry, '.php') === false)
diff --git a/libraries/cms/helper/usergroups.php b/libraries/cms/helper/usergroups.php
index 1fe9c878c9437..93b4d772bd8b5 100644
--- a/libraries/cms/helper/usergroups.php
+++ b/libraries/cms/helper/usergroups.php
@@ -165,7 +165,7 @@ public function getAll()
 	 */
 	public function has($id)
 	{
-		return (array_key_exists($id, $this->groups) && false !== $this->groups[$id]);
+		return (array_key_exists($id, $this->groups) && $this->groups[$id] !== false);
 	}
 
 	/**

From 53d48542822265d4727e679d6ec92fee87f82075 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Thu, 29 Sep 2016 02:04:56 +0300
Subject: [PATCH 25/43] Fix removal of ternary operator. Forgot inversion.

---
 libraries/cms/html/tabs.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/cms/html/tabs.php b/libraries/cms/html/tabs.php
index 874e4453935ee..932d917d50d4d 100644
--- a/libraries/cms/html/tabs.php
+++ b/libraries/cms/html/tabs.php
@@ -87,7 +87,7 @@ protected static function loadBehavior($group, $params = array())
 			$opt['descriptionSelector'] = "dd.tabs";
 
 			// When use storage is set and value is false - By default we allow to use storage
-			$opt['useStorage'] = (isset($params['useCookie']) && !$params['useCookie']);
+			$opt['useStorage'] = !(isset($params['useCookie']) && !$params['useCookie']);
 
 			$options = JHtml::getJSObject($opt);
 

From 5f6d634930967ef1cf5b662c46290fb214a1053c Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Thu, 29 Sep 2016 02:14:24 +0300
Subject: [PATCH 26/43] More flipping of  comparisons ;)

---
 libraries/cms/installer/adapter/component.php  | 2 +-
 libraries/cms/module/helper.php                | 2 +-
 libraries/cms/schema/changeitem/mysql.php      | 7 ++++---
 libraries/cms/schema/changeitem/postgresql.php | 2 +-
 libraries/cms/schema/changeitem/sqlsrv.php     | 2 +-
 libraries/cms/toolbar/button/popup.php         | 2 +-
 libraries/cms/toolbar/button/slider.php        | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/libraries/cms/installer/adapter/component.php b/libraries/cms/installer/adapter/component.php
index bc491bd3cd190..8a90dc5d45f74 100644
--- a/libraries/cms/installer/adapter/component.php
+++ b/libraries/cms/installer/adapter/component.php
@@ -356,7 +356,7 @@ public function getElement($element = null)
 	{
 		$element = parent::getElement($element);
 
-		if (0 !== strpos($element, 'com_'))
+		if (strpos($element, 'com_') !== 0)
 		{
 			$element = 'com_' . $element;
 		}
diff --git a/libraries/cms/module/helper.php b/libraries/cms/module/helper.php
index 6b538a8460863..58da5a66f246a 100644
--- a/libraries/cms/module/helper.php
+++ b/libraries/cms/module/helper.php
@@ -50,7 +50,7 @@ public static function &getModule($name, $title = null)
 		}
 
 		// If we didn't find it, and the name is mod_something, create a dummy object
-		if ($result === null && 0 === strpos($name, 'mod_'))
+		if ($result === null && strpos($name, 'mod_') === 0)
 		{
 			$result            = new stdClass;
 			$result->id        = 0;
diff --git a/libraries/cms/schema/changeitem/mysql.php b/libraries/cms/schema/changeitem/mysql.php
index 3033c54d58a9d..705710e933690 100644
--- a/libraries/cms/schema/changeitem/mysql.php
+++ b/libraries/cms/schema/changeitem/mysql.php
@@ -63,7 +63,8 @@ protected function buildCheckQuery()
 		if (($command == 'UPDATE `#__UTF8_CONVERSION`'
 			|| $command == 'UPDATE #__UTF8_CONVERSION')
 			&& strtoupper($wordArray[2]) == 'SET'
-			&& 0 === stripos(str_replace('`', '', $wordArray[3]), 'converted'))
+			&& stripos(str_replace('`', '', $wordArray[3]), 'converted') === 0
+		)
 		{
 			// Statement is special statement to reset conversion status
 			$this->queryType = 'UTF8CNV';
@@ -229,11 +230,11 @@ private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
 
-		if (strtolower($type1) == "integer" && 0 === stripos($type2, 'unsigned'))
+		if (strtolower($type1) == "integer" && stripos($type2, 'unsigned') === 0)
 		{
 			$result = 'int(10) unsigned';
 		}
-		elseif (0 === stripos($type2, 'unsigned'))
+		elseif (stripos($type2, 'unsigned') === 0)
 		{
 			$result = $type1 . ' unsigned';
 		}
diff --git a/libraries/cms/schema/changeitem/postgresql.php b/libraries/cms/schema/changeitem/postgresql.php
index 9ddf03651bfbc..5f0538a787678 100644
--- a/libraries/cms/schema/changeitem/postgresql.php
+++ b/libraries/cms/schema/changeitem/postgresql.php
@@ -232,7 +232,7 @@ private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
 
-		if (strtolower($type1) == 'integer' && 0 === stripos($type2, 'unsigned'))
+		if (strtolower($type1) == 'integer' && stripos($type2, 'unsigned') === 0)
 		{
 			$result = 'unsigned int(10)';
 		}
diff --git a/libraries/cms/schema/changeitem/sqlsrv.php b/libraries/cms/schema/changeitem/sqlsrv.php
index 1b31af04ec1d4..a0c4155c1e6ed 100644
--- a/libraries/cms/schema/changeitem/sqlsrv.php
+++ b/libraries/cms/schema/changeitem/sqlsrv.php
@@ -121,7 +121,7 @@ private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
 
-		if (strtolower($type1) == 'integer' && 0 === stripos($type2, 'unsigned'))
+		if (strtolower($type1) == 'integer' && stripos($type2, 'unsigned') === 0)
 		{
 			$result = 'int';
 		}
diff --git a/libraries/cms/toolbar/button/popup.php b/libraries/cms/toolbar/button/popup.php
index 1b587b0dbb827..eb1390a8aa9f1 100644
--- a/libraries/cms/toolbar/button/popup.php
+++ b/libraries/cms/toolbar/button/popup.php
@@ -121,7 +121,7 @@ public function fetchId($type, $name)
 	 */
 	private function _getCommand($url)
 	{
-		if (0 !== strpos($url, 'http'))
+		if (strpos($url, 'http') !== 0)
 		{
 			$url = JUri::base() . $url;
 		}
diff --git a/libraries/cms/toolbar/button/slider.php b/libraries/cms/toolbar/button/slider.php
index e32d44b243289..193ca6e4f6e6e 100644
--- a/libraries/cms/toolbar/button/slider.php
+++ b/libraries/cms/toolbar/button/slider.php
@@ -89,7 +89,7 @@ public function fetchId($type, $name)
 	 */
 	private function _getCommand($url)
 	{
-		if (0 !== strpos($url, 'http'))
+		if (strpos($url, 'http') !== 0)
 		{
 			$url = JUri::base() . $url;
 		}

From 2e2df199f13b327bbda58db02f7fe85a87246d47 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Thu, 29 Sep 2016 02:29:28 +0300
Subject: [PATCH 27/43] Removed another unnecessary set of ternary operators.

---
 libraries/cms/html/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/cms/html/bootstrap.php b/libraries/cms/html/bootstrap.php
index 1f7b8e34fd525..1fb80a12ed88f 100644
--- a/libraries/cms/html/bootstrap.php
+++ b/libraries/cms/html/bootstrap.php
@@ -598,7 +598,7 @@ public static function startAccordion($selector = 'myAccordian', $params = array
 
 			// Setup options object
 			$opt['parent'] = isset($params['parent']) ? ($params['parent'] == true ? '#' . $selector : $params['parent']) : false;
-			$opt['toggle'] = isset($params['toggle']) ? (boolean) $params['toggle'] : ($opt['parent'] === false || isset($params['active']) ? false : true);
+			$opt['toggle'] = isset($params['toggle']) ? (boolean) $params['toggle'] : !($opt['parent'] === false || isset($params['active']));
 			$onShow = isset($params['onShow']) ? (string) $params['onShow'] : null;
 			$onShown = isset($params['onShown']) ? (string) $params['onShown'] : null;
 			$onHide = isset($params['onHide']) ? (string) $params['onHide'] : null;

From 6b3e0fbbb2774bef40678485794b3ff6a7536dd2 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Thu, 29 Sep 2016 02:39:34 +0300
Subject: [PATCH 28/43] Codesniffer...

---
 libraries/cms/schema/changeitem/mysql.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/cms/schema/changeitem/mysql.php b/libraries/cms/schema/changeitem/mysql.php
index 705710e933690..0dfb6a986d3f3 100644
--- a/libraries/cms/schema/changeitem/mysql.php
+++ b/libraries/cms/schema/changeitem/mysql.php
@@ -63,8 +63,7 @@ protected function buildCheckQuery()
 		if (($command == 'UPDATE `#__UTF8_CONVERSION`'
 			|| $command == 'UPDATE #__UTF8_CONVERSION')
 			&& strtoupper($wordArray[2]) == 'SET'
-			&& stripos(str_replace('`', '', $wordArray[3]), 'converted') === 0
-		)
+			&& stripos(str_replace('`', '', $wordArray[3]), 'converted') === 0)
 		{
 			// Statement is special statement to reset conversion status
 			$this->queryType = 'UTF8CNV';

From 171f66b0ee535c1103a5e7ee94b58ed8d8082e60 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 4 Oct 2016 06:04:16 +0300
Subject: [PATCH 29/43] Type-safe comparisons on strings

---
 libraries/cms/application/administrator.php   |  4 +--
 libraries/cms/application/cms.php             | 10 +++---
 libraries/cms/application/helper.php          |  4 +--
 libraries/cms/application/site.php            |  2 +-
 libraries/cms/component/helper.php            | 10 +++---
 libraries/cms/form/field/editor.php           |  8 ++---
 libraries/cms/form/field/limitbox.php         |  2 +-
 libraries/cms/form/field/tag.php              |  6 ++--
 libraries/cms/form/field/user.php             |  2 +-
 libraries/cms/form/rule/password.php          |  2 +-
 libraries/cms/helper/route.php                | 10 +++---
 libraries/cms/helper/tags.php                 | 10 +++---
 libraries/cms/html/behavior.php               |  4 +--
 libraries/cms/html/date.php                   |  8 ++---
 libraries/cms/html/grid.php                   |  8 ++---
 libraries/cms/html/html.php                   |  6 ++--
 libraries/cms/html/jgrid.php                  |  4 +--
 libraries/cms/html/number.php                 |  2 +-
 libraries/cms/html/searchtools.php            |  4 +--
 libraries/cms/html/string.php                 |  6 ++--
 libraries/cms/html/tel.php                    |  8 ++---
 libraries/cms/installer/adapter.php           | 14 ++++----
 libraries/cms/installer/adapter/component.php |  8 ++---
 libraries/cms/installer/adapter/file.php      |  8 ++---
 libraries/cms/installer/adapter/language.php  |  6 ++--
 libraries/cms/installer/adapter/library.php   |  6 ++--
 libraries/cms/installer/adapter/module.php    |  4 +--
 libraries/cms/installer/adapter/package.php   |  6 ++--
 libraries/cms/installer/adapter/plugin.php    | 14 ++++----
 libraries/cms/installer/adapter/template.php  |  8 ++---
 libraries/cms/installer/helper.php            |  2 +-
 libraries/cms/installer/installer.php         | 32 +++++++++----------
 libraries/cms/installer/script.php            |  4 +--
 libraries/cms/module/helper.php               |  2 +-
 libraries/cms/plugin/helper.php               |  2 +-
 libraries/cms/router/router.php               |  2 +-
 libraries/cms/router/site.php                 | 14 ++++----
 libraries/cms/schema/changeitem.php           |  4 +--
 libraries/cms/schema/changeitem/mysql.php     | 28 ++++++++--------
 .../cms/schema/changeitem/postgresql.php      | 18 +++++------
 libraries/cms/schema/changeitem/sqlsrv.php    | 10 +++---
 libraries/cms/schema/changeset.php            |  6 ++--
 libraries/cms/toolbar/button/standard.php     |  2 +-
 libraries/cms/ucm/content.php                 |  4 +--
 libraries/cms/version/version.php             |  2 +-
 45 files changed, 163 insertions(+), 163 deletions(-)

diff --git a/libraries/cms/application/administrator.php b/libraries/cms/application/administrator.php
index 7ae4816fc5064..65b040285e0a1 100644
--- a/libraries/cms/application/administrator.php
+++ b/libraries/cms/application/administrator.php
@@ -404,7 +404,7 @@ protected function render()
 		$component = $input->getCmd('option', 'com_login');
 		$file      = $input->getCmd('tmpl', 'index');
 
-		if ($component == 'com_login')
+		if ($component === 'com_login')
 		{
 			$file = 'login';
 		}
@@ -446,7 +446,7 @@ protected function route()
 	{
 		$uri = JUri::getInstance();
 
-		if ($this->get('force_ssl') >= 1 && strtolower($uri->getScheme()) != 'https')
+		if ($this->get('force_ssl') >= 1 && strtolower($uri->getScheme()) !== 'https')
 		{
 			// Forward to https
 			$uri->setScheme('https');
diff --git a/libraries/cms/application/cms.php b/libraries/cms/application/cms.php
index 6ec5698886771..a023c3a4d650d 100644
--- a/libraries/cms/application/cms.php
+++ b/libraries/cms/application/cms.php
@@ -268,7 +268,7 @@ public function execute()
 		}
 
 		// If gzip compression is enabled in configuration and the server is compliant, compress the output.
-		if ($this->get('gzip') && !ini_get('zlib.output_compression') && (ini_get('output_handler') != 'ob_gzhandler'))
+		if ($this->get('gzip') && !ini_get('zlib.output_compression') && (ini_get('output_handler') !== 'ob_gzhandler'))
 		{
 			$this->compress();
 
@@ -790,8 +790,8 @@ public function loadSession(JSession $session = null)
 		// Get the session handler from the configuration.
 		$handler = $this->get('session_handler', 'none');
 
-		if (($handler != 'database' && ($time % 2 || $session->isNew()))
-			|| ($handler == 'database' && $session->isNew()))
+		if (($handler !== 'database' && ($time % 2 || $session->isNew()))
+			|| ($handler === 'database' && $session->isNew()))
 		{
 			$this->checkSession();
 		}
@@ -881,7 +881,7 @@ public function login($credentials, $options = array())
 			 */
 			$user = JFactory::getUser();
 
-			if ($response->type == 'Cookie')
+			if ($response->type === 'Cookie')
 			{
 				$user->set('cookieLogin', true);
 			}
@@ -1157,7 +1157,7 @@ public function setUserState($key, $value)
 	public function toString($compress = false)
 	{
 		// Don't compress something if the server is going to do it anyway. Waste of time.
-		if ($compress && !ini_get('zlib.output_compression') && ini_get('output_handler') != 'ob_gzhandler')
+		if ($compress && !ini_get('zlib.output_compression') && ini_get('output_handler') !== 'ob_gzhandler')
 		{
 			$this->compress();
 		}
diff --git a/libraries/cms/application/helper.php b/libraries/cms/application/helper.php
index 3d96bf6f1ed83..9fcb5fb06ad14 100644
--- a/libraries/cms/application/helper.php
+++ b/libraries/cms/application/helper.php
@@ -89,7 +89,7 @@ public static function stringURLSafe($string, $language = '')
 		}
 		else
 		{
-			if ($language == '*' || $language == '')
+			if ($language === '*' || $language == '')
 			{
 				$languageParams = JComponentHelper::getParams('com_languages');
 				$language = $languageParams->get('site');
@@ -255,7 +255,7 @@ public static function parseXMLLangMetaFile($path)
 		 *
 		 * Should be 'metafile'.
 		 */
-		if ($xml->getName() != 'metafile')
+		if ($xml->getName() !== 'metafile')
 		{
 			unset($xml);
 
diff --git a/libraries/cms/application/site.php b/libraries/cms/application/site.php
index b00409514efe1..e8c422ba4cb93 100644
--- a/libraries/cms/application/site.php
+++ b/libraries/cms/application/site.php
@@ -543,7 +543,7 @@ public function getTemplate($params = false)
 
 			foreach ($templates as $tmpl)
 			{
-				if ($tmpl->template == 'beez3')
+				if ($tmpl->template === 'beez3')
 				{
 					$template = $tmpl;
 					break;
diff --git a/libraries/cms/component/helper.php b/libraries/cms/component/helper.php
index c87373dd92e92..479502bfc5eba 100644
--- a/libraries/cms/component/helper.php
+++ b/libraries/cms/component/helper.php
@@ -167,11 +167,11 @@ public static function filterText($text)
 			$filterData = $filters->$groupId;
 			$filterType = strtoupper($filterData->filter_type);
 
-			if ($filterType == 'NH')
+			if ($filterType === 'NH')
 			{
 				// Maximum HTML filtering.
 			}
-			elseif ($filterType == 'NONE')
+			elseif ($filterType === 'NONE')
 			{
 				// No HTML filtering.
 				$unfiltered = true;
@@ -207,13 +207,13 @@ public static function filterText($text)
 
 				// Collect the blacklist or whitelist tags and attributes.
 				// Each list is cummulative.
-				if ($filterType == 'BL')
+				if ($filterType === 'BL')
 				{
 					$blackList           = true;
 					$blackListTags       = array_merge($blackListTags, $tempTags);
 					$blackListAttributes = array_merge($blackListAttributes, $tempAttributes);
 				}
-				elseif ($filterType == 'CBL')
+				elseif ($filterType === 'CBL')
 				{
 					// Only set to true if Tags or Attributes were added
 					if ($tempTags || $tempAttributes)
@@ -223,7 +223,7 @@ public static function filterText($text)
 						$customListAttributes = array_merge($customListAttributes, $tempAttributes);
 					}
 				}
-				elseif ($filterType == 'WL')
+				elseif ($filterType === 'WL')
 				{
 					$whiteList           = true;
 					$whiteListTags       = array_merge($whiteListTags, $tempTags);
diff --git a/libraries/cms/form/field/editor.php b/libraries/cms/form/field/editor.php
index 2a706249d4190..f2edc78cdf16d 100644
--- a/libraries/cms/form/field/editor.php
+++ b/libraries/cms/form/field/editor.php
@@ -152,11 +152,11 @@ public function __set($name, $value)
 			case 'buttons':
 				$value = (string) $value;
 
-				if ($value == 'true' || $value == 'yes' || $value == '1')
+				if ($value === 'true' || $value === 'yes' || $value == '1')
 				{
 					$this->buttons = true;
 				}
-				elseif ($value == 'false' || $value == 'no' || $value == '0')
+				elseif ($value === 'false' || $value === 'no' || $value == '0')
 				{
 					$this->buttons = false;
 				}
@@ -211,11 +211,11 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 			$hide       = (string) $this->element['hide'];
 			$editorType = (string) $this->element['editor'];
 
-			if ($buttons == 'true' || $buttons == 'yes' || $buttons == '1')
+			if ($buttons === 'true' || $buttons === 'yes' || $buttons == '1')
 			{
 				$this->buttons = true;
 			}
-			elseif ($buttons == 'false' || $buttons == 'no' || $buttons == '0')
+			elseif ($buttons === 'false' || $buttons === 'no' || $buttons == '0')
 			{
 				$this->buttons = false;
 			}
diff --git a/libraries/cms/form/field/limitbox.php b/libraries/cms/form/field/limitbox.php
index b32ce9f6c3077..7e6928989a71d 100644
--- a/libraries/cms/form/field/limitbox.php
+++ b/libraries/cms/form/field/limitbox.php
@@ -82,7 +82,7 @@ protected function getOptions()
 			asort($limits);
 
 			// Add an option to show all?
-			$showAll = isset($this->element['showall']) ? ($this->element['showall'] == "true") : true;
+			$showAll = isset($this->element['showall']) ? ($this->element['showall'] === "true") : true;
 
 			if ($showAll)
 			{
diff --git a/libraries/cms/form/field/tag.php b/libraries/cms/form/field/tag.php
index e7a3d4f8b0951..2a5e7c43fe18d 100644
--- a/libraries/cms/form/field/tag.php
+++ b/libraries/cms/form/field/tag.php
@@ -152,7 +152,7 @@ protected function getOptions()
 		}
 
 		// Block the possibility to set a tag as it own parent
-		if ($this->form->getName() == 'com_tags.tag')
+		if ($this->form->getName() === 'com_tags.tag')
 		{
 			$id   = (int) $this->form->getValue('id', 0);
 
@@ -216,7 +216,7 @@ public function isNested()
 		if ($this->isNested === null)
 		{
 			// If mode="nested" || ( mode not set & config = nested )
-			if ((isset($this->element['mode']) && $this->element['mode'] == 'nested')
+			if ((isset($this->element['mode']) && $this->element['mode'] === 'nested')
 				|| (!isset($this->element['mode']) && $this->comParams->get('tag_field_ajax_mode', 1) == 0))
 			{
 				$this->isNested = true;
@@ -233,7 +233,7 @@ public function isNested()
 	 */
 	public function allowCustom()
 	{
-		if (isset($this->element['custom']) && $this->element['custom'] == 'deny')
+		if (isset($this->element['custom']) && $this->element['custom'] === 'deny')
 		{
 			return false;
 		}
diff --git a/libraries/cms/form/field/user.php b/libraries/cms/form/field/user.php
index 4c4c1feb9de99..47a2f42621ebd 100644
--- a/libraries/cms/form/field/user.php
+++ b/libraries/cms/form/field/user.php
@@ -81,7 +81,7 @@ public function getLayoutData()
 			$name = JUser::getInstance($this->value)->name;
 		}
 		// Handle the special case for "current".
-		elseif (strtoupper($this->value) == 'CURRENT')
+		elseif (strtoupper($this->value) === 'CURRENT')
 		{
 			// 'CURRENT' is not a reasonable value to be placed in the html
 			$current = JFactory::getUser();
diff --git a/libraries/cms/form/rule/password.php b/libraries/cms/form/rule/password.php
index f7ee73022d0b6..c1244a4d1cab6 100644
--- a/libraries/cms/form/rule/password.php
+++ b/libraries/cms/form/rule/password.php
@@ -68,7 +68,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry
 		}
 
 		// If the field is empty and not required, the field is valid.
-		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+		$required = ((string) $element['required'] === 'true' || (string) $element['required'] === 'required');
 
 		if (!$required && empty($value))
 		{
diff --git a/libraries/cms/helper/route.php b/libraries/cms/helper/route.php
index 1e9fcfe37c28b..3ef85cac654ea 100644
--- a/libraries/cms/helper/route.php
+++ b/libraries/cms/helper/route.php
@@ -104,7 +104,7 @@ public function getRoute($id, $typealias, $link = '', $language = null, $catid =
 		}
 
 		// Deal with languages only if needed
-		if (!empty($language) && $language != '*' && JLanguageMultilang::isEnabled())
+		if (!empty($language) && $language !== '*' && JLanguageMultilang::isEnabled())
 		{
 			$link .= '&lang=' . $language;
 			$needles['language'] = $language;
@@ -149,7 +149,7 @@ protected function findItem($needles = array())
 			$attributes = array('component_id');
 			$values     = array($component->id);
 
-			if ($language != '*')
+			if ($language !== '*')
 			{
 				$attributes[] = 'language';
 				$values[]     = array($needles['language'], '*');
@@ -180,7 +180,7 @@ protected function findItem($needles = array())
 						 * $language != * can override existing entries
 						 * $language == * cannot override existing entries
 						 */
-						if ($item->language != '*' || !isset(static::$lookup[$language][$view][$item->query['id']]))
+						if ($item->language !== '*' || !isset(static::$lookup[$language][$view][$item->query['id']]))
 						{
 							static::$lookup[$language][$view][$item->query['id']] = $item->id;
 						}
@@ -208,7 +208,7 @@ protected function findItem($needles = array())
 
 		$active = $menus->getActive();
 
-		if ($active && $active->component == $this->extension && ($active->language == '*' || !JLanguageMultilang::isEnabled()))
+		if ($active && $active->component == $this->extension && ($active->language === '*' || !JLanguageMultilang::isEnabled()))
 		{
 			return $active->id;
 		}
@@ -264,7 +264,7 @@ public static function getCategoryRoute($catid, $language = 0, $extension = '')
 				'category' => array($id),
 			);
 
-			if ($language && $language != '*' && JLanguageMultilang::isEnabled())
+			if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
 			{
 				$link .= '&lang=' . $language;
 				$needles['language'] = $language;
diff --git a/libraries/cms/helper/tags.php b/libraries/cms/helper/tags.php
index 1da4f4d0a4d73..7e0736461ba85 100644
--- a/libraries/cms/helper/tags.php
+++ b/libraries/cms/helper/tags.php
@@ -414,9 +414,9 @@ public function getItemTags($contentType, $id, $getTagData = true)
 		// Optionally filter on language
 		$language = JComponentHelper::getParams('com_tags')->get('tag_list_language_filter', 'all');
 
-		if ($language != 'all')
+		if ($language !== 'all')
 		{
-			if ($language == 'current_language')
+			if ($language === 'current_language')
 			{
 				$language = $this->getCurrentLanguage();
 			}
@@ -595,9 +595,9 @@ public function getTagItemsQuery($tagId, $typesr = null, $includeChildren = fals
 			$language = $languageFilter;
 		}
 
-		if ($language != 'all')
+		if ($language !== 'all')
 		{
-			if ($language == 'current_language')
+			if ($language === 'current_language')
 			{
 				$language = $this->getCurrentLanguage();
 			}
@@ -629,7 +629,7 @@ public function getTagItemsQuery($tagId, $typesr = null, $includeChildren = fals
 		}
 
 		// Set up the order by using the option chosen
-		if ($orderByOption == 'match_count')
+		if ($orderByOption === 'match_count')
 		{
 			$orderBy = 'COUNT(m.tag_id)';
 		}
diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
index 8364468b04373..a0f3675e9755f 100644
--- a/libraries/cms/html/behavior.php
+++ b/libraries/cms/html/behavior.php
@@ -56,7 +56,7 @@ public static function framework($extras = false, $debug = null)
 			$debug = $config->get('debug');
 		}
 
-		if ($type != 'core' && empty(static::$loaded[__METHOD__]['core']))
+		if ($type !== 'core' && empty(static::$loaded[__METHOD__]['core']))
 		{
 			static::framework(false, $debug);
 		}
@@ -680,7 +680,7 @@ public static function keepalive()
 		$session = JFactory::getSession();
 
 		// If the handler is not 'Database', we set a fixed, small refresh value (here: 5 min)
-		if ($session->storeName != 'database')
+		if ($session->storeName !== 'database')
 		{
 			$refresh_time = 300000;
 		}
diff --git a/libraries/cms/html/date.php b/libraries/cms/html/date.php
index c3eb43e91be5e..376debccf4f1f 100644
--- a/libraries/cms/html/date.php
+++ b/libraries/cms/html/date.php
@@ -49,7 +49,7 @@ public static function relative($date, $unit = null, $time = null)
 		$diff = round($diff / 60);
 
 		// 1 to 59 minutes
-		if ($diff < 60 || $unit == 'minute')
+		if ($diff < 60 || $unit === 'minute')
 		{
 			return JText::plural('JLIB_HTML_DATE_RELATIVE_MINUTES', $diff);
 		}
@@ -58,7 +58,7 @@ public static function relative($date, $unit = null, $time = null)
 		$diff = round($diff / 60);
 
 		// 1 to 23 hours
-		if ($diff < 24 || $unit == 'hour')
+		if ($diff < 24 || $unit === 'hour')
 		{
 			return JText::plural('JLIB_HTML_DATE_RELATIVE_HOURS', $diff);
 		}
@@ -67,7 +67,7 @@ public static function relative($date, $unit = null, $time = null)
 		$diff = round($diff / 24);
 
 		// 1 to 6 days
-		if ($diff < 7 || $unit == 'day')
+		if ($diff < 7 || $unit === 'day')
 		{
 			return JText::plural('JLIB_HTML_DATE_RELATIVE_DAYS', $diff);
 		}
@@ -76,7 +76,7 @@ public static function relative($date, $unit = null, $time = null)
 		$diff = round($diff / 7);
 
 		// 1 to 4 weeks
-		if ($diff <= 4 || $unit == 'week')
+		if ($diff <= 4 || $unit === 'week')
 		{
 			return JText::plural('JLIB_HTML_DATE_RELATIVE_WEEKS', $diff);
 		}
diff --git a/libraries/cms/html/grid.php b/libraries/cms/html/grid.php
index ea9ed92e987f4..05742fbec0a11 100644
--- a/libraries/cms/html/grid.php
+++ b/libraries/cms/html/grid.php
@@ -76,7 +76,7 @@ public static function sort($title, $order, $direction = 'asc', $selected = '',
 
 		$direction = strtolower($direction);
 		$icon = array('arrow-up-3', 'arrow-down-3');
-		$index = (int) ($direction == 'desc');
+		$index = (int) ($direction === 'desc');
 
 		if ($order != $selected)
 		{
@@ -84,14 +84,14 @@ public static function sort($title, $order, $direction = 'asc', $selected = '',
 		}
 		else
 		{
-			$direction = ($direction == 'desc') ? 'asc' : 'desc';
+			$direction = ($direction === 'desc') ? 'asc' : 'desc';
 		}
 
 		$html = '<a href="#" onclick="Joomla.tableOrdering(\'' . $order . '\',\'' . $direction . '\',\'' . $task . '\');return false;"'
 			. ' class="hasPopover" title="' . htmlspecialchars(JText::_($tip ? $tip : $title)) . '"'
 			. ' data-content="' . htmlspecialchars(JText::_('JGLOBAL_CLICK_TO_SORT_THIS_COLUMN')) . '" data-placement="top">';
 
-		if (isset($title['0']) && $title['0'] == '<')
+		if (isset($title['0']) && $title['0'] === '<')
 		{
 			$html .= $title;
 		}
@@ -180,7 +180,7 @@ public static function checkedOut(&$row, $i, $identifier = 'id')
 		}
 		else
 		{
-			if ($identifier == 'id')
+			if ($identifier === 'id')
 			{
 				return JHtml::_('grid.id', $i, $row->$identifier);
 			}
diff --git a/libraries/cms/html/html.php b/libraries/cms/html/html.php
index c4438c74067d0..ff1d852c9268f 100644
--- a/libraries/cms/html/html.php
+++ b/libraries/cms/html/html.php
@@ -861,7 +861,7 @@ public static function tooltip($tooltip, $title = '', $image = 'tooltip.png', $t
 			$tip = $text;
 		}
 
-		if ($class == 'hasTip')
+		if ($class === 'hasTip')
 		{
 			// Still using MooTools tooltips!
 			$tooltip = htmlspecialchars($tooltip, ENT_COMPAT, 'UTF-8');
@@ -965,8 +965,8 @@ public static function calendar($value, $name, $id, $format = '%Y-%m-%d', $attri
 			$done = array();
 		}
 
-		$readonly = isset($attribs['readonly']) && $attribs['readonly'] == 'readonly';
-		$disabled = isset($attribs['disabled']) && $attribs['disabled'] == 'disabled';
+		$readonly = isset($attribs['readonly']) && $attribs['readonly'] === 'readonly';
+		$disabled = isset($attribs['disabled']) && $attribs['disabled'] === 'disabled';
 
 		if (is_array($attribs))
 		{
diff --git a/libraries/cms/html/jgrid.php b/libraries/cms/html/jgrid.php
index 12fb30ba8d500..c1e9789ccbdbc 100644
--- a/libraries/cms/html/jgrid.php
+++ b/libraries/cms/html/jgrid.php
@@ -66,7 +66,7 @@ public static function action($i, $task, $prefix = '', $text = '', $active_title
 
 		if ($enabled)
 		{
-			$html[] = '<a class="btn btn-micro' . ($active_class == 'publish' ? ' active' : '') . ($tip ? ' hasTooltip' : '') . '"';
+			$html[] = '<a class="btn btn-micro' . ($active_class === 'publish' ? ' active' : '') . ($tip ? ' hasTooltip' : '') . '"';
 			$html[] = ' href="javascript:void(0);" onclick="return listItemTask(\'' . $checkbox . $i . '\',\'' . $prefix . $task . '\')"';
 			$html[] = $tip ? ' title="' . $title . '"' : '';
 			$html[] = '>';
@@ -79,7 +79,7 @@ public static function action($i, $task, $prefix = '', $text = '', $active_title
 			$html[] = $tip ? ' title="' . $title . '"' : '';
 			$html[] = '>';
 
-			if ($active_class == "protected")
+			if ($active_class === "protected")
 			{
 				$html[] = '<span class="icon-lock"></span>';
 			}
diff --git a/libraries/cms/html/number.php b/libraries/cms/html/number.php
index 24c3b8a3afd72..4b300f1cef4ea 100644
--- a/libraries/cms/html/number.php
+++ b/libraries/cms/html/number.php
@@ -91,7 +91,7 @@ public static function bytes($bytes, $unit = 'auto', $precision = 2, $iec = fals
 			$i      = array_search($unit, $stdSuffixes, true);
 			$suffix = $unit;
 		}
-		elseif ($unit == 'binary')
+		elseif ($unit === 'binary')
 		{
 			$base   = 1024;
 			$i      = (int) floor(log($oBytes, $base));
diff --git a/libraries/cms/html/searchtools.php b/libraries/cms/html/searchtools.php
index 6120738a4af30..da6bf12152c41 100644
--- a/libraries/cms/html/searchtools.php
+++ b/libraries/cms/html/searchtools.php
@@ -139,7 +139,7 @@ public static function sort($title, $order, $direction = 'asc', $selected = 0, $
 	{
 		$direction = strtolower($direction);
 		$orderIcons = array('icon-arrow-up-3', 'icon-arrow-down-3');
-		$index = (int) ($direction == 'desc');
+		$index = (int) ($direction === 'desc');
 
 		if ($order != $selected)
 		{
@@ -147,7 +147,7 @@ public static function sort($title, $order, $direction = 'asc', $selected = 0, $
 		}
 		else
 		{
-			$direction = ($direction == 'desc') ? 'asc' : 'desc';
+			$direction = ($direction === 'desc') ? 'asc' : 'desc';
 		}
 
 		// Create an object to pass it to the layouts
diff --git a/libraries/cms/html/string.php b/libraries/cms/html/string.php
index fe64b55791458..04cf67c9a996d 100644
--- a/libraries/cms/html/string.php
+++ b/libraries/cms/html/string.php
@@ -204,13 +204,13 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
 
 		// If the plain text is shorter than the max length the variable will not end in ...
 		// In that case we use the whole string.
-		if (substr($ptString, -3) != '...')
+		if (substr($ptString, -3) !== '...')
 		{
 				return $html;
 		}
 
 		// Regular truncate gives us the ellipsis but we want to go back for text and tags.
-		if ($ptString == '...')
+		if ($ptString === '...')
 		{
 			$stripped = substr(strip_tags($html), 0, $maxLength);
 			$ptString = JHtml::_('string.truncate', $stripped, $maxLength, $noSplit, $allowHtml = false);
@@ -225,7 +225,7 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
 			// Get the truncated string assuming HTML is allowed.
 			$htmlString = JHtml::_('string.truncate', $html, $maxLength, $noSplit, $allowHtml = true);
 
-			if ($htmlString == '...' && strlen($ptString) + 3 > $maxLength)
+			if ($htmlString === '...' && strlen($ptString) + 3 > $maxLength)
 			{
 				return $htmlString;
 			}
diff --git a/libraries/cms/html/tel.php b/libraries/cms/html/tel.php
index 78fa822fb8d3e..b41b7dfd73f2c 100644
--- a/libraries/cms/html/tel.php
+++ b/libraries/cms/html/tel.php
@@ -37,14 +37,14 @@ public static function tel($number, $displayplan)
 		$countrycode = $number[0];
 		$number = $number[1];
 
-		if ($displayplan == 'ITU-T' || $displayplan == 'International' || $displayplan == 'int' || $displayplan == 'missdn' || $displayplan == null)
+		if ($displayplan === 'ITU-T' || $displayplan === 'International' || $displayplan === 'int' || $displayplan === 'missdn' || $displayplan == null)
 		{
 			$display[0] = '+';
 			$display[1] = $countrycode;
 			$display[2] = ' ';
 			$display[3] = implode(str_split($number, 2), ' ');
 		}
-		elseif ($displayplan == 'NANP' || $displayplan == 'northamerica' || $displayplan == 'US')
+		elseif ($displayplan === 'NANP' || $displayplan === 'northamerica' || $displayplan === 'US')
 		{
 			$display[0] = '(';
 			$display[1] = substr($number, 0, 3);
@@ -53,14 +53,14 @@ public static function tel($number, $displayplan)
 			$display[4] = '-';
 			$display[5] = substr($number, 6, 4);
 		}
-		elseif ($displayplan == 'EPP' || $displayplan == 'IETF')
+		elseif ($displayplan === 'EPP' || $displayplan === 'IETF')
 		{
 			$display[0] = '+';
 			$display[1] = $countrycode;
 			$display[2] = '.';
 			$display[3] = $number;
 		}
-		elseif ($displayplan == 'ARPA' || $displayplan == 'ENUM')
+		elseif ($displayplan === 'ARPA' || $displayplan === 'ENUM')
 		{
 			$number = implode(str_split(strrev($number), 1), '.');
 			$display[0] = '+';
diff --git a/libraries/cms/installer/adapter.php b/libraries/cms/installer/adapter.php
index 6c61b22303441..219aeb961ee51 100644
--- a/libraries/cms/installer/adapter.php
+++ b/libraries/cms/installer/adapter.php
@@ -418,7 +418,7 @@ public function discover_install()
 	 */
 	protected function doDatabaseTransactions()
 	{
-		$route = $this->route == 'discover_install' ? 'install' : $this->route;
+		$route = $this->route === 'discover_install' ? 'install' : $this->route;
 
 		// Let's run the install queries for the component
 		if (isset($this->getManifest()->{$route}->sql))
@@ -428,7 +428,7 @@ protected function doDatabaseTransactions()
 			if ($result === false)
 			{
 				// Only rollback if installing
-				if ($route == 'install')
+				if ($route === 'install')
 				{
 					throw new RuntimeException(
 						JText::sprintf(
@@ -632,7 +632,7 @@ public function install()
 		}
 
 		// If we are on the update route, run any custom setup routines
-		if ($this->route == 'update')
+		if ($this->route === 'update')
 		{
 			try
 			{
@@ -810,7 +810,7 @@ protected function parseQueries()
 				$this->parent->setSchemaVersion($this->getManifest()->update->schemas, $this->extension->extension_id);
 			}
 		}
-		elseif ($this->route == 'update')
+		elseif ($this->route === 'update')
 		{
 			if ($this->getManifest()->update)
 			{
@@ -977,7 +977,7 @@ protected function triggerManifestScript($method)
 				case 'postflight' :
 					if ($this->parent->manifestClass->$method($this->route, $this) === false)
 					{
-						if ($method != 'postflight')
+						if ($method !== 'postflight')
 						{
 							// Clean and close the output buffer
 							ob_end_clean();
@@ -999,7 +999,7 @@ protected function triggerManifestScript($method)
 				case 'update' :
 					if ($this->parent->manifestClass->$method($this) === false)
 					{
-						if ($method != 'uninstall')
+						if ($method !== 'uninstall')
 						{
 							// Clean and close the output buffer
 							ob_end_clean();
@@ -1021,7 +1021,7 @@ protected function triggerManifestScript($method)
 		$this->extensionMessage .= ob_get_clean();
 
 		// If in postflight or uninstall, set the message for display
-		if (($method == 'uninstall' || $method == 'postflight') && $this->extensionMessage != '')
+		if (($method === 'uninstall' || $method === 'postflight') && $this->extensionMessage != '')
 		{
 			$this->parent->set('extension_message', $this->extensionMessage);
 		}
diff --git a/libraries/cms/installer/adapter/component.php b/libraries/cms/installer/adapter/component.php
index 8a90dc5d45f74..71a5dc323dae1 100644
--- a/libraries/cms/installer/adapter/component.php
+++ b/libraries/cms/installer/adapter/component.php
@@ -124,7 +124,7 @@ protected function copyBaseFiles()
 		// Copy site files
 		if ($this->getManifest()->files)
 		{
-			if ($this->route == 'update')
+			if ($this->route === 'update')
 			{
 				$result = $this->parent->parseFiles($this->getManifest()->files, 0, $this->oldFiles);
 			}
@@ -147,7 +147,7 @@ protected function copyBaseFiles()
 		// Copy admin files
 		if ($this->getManifest()->administration->files)
 		{
-			if ($this->route == 'update')
+			if ($this->route === 'update')
 			{
 				$result = $this->parent->parseFiles($this->getManifest()->administration->files, 1, $this->oldAdminFiles);
 			}
@@ -289,7 +289,7 @@ protected function finaliseInstall()
 		}
 
 		// We will copy the manifest file to its appropriate place.
-		if ($this->route != 'discover_install')
+		if ($this->route !== 'discover_install')
 		{
 			if (!$this->parent->copyManifest())
 			{
@@ -580,7 +580,7 @@ protected function setupUpdates()
 	protected function storeExtension($deleteExisting = false)
 	{
 		// The extension is stored during prepareDiscoverInstall for discover installs
-		if ($this->route == 'discover_install')
+		if ($this->route === 'discover_install')
 		{
 			return;
 		}
diff --git a/libraries/cms/installer/adapter/file.php b/libraries/cms/installer/adapter/file.php
index deb31514444f2..66a87254f8d2c 100644
--- a/libraries/cms/installer/adapter/file.php
+++ b/libraries/cms/installer/adapter/file.php
@@ -197,7 +197,7 @@ protected function parseOptionalTags()
 	protected function setupInstallPaths()
 	{
 		// Set the file root path
-		if ($this->name == 'files_joomla')
+		if ($this->name === 'files_joomla')
 		{
 			// If we are updating the Joomla core, set the root path to the root of Joomla
 			$this->parent->setPath('extension_root', JPATH_ROOT);
@@ -324,7 +324,7 @@ public function uninstall($id)
 			}
 
 			// Check for a valid XML root tag.
-			if ($xml->getName() != 'extension')
+			if ($xml->getName() !== 'extension')
 			{
 				JLog::add(JText::_('JLIB_INSTALLER_ERROR_FILE_UNINSTALL_INVALID_MANIFEST'), JLog::WARNING, 'jerror');
 
@@ -419,7 +419,7 @@ public function uninstall($id)
 					// Loop through all filenames elements
 					foreach ($eFiles->children() as $eFileName)
 					{
-						if ($eFileName->getName() == 'folder')
+						if ($eFileName->getName() === 'folder')
 						{
 							$folderList[] = $targetFolder . '/' . $eFileName;
 						}
@@ -582,7 +582,7 @@ protected function populateFilesAndFolderList()
 					$path['dest'] = $targetFolder . '/' . $eFileName;
 					$path['type'] = 'file';
 
-					if ($eFileName->getName() == 'folder')
+					if ($eFileName->getName() === 'folder')
 					{
 						$folderName = $targetFolder . '/' . $eFileName;
 						array_push($this->folderList, $folderName);
diff --git a/libraries/cms/installer/adapter/language.php b/libraries/cms/installer/adapter/language.php
index e726de0d640e7..ce7df051c3008 100644
--- a/libraries/cms/installer/adapter/language.php
+++ b/libraries/cms/installer/adapter/language.php
@@ -167,7 +167,7 @@ protected function _install($cname, $basePath, $clientId, &$element)
 
 			foreach ($files as $file)
 			{
-				if ((string) $file->attributes()->file == 'meta')
+				if ((string) $file->attributes()->file === 'meta')
 				{
 					$this->core = true;
 					break;
@@ -367,7 +367,7 @@ public function update()
 		{
 			foreach ($xml->files->children() as $file)
 			{
-				if ((string) $file->attributes()->file == 'meta')
+				if ((string) $file->attributes()->file === 'meta')
 				{
 					$this->core = true;
 					break;
@@ -544,7 +544,7 @@ public function uninstall($eid)
 		$db->setQuery($query);
 		$users = $db->loadObjectList();
 
-		if ($client->name == 'administrator')
+		if ($client->name === 'administrator')
 		{
 			$param_name = 'admin_language';
 		}
diff --git a/libraries/cms/installer/adapter/library.php b/libraries/cms/installer/adapter/library.php
index 80f959902c62b..c84d83d453af2 100644
--- a/libraries/cms/installer/adapter/library.php
+++ b/libraries/cms/installer/adapter/library.php
@@ -94,7 +94,7 @@ protected function finaliseInstall()
 		}
 
 		// Lastly, we will copy the manifest file to its appropriate place.
-		if ($this->route != 'discover_install')
+		if ($this->route !== 'discover_install')
 		{
 			$manifest = array();
 			$manifest['src'] = $this->parent->getPath('manifest');
@@ -233,7 +233,7 @@ protected function setupInstallPaths()
 	protected function storeExtension()
 	{
 		// Discover installs are stored a little differently
-		if ($this->route == 'discover_install')
+		if ($this->route === 'discover_install')
 		{
 			$manifest_details = JInstaller::parseXMLInstallFile($this->parent->getPath('manifest'));
 
@@ -399,7 +399,7 @@ public function uninstall($id)
 			}
 
 			// Check for a valid XML root tag.
-			if ($xml->getName() != 'extension')
+			if ($xml->getName() !== 'extension')
 			{
 				JLog::add(JText::_('JLIB_INSTALLER_ERROR_LIB_UNINSTALL_INVALID_MANIFEST'), JLog::WARNING, 'jerror');
 
diff --git a/libraries/cms/installer/adapter/module.php b/libraries/cms/installer/adapter/module.php
index 984d264413aeb..439f4b52add0b 100644
--- a/libraries/cms/installer/adapter/module.php
+++ b/libraries/cms/installer/adapter/module.php
@@ -130,7 +130,7 @@ protected function finaliseInstall()
 		}
 
 		// Lastly, we will copy the manifest file to its appropriate place.
-		if ($this->route != 'discover_install')
+		if ($this->route !== 'discover_install')
 		{
 			if (!$this->parent->copyManifest(-1))
 			{
@@ -305,7 +305,7 @@ protected function setupInstallPaths()
 	protected function storeExtension()
 	{
 		// Discover installs are stored a little differently
-		if ($this->route == 'discover_install')
+		if ($this->route === 'discover_install')
 		{
 			$manifest_details = JInstaller::parseXMLInstallFile($this->parent->getPath('manifest'));
 
diff --git a/libraries/cms/installer/adapter/package.php b/libraries/cms/installer/adapter/package.php
index de9daf4577aed..ed96cacfb363d 100644
--- a/libraries/cms/installer/adapter/package.php
+++ b/libraries/cms/installer/adapter/package.php
@@ -431,7 +431,7 @@ protected function triggerManifestScript($method)
 				case 'update':
 					if ($this->parent->manifestClass->$method($this) === false)
 					{
-						if ($method != 'uninstall')
+						if ($method !== 'uninstall')
 						{
 							// The script failed, rollback changes
 							throw new RuntimeException(
@@ -451,7 +451,7 @@ protected function triggerManifestScript($method)
 		$this->extensionMessage .= ob_get_clean();
 
 		// If in postflight or uninstall, set the message for display
-		if (($method == 'uninstall' || $method == 'postflight') && $this->extensionMessage != '')
+		if (($method === 'uninstall' || $method === 'postflight') && $this->extensionMessage != '')
 		{
 			$this->parent->set('extension_message', $this->extensionMessage);
 		}
@@ -509,7 +509,7 @@ public function uninstall($id)
 		}
 
 		// Check for a valid XML root tag.
-		if ($xml->getName() != 'extension')
+		if ($xml->getName() !== 'extension')
 		{
 			JLog::add(JText::_('JLIB_INSTALLER_ERROR_PACK_UNINSTALL_INVALID_MANIFEST'), JLog::WARNING, 'jerror');
 
diff --git a/libraries/cms/installer/adapter/plugin.php b/libraries/cms/installer/adapter/plugin.php
index ebc1c74d8be8c..bb9626172fa7d 100644
--- a/libraries/cms/installer/adapter/plugin.php
+++ b/libraries/cms/installer/adapter/plugin.php
@@ -122,7 +122,7 @@ protected function createExtensionRoot()
 		parent::createExtensionRoot();
 
 		// If we're updating at this point when there is always going to be an extension_root find the old XML files
-		if ($this->route == 'update')
+		if ($this->route === 'update')
 		{
 			// Create a new installer because findManifest sets stuff; side effects!
 			$tmpInstaller = new JInstaller;
@@ -165,7 +165,7 @@ protected function finaliseInstall()
 		}
 
 		// Lastly, we will copy the manifest file to its appropriate place.
-		if ($this->route != 'discover_install')
+		if ($this->route !== 'discover_install')
 		{
 			if (!$this->parent->copyManifest(-1))
 			{
@@ -359,14 +359,14 @@ protected function setupInstallPaths()
 	protected function storeExtension()
 	{
 		// Discover installs are stored a little differently
-		if ($this->route == 'discover_install')
+		if ($this->route === 'discover_install')
 		{
 			$manifest_details = JInstaller::parseXMLInstallFile($this->parent->getPath('manifest'));
 
 			$this->extension->manifest_cache = json_encode($manifest_details);
 			$this->extension->state = 0;
 			$this->extension->name = $manifest_details['name'];
-			$this->extension->enabled = ('editors' == $this->extension->folder) ? 1 : 0;
+			$this->extension->enabled = ('editors' === $this->extension->folder) ? 1 : 0;
 			$this->extension->params = $this->parent->getParams();
 
 			if (!$this->extension->store())
@@ -422,7 +422,7 @@ protected function storeExtension()
 			$this->extension->manifest_cache = $this->parent->generateManifestCache();
 
 			// Editor plugins are published by default
-			if ($this->group == 'editors')
+			if ($this->group === 'editors')
 			{
 				$this->extension->enabled = 1;
 			}
@@ -630,7 +630,7 @@ public function discover()
 				$file = JFile::stripExt($file);
 
 				// Ignore example plugins
-				if ($file == 'example' || $manifest_details === false)
+				if ($file === 'example' || $manifest_details === false)
 				{
 					continue;
 				}
@@ -662,7 +662,7 @@ public function discover()
 					);
 					$file = JFile::stripExt($file);
 
-					if ($file == 'example' || $manifest_details === false)
+					if ($file === 'example' || $manifest_details === false)
 					{
 						continue;
 					}
diff --git a/libraries/cms/installer/adapter/template.php b/libraries/cms/installer/adapter/template.php
index ad412132e2735..aced94d7a182e 100644
--- a/libraries/cms/installer/adapter/template.php
+++ b/libraries/cms/installer/adapter/template.php
@@ -151,7 +151,7 @@ protected function finaliseInstall()
 		}
 
 		// Lastly, we will copy the manifest file to its appropriate place.
-		if ($this->route != 'discover_install')
+		if ($this->route !== 'discover_install')
 		{
 			if (!$this->parent->copyManifest(-1))
 			{
@@ -327,7 +327,7 @@ protected function setupInstallPaths()
 	protected function storeExtension()
 	{
 		// Discover installs are stored a little differently
-		if ($this->route == 'discover_install')
+		if ($this->route === 'discover_install')
 		{
 			$manifest_details = JInstaller::parseXMLInstallFile($this->parent->getPath('manifest'));
 
@@ -533,7 +533,7 @@ public function discover()
 		{
 			if (file_exists(JPATH_SITE . "/templates/$template/templateDetails.xml"))
 			{
-				if ($template == 'system')
+				if ($template === 'system')
 				{
 					// Ignore special system template
 					continue;
@@ -557,7 +557,7 @@ public function discover()
 		{
 			if (file_exists(JPATH_ADMINISTRATOR . "/templates/$template/templateDetails.xml"))
 			{
-				if ($template == 'system')
+				if ($template === 'system')
 				{
 					// Ignore special system template
 					continue;
diff --git a/libraries/cms/installer/helper.php b/libraries/cms/installer/helper.php
index 2e2251b1fcabc..d5d8905c5b320 100644
--- a/libraries/cms/installer/helper.php
+++ b/libraries/cms/installer/helper.php
@@ -233,7 +233,7 @@ public static function detectType($p_dir)
 				continue;
 			}
 
-			if ($xml->getName() != 'extension')
+			if ($xml->getName() !== 'extension')
 			{
 				unset($xml);
 				continue;
diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
index 92c34227919c4..df10fb11fa52e 100644
--- a/libraries/cms/installer/installer.php
+++ b/libraries/cms/installer/installer.php
@@ -910,7 +910,7 @@ public function parseSQLFiles($element)
 		$db = & $this->_db;
 		$dbDriver = strtolower($db->name);
 
-		if ($dbDriver == 'mysqli' || $dbDriver == 'pdomysql')
+		if ($dbDriver === 'mysqli' || $dbDriver === 'pdomysql')
 		{
 			$dbDriver = 'mysql';
 		}
@@ -920,15 +920,15 @@ public function parseSQLFiles($element)
 		// Get the name of the sql file to process
 		foreach ($element->children() as $file)
 		{
-			$fCharset = (strtolower($file->attributes()->charset) == 'utf8') ? 'utf8' : '';
+			$fCharset = (strtolower($file->attributes()->charset) === 'utf8') ? 'utf8' : '';
 			$fDriver = strtolower($file->attributes()->driver);
 
-			if ($fDriver == 'mysqli' || $fDriver == 'pdomysql')
+			if ($fDriver === 'mysqli' || $fDriver === 'pdomysql')
 			{
 				$fDriver = 'mysql';
 			}
 
-			if ($fCharset == 'utf8' && $fDriver == $dbDriver)
+			if ($fCharset === 'utf8' && $fDriver == $dbDriver)
 			{
 				$sqlfile = $this->getPath('extension_root') . '/' . trim($file);
 
@@ -1009,7 +1009,7 @@ public function setSchemaVersion(SimpleXMLElement $schema, $eid)
 			{
 				$dbDriver = strtolower($db->name);
 
-				if ($dbDriver == 'mysqli' || $dbDriver == 'pdomysql')
+				if ($dbDriver === 'mysqli' || $dbDriver === 'pdomysql')
 				{
 					$dbDriver = 'mysql';
 				}
@@ -1076,7 +1076,7 @@ public function parseSchemaUpdates(SimpleXMLElement $schema, $eid)
 			{
 				$dbDriver = strtolower($db->name);
 
-				if ($dbDriver == 'mysqli' || $dbDriver == 'pdomysql')
+				if ($dbDriver === 'mysqli' || $dbDriver === 'pdomysql')
 				{
 					$dbDriver = 'mysql';
 				}
@@ -1090,7 +1090,7 @@ public function parseSchemaUpdates(SimpleXMLElement $schema, $eid)
 					// Assuming that the type is a mandatory attribute but if it is not mandatory then there should be a discussion for it.
 					$uDriver = strtolower($attrs['type']);
 
-					if ($uDriver == 'mysqli' || $uDriver == 'pdomysql')
+					if ($uDriver === 'mysqli' || $uDriver === 'pdomysql')
 					{
 						$uDriver = 'mysql';
 					}
@@ -1296,7 +1296,7 @@ public function parseFiles(SimpleXMLElement $element, $cid = 0, $oldFiles = null
 			$path['dest'] = $destination . '/' . $file;
 
 			// Is this path a file or folder?
-			$path['type'] = ($file->getName() == 'folder') ? 'folder' : 'file';
+			$path['type'] = ($file->getName() === 'folder') ? 'folder' : 'file';
 
 			/*
 			 * Before we can add a file to the copyfiles array we need to ensure
@@ -1493,7 +1493,7 @@ public function parseMedia(SimpleXMLElement $element, $cid = 0)
 			$path['dest'] = $destination . '/' . $file;
 
 			// Is this path a file or folder?
-			$path['type'] = ($file->getName() == 'folder') ? 'folder' : 'file';
+			$path['type'] = ($file->getName() === 'folder') ? 'folder' : 'file';
 
 			/*
 			 * Before we can add a file to the copyfiles array we need to ensure
@@ -1638,7 +1638,7 @@ public function copyFiles($files, $overwrite = null)
 				else
 				{
 					// Copy the folder or file to the new location.
-					if ($filetype == 'folder')
+					if ($filetype === 'folder')
 					{
 						if (!(JFolder::copy($filesource, $filedest, null, $overwrite)))
 						{
@@ -1796,7 +1796,7 @@ public function removeFiles($element, $cid = 0)
 			 * would go in the en_US subdirectory of the languages directory.
 			 */
 
-			if ($file->getName() == 'language' && (string) $file->attributes()->tag != '')
+			if ($file->getName() === 'language' && (string) $file->attributes()->tag != '')
 			{
 				if ($source)
 				{
@@ -1910,14 +1910,14 @@ public function findManifest()
 				if ($manifest !== null)
 				{
 					// If the root method attribute is set to upgrade, allow file overwrite
-					if ((string) $manifest->attributes()->method == 'upgrade')
+					if ((string) $manifest->attributes()->method === 'upgrade')
 					{
 						$this->upgrade = true;
 						$this->overwrite = true;
 					}
 
 					// If the overwrite option is set, allow file overwriting
-					if ((string) $manifest->attributes()->overwrite == 'true')
+					if ((string) $manifest->attributes()->overwrite === 'true')
 					{
 						$this->overwrite = true;
 					}
@@ -1967,7 +1967,7 @@ public function isManifest($file)
 		}
 
 		// Check for a valid XML root tag.
-		if ($xml->getName() != 'extension')
+		if ($xml->getName() !== 'extension')
 		{
 			return;
 		}
@@ -2200,7 +2200,7 @@ public static function parseXMLInstallFile($path)
 		$data['name'] = (string) $xml->name;
 
 		// Check if we're a language. If so use metafile.
-		$data['type'] = $xml->getName() == 'metafile' ? 'language' : (string) $xml->attributes()->type;
+		$data['type'] = $xml->getName() === 'metafile' ? 'language' : (string) $xml->attributes()->type;
 
 		$data['creationDate'] = ((string) $xml->creationDate) ? (string) $xml->creationDate : JText::_('JLIB_UNKNOWN');
 		$data['author'] = ((string) $xml->author) ? (string) $xml->author : JText::_('JLIB_UNKNOWN');
@@ -2277,7 +2277,7 @@ public function getAdapters($options = array(), array $custom = array())
 			$fileName = $file->getFilename();
 
 			// Only load for php files.
-			if (!$file->isFile() || $file->getExtension() != 'php')
+			if (!$file->isFile() || $file->getExtension() !== 'php')
 			{
 				continue;
 			}
diff --git a/libraries/cms/installer/script.php b/libraries/cms/installer/script.php
index b537cabbdc8d4..64264dbe0ec24 100644
--- a/libraries/cms/installer/script.php
+++ b/libraries/cms/installer/script.php
@@ -230,7 +230,7 @@ public function setParams($param_array = null, $type = 'edit', $id = 0)
 		{
 			foreach ($param_array as $name => $value)
 			{
-				if ($type == 'edit')
+				if ($type === 'edit')
 				{
 					// Add or edit the new variable(s) to the existing params
 					if (is_array($value))
@@ -243,7 +243,7 @@ public function setParams($param_array = null, $type = 'edit', $id = 0)
 						$params[(string) $name] = (string) $value;
 					}
 				}
-				elseif ($type == 'remove')
+				elseif ($type === 'remove')
 				{
 					// Unset the parameter from the array
 					unset($params[(string) $name]);
diff --git a/libraries/cms/module/helper.php b/libraries/cms/module/helper.php
index 58da5a66f246a..afa56331ac0cc 100644
--- a/libraries/cms/module/helper.php
+++ b/libraries/cms/module/helper.php
@@ -296,7 +296,7 @@ public static function getLayoutPath($module, $layout = 'default')
 		{
 			// Get the template and file name from the string
 			$temp = explode(':', $layout);
-			$template = ($temp[0] == '_') ? $template : $temp[0];
+			$template = ($temp[0] === '_') ? $template : $temp[0];
 			$layout = $temp[1];
 			$defaultLayout = ($temp[1]) ? $temp[1] : 'default';
 		}
diff --git a/libraries/cms/plugin/helper.php b/libraries/cms/plugin/helper.php
index a4096a9989be1..b2d388f3d4063 100644
--- a/libraries/cms/plugin/helper.php
+++ b/libraries/cms/plugin/helper.php
@@ -44,7 +44,7 @@ public static function getLayoutPath($type, $name, $layout = 'default')
 		{
 			// Get the template and file name from the string
 			$temp = explode(':', $layout);
-			$template = ($temp[0] == '_') ? $template : $temp[0];
+			$template = ($temp[0] === '_') ? $template : $temp[0];
 			$layout = $temp[1];
 			$defaultLayout = ($temp[1]) ? $temp[1] : 'default';
 		}
diff --git a/libraries/cms/router/router.php b/libraries/cms/router/router.php
index 640e42a47ed04..3fe1906c504aa 100644
--- a/libraries/cms/router/router.php
+++ b/libraries/cms/router/router.php
@@ -666,7 +666,7 @@ protected function _createUri($url)
 	 */
 	protected function createUri($url)
 	{
-		if (!is_array($url) && substr($url, 0, 1) != '&')
+		if (!is_array($url) && substr($url, 0, 1) !== '&')
 		{
 			return new JUri($url);
 		}
diff --git a/libraries/cms/router/site.php b/libraries/cms/router/site.php
index cf8ab62f398fc..9b7146dd2fc77 100644
--- a/libraries/cms/router/site.php
+++ b/libraries/cms/router/site.php
@@ -70,7 +70,7 @@ public function parse(&$uri)
 	{
 		$vars = array();
 
-		if ($this->app->get('force_ssl') == 2 && strtolower($uri->getScheme()) != 'https')
+		if ($this->app->get('force_ssl') == 2 && strtolower($uri->getScheme()) !== 'https')
 		{
 			// Forward to https
 			$uri->setScheme('https');
@@ -103,7 +103,7 @@ public function parse(&$uri)
 		// Identify format
 		if ($this->_mode == JROUTER_MODE_SEF)
 		{
-			if ($this->app->get('sef_suffix') && !(substr($path, -9) == 'index.php' || substr($path, -1) == '/'))
+			if ($this->app->get('sef_suffix') && !(substr($path, -9) === 'index.php' || substr($path, -1) === '/'))
 			{
 				if ($suffix = pathinfo($path, PATHINFO_EXTENSION))
 				{
@@ -152,7 +152,7 @@ public function build($url)
 		// Add the suffix to the uri
 		if ($this->_mode == JROUTER_MODE_SEF && $route)
 		{
-			if ($this->app->get('sef_suffix') && !(substr($route, -9) == 'index.php' || substr($route, -1) == '/'))
+			if ($this->app->get('sef_suffix') && !(substr($route, -9) === 'index.php' || substr($route, -1) === '/'))
 			{
 				if ($format = $uri->getVar('format', 'html'))
 				{
@@ -164,7 +164,7 @@ public function build($url)
 			if ($this->app->get('sef_rewrite'))
 			{
 				// Transform the route
-				if ($route == 'index.php')
+				if ($route === 'index.php')
 				{
 					$route = '';
 				}
@@ -299,7 +299,7 @@ protected function parseSefRoute(&$uri)
 		// Parse the application route
 		$segments = explode('/', $route);
 
-		if (count($segments) > 1 && $segments[0] == 'component')
+		if (count($segments) > 1 && $segments[0] === 'component')
 		{
 			$vars['option'] = 'com_' . $segments[1];
 			$vars['Itemid'] = null;
@@ -317,7 +317,7 @@ protected function parseSefRoute(&$uri)
 			// Iterate through all items and check route matches.
 			foreach ($items as $item)
 			{
-				if ($item->route && JString::strpos($route_lowercase . '/', $item->route . '/') === 0 && $item->type != 'menulink')
+				if ($item->route && JString::strpos($route_lowercase . '/', $item->route . '/') === 0 && $item->type !== 'menulink')
 				{
 					// Usual method for non-multilingual site.
 					if (!$this->app->getLanguageFilter())
@@ -336,7 +336,7 @@ protected function parseSefRoute(&$uri)
 						}
 					}
 					// Multilingual site.
-					elseif ($item->language == '*' || $item->language == $lang_tag)
+					elseif ($item->language === '*' || $item->language == $lang_tag)
 					{
 						// Exact route match.
 						if ($item->route == $route_lowercase)
diff --git a/libraries/cms/schema/changeitem.php b/libraries/cms/schema/changeitem.php
index 9e456ff1392f4..0864397d904f9 100644
--- a/libraries/cms/schema/changeitem.php
+++ b/libraries/cms/schema/changeitem.php
@@ -141,11 +141,11 @@ public static function getInstance($db, $file, $query)
 		// Get the class name
 		$dbname = $db->name;
 
-		if ($dbname == 'mysqli' || $dbname == 'pdomysql')
+		if ($dbname === 'mysqli' || $dbname === 'pdomysql')
 		{
 			$dbname = 'mysql';
 		}
-		elseif ($dbname == 'sqlazure')
+		elseif ($dbname === 'sqlazure')
 		{
 			$dbname = 'sqlsrv';
 		}
diff --git a/libraries/cms/schema/changeitem/mysql.php b/libraries/cms/schema/changeitem/mysql.php
index 0dfb6a986d3f3..d3fc1887c24ef 100644
--- a/libraries/cms/schema/changeitem/mysql.php
+++ b/libraries/cms/schema/changeitem/mysql.php
@@ -60,9 +60,9 @@ protected function buildCheckQuery()
 		$command = strtoupper($wordArray[0] . ' ' . $wordArray[1]);
 
 		// Check for special update statement to reset utf8mb4 conversion status
-		if (($command == 'UPDATE `#__UTF8_CONVERSION`'
-			|| $command == 'UPDATE #__UTF8_CONVERSION')
-			&& strtoupper($wordArray[2]) == 'SET'
+		if (($command === 'UPDATE `#__UTF8_CONVERSION`'
+			|| $command === 'UPDATE #__UTF8_CONVERSION')
+			&& strtoupper($wordArray[2]) === 'SET'
 			&& stripos(str_replace('`', '', $wordArray[3]), 'converted') === 0)
 		{
 			// Statement is special statement to reset conversion status
@@ -76,13 +76,13 @@ protected function buildCheckQuery()
 		{
 			$alterCommand = strtoupper($wordArray[3] . ' ' . $wordArray[4]);
 
-			if ($alterCommand == 'ADD COLUMN')
+			if ($alterCommand === 'ADD COLUMN')
 			{
 				$result = 'SHOW COLUMNS IN ' . $wordArray[2] . ' WHERE field = ' . $this->fixQuote($wordArray[5]);
 				$this->queryType = 'ADD_COLUMN';
 				$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]));
 			}
-			elseif ($alterCommand == 'ADD INDEX' || $alterCommand == 'ADD KEY')
+			elseif ($alterCommand === 'ADD INDEX' || $alterCommand === 'ADD KEY')
 			{
 				if ($pos = strpos($wordArray[5], '('))
 				{
@@ -97,7 +97,7 @@ protected function buildCheckQuery()
 				$this->queryType = 'ADD_INDEX';
 				$this->msgElements = array($this->fixQuote($wordArray[2]), $index);
 			}
-			elseif ($alterCommand == 'ADD UNIQUE')
+			elseif ($alterCommand === 'ADD UNIQUE')
 			{
 				$idxIndexName = 5;
 
@@ -105,7 +105,7 @@ protected function buildCheckQuery()
 				{
 					$addCmdCheck = strtoupper($wordArray[5]);
 
-					if ($addCmdCheck == 'INDEX' || $addCmdCheck == 'KEY')
+					if ($addCmdCheck === 'INDEX' || $addCmdCheck === 'KEY')
 					{
 						$idxIndexName = 6;
 					}
@@ -124,7 +124,7 @@ protected function buildCheckQuery()
 				$this->queryType = 'ADD_INDEX';
 				$this->msgElements = array($this->fixQuote($wordArray[2]), $index);
 			}
-			elseif ($alterCommand == 'DROP INDEX' || $alterCommand == 'DROP KEY')
+			elseif ($alterCommand === 'DROP INDEX' || $alterCommand === 'DROP KEY')
 			{
 				$index = $this->fixQuote($wordArray[5]);
 				$result = 'SHOW INDEXES IN ' . $wordArray[2] . ' WHERE Key_name = ' . $index;
@@ -132,7 +132,7 @@ protected function buildCheckQuery()
 				$this->checkQueryExpected = 0;
 				$this->msgElements = array($this->fixQuote($wordArray[2]), $index);
 			}
-			elseif ($alterCommand == 'DROP COLUMN')
+			elseif ($alterCommand === 'DROP COLUMN')
 			{
 				$index = $this->fixQuote($wordArray[5]);
 				$result = 'SHOW COLUMNS IN ' . $wordArray[2] . ' WHERE Field = ' . $index;
@@ -140,7 +140,7 @@ protected function buildCheckQuery()
 				$this->checkQueryExpected = 0;
 				$this->msgElements = array($this->fixQuote($wordArray[2]), $index);
 			}
-			elseif (strtoupper($wordArray[3]) == 'MODIFY')
+			elseif (strtoupper($wordArray[3]) === 'MODIFY')
 			{
 				// Kludge to fix problem with "integer unsigned"
 				$type = $wordArray[5];
@@ -161,7 +161,7 @@ protected function buildCheckQuery()
 				$this->queryType = 'CHANGE_COLUMN_TYPE';
 				$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[4]), $type);
 			}
-			elseif (strtoupper($wordArray[3]) == 'CHANGE')
+			elseif (strtoupper($wordArray[3]) === 'CHANGE')
 			{
 				// Kludge to fix problem with "integer unsigned"
 				$type = $wordArray[6];
@@ -184,9 +184,9 @@ protected function buildCheckQuery()
 			}
 		}
 
-		if ($command == 'CREATE TABLE')
+		if ($command === 'CREATE TABLE')
 		{
-			if (strtoupper($wordArray[2] . $wordArray[3] . $wordArray[4]) == 'IFNOTEXISTS')
+			if (strtoupper($wordArray[2] . $wordArray[3] . $wordArray[4]) === 'IFNOTEXISTS')
 			{
 				$table = $wordArray[5];
 			}
@@ -229,7 +229,7 @@ private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
 
-		if (strtolower($type1) == "integer" && stripos($type2, 'unsigned') === 0)
+		if (strtolower($type1) === "integer" && stripos($type2, 'unsigned') === 0)
 		{
 			$result = 'int(10) unsigned';
 		}
diff --git a/libraries/cms/schema/changeitem/postgresql.php b/libraries/cms/schema/changeitem/postgresql.php
index 5f0538a787678..1c383ab7e1540 100644
--- a/libraries/cms/schema/changeitem/postgresql.php
+++ b/libraries/cms/schema/changeitem/postgresql.php
@@ -82,7 +82,7 @@ protected function buildCheckQuery()
 			}
 			elseif ($alterCommand === 'ALTER COLUMN')
 			{
-				if (strtoupper($wordArray[6]) == 'TYPE')
+				if (strtoupper($wordArray[6]) === 'TYPE')
 				{
 					$type = '';
 
@@ -108,9 +108,9 @@ protected function buildCheckQuery()
 					$this->queryType = 'CHANGE_COLUMN_TYPE';
 					$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]), $type);
 				}
-				elseif (strtoupper($wordArray[7] . ' ' . $wordArray[8]) == 'NOT NULL')
+				elseif (strtoupper($wordArray[7] . ' ' . $wordArray[8]) === 'NOT NULL')
 				{
-					if (strtoupper($wordArray[6]) == 'SET')
+					if (strtoupper($wordArray[6]) === 'SET')
 					{
 						// SET NOT NULL
 						$isNullable = $this->fixQuote('NO');
@@ -131,7 +131,7 @@ protected function buildCheckQuery()
 				}
 				elseif (strtoupper($wordArray[7]) === 'DEFAULT')
 				{
-					if (strtoupper($wordArray[6]) == 'SET')
+					if (strtoupper($wordArray[6]) === 'SET')
 					{
 						$isNullDef = 'IS NOT NULL';
 					}
@@ -153,7 +153,7 @@ protected function buildCheckQuery()
 		}
 		elseif ($command === 'DROP INDEX')
 		{
-			if (strtoupper($wordArray[2] . $wordArray[3]) == 'IFEXISTS')
+			if (strtoupper($wordArray[2] . $wordArray[3]) === 'IFEXISTS')
 			{
 				$idx = $this->fixQuote($wordArray[4]);
 			}
@@ -167,7 +167,7 @@ protected function buildCheckQuery()
 			$this->checkQueryExpected = 0;
 			$this->msgElements = array($this->fixQuote($idx));
 		}
-		elseif ($command == 'CREATE INDEX' || (strtoupper($command . $wordArray[2]) == 'CREATE UNIQUE INDEX'))
+		elseif ($command === 'CREATE INDEX' || (strtoupper($command . $wordArray[2]) === 'CREATE UNIQUE INDEX'))
 		{
 			if ($wordArray[1] === 'UNIQUE')
 			{
@@ -186,9 +186,9 @@ protected function buildCheckQuery()
 			$this->msgElements = array($table, $idx);
 		}
 
-		if ($command == 'CREATE TABLE')
+		if ($command === 'CREATE TABLE')
 		{
-			if (strtoupper($wordArray[2] . $wordArray[3] . $wordArray[4]) == 'IFNOTEXISTS')
+			if (strtoupper($wordArray[2] . $wordArray[3] . $wordArray[4]) === 'IFNOTEXISTS')
 			{
 				$table = $this->fixQuote($wordArray[5]);
 			}
@@ -232,7 +232,7 @@ private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
 
-		if (strtolower($type1) == 'integer' && stripos($type2, 'unsigned') === 0)
+		if (strtolower($type1) === 'integer' && stripos($type2, 'unsigned') === 0)
 		{
 			$result = 'unsigned int(10)';
 		}
diff --git a/libraries/cms/schema/changeitem/sqlsrv.php b/libraries/cms/schema/changeitem/sqlsrv.php
index a0c4155c1e6ed..fb283f3fc32da 100644
--- a/libraries/cms/schema/changeitem/sqlsrv.php
+++ b/libraries/cms/schema/changeitem/sqlsrv.php
@@ -63,20 +63,20 @@ protected function buildCheckQuery()
 		{
 			$alterCommand = strtoupper($wordArray[3] . ' ' . $wordArray[4]);
 
-			if ($alterCommand == 'ADD')
+			if ($alterCommand === 'ADD')
 			{
 				$result = 'SELECT * FROM INFORMATION_SCHEMA.Columns ' . $wordArray[2] . ' WHERE COLUMN_NAME = ' . $this->fixQuote($wordArray[5]);
 				$this->queryType = 'ADD';
 				$this->msgElements = array($this->fixQuote($wordArray[2]), $this->fixQuote($wordArray[5]));
 			}
-			elseif ($alterCommand == 'CREATE INDEX')
+			elseif ($alterCommand === 'CREATE INDEX')
 			{
 				$index = $this->fixQuote(substr($wordArray[5], 0, strpos($wordArray[5], '(')));
 				$result = 'SELECT * FROM SYS.INDEXES ' . $wordArray[2] . ' WHERE name = ' . $index;
 				$this->queryType = 'CREATE INDEX';
 				$this->msgElements = array($this->fixQuote($wordArray[2]), $index);
 			}
-			elseif (strtoupper($wordArray[3]) == 'MODIFY' || strtoupper($wordArray[3]) == 'CHANGE')
+			elseif (strtoupper($wordArray[3]) === 'MODIFY' || strtoupper($wordArray[3]) === 'CHANGE')
 			{
 				$result = 'SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS  WHERE table_name = ' . $this->fixQuote($wordArray[2]);
 				$this->queryType = 'ALTER COLUMN COLUMN_NAME =' . $this->fixQuote($wordArray[4]);
@@ -84,7 +84,7 @@ protected function buildCheckQuery()
 			}
 		}
 
-		if ($command == 'CREATE TABLE')
+		if ($command === 'CREATE TABLE')
 		{
 			$table = $wordArray[2];
 			$result = 'SELECT * FROM sys.TABLES WHERE NAME = ' . $this->fixQuote($table);
@@ -121,7 +121,7 @@ private function fixInteger($type1, $type2)
 	{
 		$result = $type1;
 
-		if (strtolower($type1) == 'integer' && stripos($type2, 'unsigned') === 0)
+		if (strtolower($type1) === 'integer' && stripos($type2, 'unsigned') === 0)
 		{
 			$result = 'int';
 		}
diff --git a/libraries/cms/schema/changeset.php b/libraries/cms/schema/changeset.php
index d1337702257b2..78c9da1adcb01 100644
--- a/libraries/cms/schema/changeset.php
+++ b/libraries/cms/schema/changeset.php
@@ -95,7 +95,7 @@ public function __construct($db, $folder = null)
 		// If on mysql, add a query at the end to check for utf8mb4 conversion status
 		$serverType = $this->db->getServerType();
 
-		if ($serverType == 'mysql')
+		if ($serverType === 'mysql')
 		{
 			// Let the update query be something harmless which should always succeed
 			$tmpSchemaChangeItem = JSchemaChangeitem::getInstance(
@@ -258,11 +258,11 @@ private function getUpdateFiles()
 		// Get the folder from the database name
 		$sqlFolder = $this->db->name;
 
-		if ($sqlFolder == 'mysqli' || $sqlFolder == 'pdomysql')
+		if ($sqlFolder === 'mysqli' || $sqlFolder === 'pdomysql')
 		{
 			$sqlFolder = 'mysql';
 		}
-		elseif ($sqlFolder == 'sqlsrv')
+		elseif ($sqlFolder === 'sqlsrv')
 		{
 			$sqlFolder = 'sqlazure';
 		}
diff --git a/libraries/cms/toolbar/button/standard.php b/libraries/cms/toolbar/button/standard.php
index af1cde615b748..f0c4730d4aecf 100644
--- a/libraries/cms/toolbar/button/standard.php
+++ b/libraries/cms/toolbar/button/standard.php
@@ -44,7 +44,7 @@ public function fetchButton($type = 'Standard', $name = '', $text = '', $task =
 		$options['class'] = $this->fetchIconClass($name);
 		$options['doTask'] = $this->_getCommand($options['text'], $task, $list);
 
-		if ($name == 'apply' || $name == 'new')
+		if ($name === 'apply' || $name === 'new')
 		{
 			$options['btnClass'] = 'btn btn-small btn-success';
 			$options['class'] .= ' icon-white';
diff --git a/libraries/cms/ucm/content.php b/libraries/cms/ucm/content.php
index b9d3e0225ace5..90b93f1dde5ab 100644
--- a/libraries/cms/ucm/content.php
+++ b/libraries/cms/ucm/content.php
@@ -137,7 +137,7 @@ public function mapData($original, JUcmType $type = null)
 
 		foreach ($common as $i => $field)
 		{
-			if ($field && $field != 'null' && array_key_exists($field, $original))
+			if ($field && $field !== 'null' && array_key_exists($field, $original))
 			{
 				$ucmData['common'][$i] = $original[$field];
 			}
@@ -149,7 +149,7 @@ public function mapData($original, JUcmType $type = null)
 
 			foreach ($special as $i => $field)
 			{
-				if ($field && $field != 'null' && array_key_exists($field, $original))
+				if ($field && $field !== 'null' && array_key_exists($field, $original))
 				{
 					$ucmData['special'][$i] = $original[$field];
 				}
diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
index d276866c9a8c0..d7ec15f148dff 100644
--- a/libraries/cms/version/version.php
+++ b/libraries/cms/version/version.php
@@ -143,7 +143,7 @@ public function __get($name)
 	 */
 	public function isInDevelopmentState()
 	{
-		return strtolower(self::DEV_STATUS) != 'stable';
+		return strtolower(self::DEV_STATUS) !== 'stable';
 	}
 
 	/**

From a730ca0af44a05bb11d86f24bb271d65725ec3c5 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 4 Oct 2016 06:34:04 +0300
Subject: [PATCH 30/43] More type-safe comparisons

---
 libraries/cms/form/field/editor.php         | 10 ++++-----
 libraries/cms/form/field/media.php          |  2 +-
 libraries/cms/form/field/menuitem.php       |  2 +-
 libraries/cms/form/field/moduleposition.php |  2 +-
 libraries/cms/form/field/ordering.php       |  2 +-
 libraries/cms/form/field/templatestyle.php  |  2 +-
 libraries/cms/helper/media.php              |  2 +-
 libraries/cms/html/html.php                 | 24 ++++++++++-----------
 libraries/cms/html/select.php               | 12 +++++------
 libraries/cms/html/string.php               |  6 +++---
 libraries/cms/installer/adapter.php         |  2 +-
 libraries/cms/installer/adapter/package.php |  2 +-
 libraries/cms/installer/adapter/plugin.php  |  2 +-
 libraries/cms/installer/helper.php          |  2 +-
 libraries/cms/installer/installer.php       | 22 +++++++++----------
 libraries/cms/module/helper.php             |  2 +-
 libraries/cms/router/site.php               | 16 +++++++-------
 libraries/cms/table/contenthistory.php      |  2 +-
 libraries/cms/table/contenttype.php         |  2 +-
 libraries/cms/table/corecontent.php         |  8 +++----
 libraries/cms/toolbar/toolbar.php           |  2 +-
 libraries/cms/ucm/type.php                  |  2 +-
 22 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/libraries/cms/form/field/editor.php b/libraries/cms/form/field/editor.php
index f2edc78cdf16d..a9799960ab433 100644
--- a/libraries/cms/form/field/editor.php
+++ b/libraries/cms/form/field/editor.php
@@ -152,11 +152,11 @@ public function __set($name, $value)
 			case 'buttons':
 				$value = (string) $value;
 
-				if ($value === 'true' || $value === 'yes' || $value == '1')
+				if ($value === 'true' || $value === 'yes' || $value === '1')
 				{
 					$this->buttons = true;
 				}
-				elseif ($value === 'false' || $value === 'no' || $value == '0')
+				elseif ($value === 'false' || $value === 'no' || $value === '0')
 				{
 					$this->buttons = false;
 				}
@@ -199,7 +199,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 	{
 		$result = parent::setup($element, $value, $group);
 
-		if ($result == true)
+		if ($result === true)
 		{
 			$this->height      = $this->element['height'] ? (string) $this->element['height'] : '500';
 			$this->width       = $this->element['width'] ? (string) $this->element['width'] : '100%';
@@ -211,11 +211,11 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 			$hide       = (string) $this->element['hide'];
 			$editorType = (string) $this->element['editor'];
 
-			if ($buttons === 'true' || $buttons === 'yes' || $buttons == '1')
+			if ($buttons === 'true' || $buttons === 'yes' || $buttons === '1')
 			{
 				$this->buttons = true;
 			}
-			elseif ($buttons === 'false' || $buttons === 'no' || $buttons == '0')
+			elseif ($buttons === 'false' || $buttons === 'no' || $buttons === '0')
 			{
 				$this->buttons = false;
 			}
diff --git a/libraries/cms/form/field/media.php b/libraries/cms/form/field/media.php
index e954a84274aca..4328a67a52d44 100644
--- a/libraries/cms/form/field/media.php
+++ b/libraries/cms/form/field/media.php
@@ -185,7 +185,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 	{
 		$result = parent::setup($element, $value, $group);
 
-		if ($result == true)
+		if ($result === true)
 		{
 			$assetField = $this->element['asset_field'] ? (string) $this->element['asset_field'] : 'asset_id';
 
diff --git a/libraries/cms/form/field/menuitem.php b/libraries/cms/form/field/menuitem.php
index 9034066f53718..b6117de6da2c1 100644
--- a/libraries/cms/form/field/menuitem.php
+++ b/libraries/cms/form/field/menuitem.php
@@ -132,7 +132,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 	{
 		$result = parent::setup($element, $value, $group);
 
-		if ($result == true)
+		if ($result === true)
 		{
 			$this->menuType  = (string) $this->element['menu_type'];
 			$this->published = $this->element['published'] ? explode(',', (string) $this->element['published']) : array();
diff --git a/libraries/cms/form/field/moduleposition.php b/libraries/cms/form/field/moduleposition.php
index 2832c1953a12b..6c850617e3289 100644
--- a/libraries/cms/form/field/moduleposition.php
+++ b/libraries/cms/form/field/moduleposition.php
@@ -95,7 +95,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 	{
 		$result = parent::setup($element, $value, $group);
 
-		if ($result == true)
+		if ($result === true)
 		{
 			// Get the client id.
 			$clientId = $this->element['client_id'];
diff --git a/libraries/cms/form/field/ordering.php b/libraries/cms/form/field/ordering.php
index c0070f7c5a76d..db09de2de52a6 100644
--- a/libraries/cms/form/field/ordering.php
+++ b/libraries/cms/form/field/ordering.php
@@ -93,7 +93,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 	{
 		$result = parent::setup($element, $value, $group);
 
-		if ($result == true)
+		if ($result === true)
 		{
 			$this->contentType = (string) $this->element['content_type'];
 		}
diff --git a/libraries/cms/form/field/templatestyle.php b/libraries/cms/form/field/templatestyle.php
index fd83aa0409567..39f7446b1f440 100644
--- a/libraries/cms/form/field/templatestyle.php
+++ b/libraries/cms/form/field/templatestyle.php
@@ -106,7 +106,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 	{
 		$result = parent::setup($element, $value, $group);
 
-		if ($result == true)
+		if ($result === true)
 		{
 			// Get the clientName template.
 			$this->clientName = $this->element['client'] ? (string) $this->element['client'] : 'site';
diff --git a/libraries/cms/helper/media.php b/libraries/cms/helper/media.php
index 7672c24af8aeb..424a41e135a70 100644
--- a/libraries/cms/helper/media.php
+++ b/libraries/cms/helper/media.php
@@ -70,7 +70,7 @@ public function canUpload($file, $component = 'com_media')
 
 		jimport('joomla.filesystem.file');
 
-		if (str_replace(' ', '', $file['name']) != $file['name'] || $file['name'] !== JFile::makeSafe($file['name']))
+		if (str_replace(' ', '', $file['name']) !== $file['name'] || $file['name'] !== JFile::makeSafe($file['name']))
 		{
 			$app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNFILENAME'), 'notice');
 
diff --git a/libraries/cms/html/html.php b/libraries/cms/html/html.php
index ff1d852c9268f..d43cbcca14bae 100644
--- a/libraries/cms/html/html.php
+++ b/libraries/cms/html/html.php
@@ -68,8 +68,8 @@ protected static function extract($key)
 		// Check to see whether we need to load a helper file
 		$parts = explode('.', $key);
 
-		$prefix = (count($parts) == 3 ? array_shift($parts) : 'JHtml');
-		$file = (count($parts) == 2 ? array_shift($parts) : '');
+		$prefix = (count($parts) === 3 ? array_shift($parts) : 'JHtml');
+		$file = (count($parts) === 2 ? array_shift($parts) : '');
 		$func = array_shift($parts);
 
 		return array(strtolower($prefix . '.' . $file . '.' . $func), $prefix, $file, $func);
@@ -633,11 +633,11 @@ public static function stylesheet($file, $attribs = array(), $relative = false,
 		// If only path is required
 		if ($path_only)
 		{
-			if (count($includes) == 0)
+			if (count($includes) === 0)
 			{
 				return;
 			}
-			elseif (count($includes) == 1)
+			elseif (count($includes) === 1)
 			{
 				return $includes[0];
 			}
@@ -686,11 +686,11 @@ public static function script($file, $framework = false, $relative = false, $pat
 		// If only path is required
 		if ($path_only)
 		{
-			if (count($includes) == 0)
+			if (count($includes) === 0)
 			{
 				return;
 			}
-			elseif (count($includes) == 1)
+			elseif (count($includes) === 1)
 			{
 				return $includes[0];
 			}
@@ -898,10 +898,10 @@ public static function tooltipText($title = '', $content = '', $translate = 1, $
 		$result = '';
 
 		// Don't process empty strings
-		if ($content != '' || $title != '')
+		if ($content !== '' || $title !== '')
 		{
 			// Split title into title and content if the title contains '::' (old Mootools format).
-			if ($content == '' && !(strpos($title, '::') === false))
+			if ($content === '' && !(strpos($title, '::') === false))
 			{
 				list($title, $content) = explode('::', $title, 2);
 			}
@@ -914,17 +914,17 @@ public static function tooltipText($title = '', $content = '', $translate = 1, $
 			}
 
 			// Use only the content if no title is given.
-			if ($title == '')
+			if ($title === '')
 			{
 				$result = $content;
 			}
 			// Use only the title, if title and text are the same.
-			elseif ($title == $content)
+			elseif ($title === $content)
 			{
 				$result = '<strong>' . $title . '</strong>';
 			}
 			// Use a formatted string combining the title and content.
-			elseif ($content != '')
+			elseif ($content !== '')
 			{
 				$result = '<strong>' . $title . '</strong><br />' . $content;
 			}
@@ -979,7 +979,7 @@ public static function calendar($value, $name, $id, $format = '%Y-%m-%d', $attri
 		static::_('bootstrap.tooltip');
 
 		// Format value when not nulldate ('0000-00-00 00:00:00'), otherwise blank it as it would result in 1970-01-01.
-		if ($value && $value != JFactory::getDbo()->getNullDate() && strtotime($value) !== false)
+		if ($value && $value !== JFactory::getDbo()->getNullDate() && strtotime($value) !== false)
 		{
 			$tz = date_default_timezone_get();
 			date_default_timezone_set('UTC');
diff --git a/libraries/cms/html/select.php b/libraries/cms/html/select.php
index 3800011b7799a..07e2d36a485f6 100644
--- a/libraries/cms/html/select.php
+++ b/libraries/cms/html/select.php
@@ -95,7 +95,7 @@ public static function genericlist($data, $name, $attribs = null, $optKey = 'val
 		// Set default options
 		$options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'id' => false));
 
-		if (is_array($attribs) && func_num_args() == 3)
+		if (is_array($attribs) && func_num_args() === 3)
 		{
 			// Assume we have an options array
 			$options = array_merge($options, $attribs);
@@ -124,7 +124,7 @@ public static function genericlist($data, $name, $attribs = null, $optKey = 'val
 				$attribs = $options['list.attr'];
 			}
 
-			if ($attribs != '')
+			if ($attribs !== '')
 			{
 				$attribs = ' ' . $attribs;
 			}
@@ -249,7 +249,7 @@ public static function groupedlist($data, $name, $options = array())
 				$attribs = $options['list.attr'];
 			}
 
-			if ($attribs != '')
+			if ($attribs !== '')
 			{
 				$attribs = ' ' . $attribs;
 			}
@@ -354,7 +354,7 @@ public static function integerlist($start, $end, $inc, $name, $attribs = null, $
 		// Set default options
 		$options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'option.format' => '', 'id' => null));
 
-		if (is_array($attribs) && func_num_args() == 5)
+		if (is_array($attribs) && func_num_args() === 5)
 		{
 			// Assume we have an options array
 			$options = array_merge($options, $attribs);
@@ -725,7 +725,7 @@ public static function options($arr, $optKey = 'value', $optText = 'text', $sele
 						}
 					}
 				}
-				elseif ((string) $key == (string) $options['list.select'])
+				elseif ((string) $key === (string) $options['list.select'])
 				{
 					$extra .= ' selected="selected"';
 				}
@@ -799,7 +799,7 @@ public static function radiolist($data, $name, $attribs = null, $optKey = 'value
 			}
 			else
 			{
-				$extra .= ((string) $k == (string) $selected ? ' checked="checked" ' : '');
+				$extra .= ((string) $k === (string) $selected ? ' checked="checked" ' : '');
 			}
 
 			$html .= "\n\t" . '<label for="' . $id . '" id="' . $id . '-lbl" class="radio">';
diff --git a/libraries/cms/html/string.php b/libraries/cms/html/string.php
index 04cf67c9a996d..30e4e3ee83f21 100644
--- a/libraries/cms/html/string.php
+++ b/libraries/cms/html/string.php
@@ -103,7 +103,7 @@ public static function truncate($text, $length = 0, $noSplit = true, $allowHtml
 				$numOpened = count($openedTags);
 
 				// All tags are closed so trim the text and finish.
-				if (count($closedTags) == $numOpened)
+				if (count($closedTags) === $numOpened)
 				{
 					return trim($tmp) . '...';
 				}
@@ -163,7 +163,7 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
 		$baseLength = strlen($html);
 
 		// If the original HTML string is shorter than the $maxLength do nothing and return that.
-		if ($baseLength <= $maxLength || $maxLength == 0)
+		if ($baseLength <= $maxLength || $maxLength === 0)
 		{
 			return $html;
 		}
@@ -175,7 +175,7 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
 		}
 
 		// Deal with maximum length of 1 where the string starts with a tag.
-		if ($maxLength == 1 && $html[0] === '<')
+		if ($maxLength === 1 && $html[0] === '<')
 		{
 			$endTagPos = strlen(strstr($html, '>', true));
 			$tag = substr($html, 1, $endTagPos);
diff --git a/libraries/cms/installer/adapter.php b/libraries/cms/installer/adapter.php
index 219aeb961ee51..b7fd65e0ba94e 100644
--- a/libraries/cms/installer/adapter.php
+++ b/libraries/cms/installer/adapter.php
@@ -1021,7 +1021,7 @@ protected function triggerManifestScript($method)
 		$this->extensionMessage .= ob_get_clean();
 
 		// If in postflight or uninstall, set the message for display
-		if (($method === 'uninstall' || $method === 'postflight') && $this->extensionMessage != '')
+		if (($method === 'uninstall' || $method === 'postflight') && $this->extensionMessage !== '')
 		{
 			$this->parent->set('extension_message', $this->extensionMessage);
 		}
diff --git a/libraries/cms/installer/adapter/package.php b/libraries/cms/installer/adapter/package.php
index ed96cacfb363d..32f1c785ea025 100644
--- a/libraries/cms/installer/adapter/package.php
+++ b/libraries/cms/installer/adapter/package.php
@@ -451,7 +451,7 @@ protected function triggerManifestScript($method)
 		$this->extensionMessage .= ob_get_clean();
 
 		// If in postflight or uninstall, set the message for display
-		if (($method === 'uninstall' || $method === 'postflight') && $this->extensionMessage != '')
+		if (($method === 'uninstall' || $method === 'postflight') && $this->extensionMessage !== '')
 		{
 			$this->parent->set('extension_message', $this->extensionMessage);
 		}
diff --git a/libraries/cms/installer/adapter/plugin.php b/libraries/cms/installer/adapter/plugin.php
index bb9626172fa7d..d346ef6b58948 100644
--- a/libraries/cms/installer/adapter/plugin.php
+++ b/libraries/cms/installer/adapter/plugin.php
@@ -483,7 +483,7 @@ public function uninstall($id)
 		}
 
 		// Get the plugin folder so we can properly build the plugin path
-		if (trim($row->folder) == '')
+		if (trim($row->folder) === '')
 		{
 			JLog::add(JText::_('JLIB_INSTALLER_ERROR_PLG_UNINSTALL_FOLDER_FIELD_EMPTY'), JLog::WARNING, 'jerror');
 
diff --git a/libraries/cms/installer/helper.php b/libraries/cms/installer/helper.php
index d5d8905c5b320..b9740ae5c6b6d 100644
--- a/libraries/cms/installer/helper.php
+++ b/libraries/cms/installer/helper.php
@@ -173,7 +173,7 @@ public static function unpack($p_filename, $alwaysReturnArray = false)
 		 */
 		$dirList = array_merge((array) JFolder::files($extractdir, ''), (array) JFolder::folders($extractdir, ''));
 
-		if (count($dirList) == 1)
+		if (count($dirList) === 1)
 		{
 			if (JFolder::exists($extractdir . '/' . $dirList[0]))
 			{
diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
index df10fb11fa52e..24b8b16172474 100644
--- a/libraries/cms/installer/installer.php
+++ b/libraries/cms/installer/installer.php
@@ -859,7 +859,7 @@ public function parseQueries(SimpleXMLElement $element)
 		// Get the array of query nodes to process
 		$queries = $element->children();
 
-		if (count($queries) == 0)
+		if (count($queries) === 0)
 		{
 			// No queries to process
 			return 0;
@@ -953,7 +953,7 @@ public function parseSQLFiles($element)
 				// Create an array of queries from the sql file
 				$queries = JDatabaseDriver::splitSql($buffer);
 
-				if (count($queries) == 0)
+				if (count($queries) === 0)
 				{
 					// No queries to process
 					return 0;
@@ -1142,7 +1142,7 @@ public function parseSchemaUpdates(SimpleXMLElement $schema, $eid)
 							// Create an array of queries from the sql file
 							$queries = JDatabaseDriver::splitSql($buffer);
 
-							if (count($queries) == 0)
+							if (count($queries) === 0)
 							{
 								// No queries to process
 								continue;
@@ -1304,7 +1304,7 @@ public function parseFiles(SimpleXMLElement $element, $cid = 0, $oldFiles = null
 			 * we need to create it.
 			 */
 
-			if (basename($path['dest']) != $path['dest'])
+			if (basename($path['dest']) !== $path['dest'])
 			{
 				$newdir = dirname($path['dest']);
 
@@ -1386,11 +1386,11 @@ public function parseLanguages(SimpleXMLElement $element, $cid = 0)
 			// We will only install language files where a core language pack
 			// already exists.
 
-			if ((string) $file->attributes()->tag != '')
+			if ((string) $file->attributes()->tag !== '')
 			{
 				$path['src'] = $source . '/' . $file;
 
-				if ((string) $file->attributes()->client != '')
+				if ((string) $file->attributes()->client !== '')
 				{
 					// Override the client
 					$langclient = JApplicationHelper::getClientInfo((string) $file->attributes()->client, true);
@@ -1420,7 +1420,7 @@ public function parseLanguages(SimpleXMLElement $element, $cid = 0)
 			 * we need to create it.
 			 */
 
-			if (basename($path['dest']) != $path['dest'])
+			if (basename($path['dest']) !== $path['dest'])
 			{
 				$newdir = dirname($path['dest']);
 
@@ -1501,7 +1501,7 @@ public function parseMedia(SimpleXMLElement $element, $cid = 0)
 			 * we need to create it.
 			 */
 
-			if (basename($path['dest']) != $path['dest'])
+			if (basename($path['dest']) !== $path['dest'])
 			{
 				$newdir = dirname($path['dest']);
 
@@ -1624,7 +1624,7 @@ public function copyFiles($files, $overwrite = null)
 				elseif (($exists = file_exists($filedest)) && !$overwrite)
 				{
 					// It's okay if the manifest already exists
-					if ($this->getPath('manifest') == $filesource)
+					if ($this->getPath('manifest') === $filesource)
 					{
 						continue;
 					}
@@ -1721,7 +1721,7 @@ public function removeFiles($element, $cid = 0)
 		// Get the array of file nodes to process
 		$files = $element->children();
 
-		if (count($files) == 0)
+		if (count($files) === 0)
 		{
 			// No files to process
 			return true;
@@ -1796,7 +1796,7 @@ public function removeFiles($element, $cid = 0)
 			 * would go in the en_US subdirectory of the languages directory.
 			 */
 
-			if ($file->getName() === 'language' && (string) $file->attributes()->tag != '')
+			if ($file->getName() === 'language' && (string) $file->attributes()->tag !== '')
 			{
 				if ($source)
 				{
diff --git a/libraries/cms/module/helper.php b/libraries/cms/module/helper.php
index afa56331ac0cc..6b0ecd2348c90 100644
--- a/libraries/cms/module/helper.php
+++ b/libraries/cms/module/helper.php
@@ -93,7 +93,7 @@ public static function &getModules($position)
 			}
 		}
 
-		if (count($result) == 0)
+		if (count($result) === 0)
 		{
 			if ($input->getBool('tp') && JComponentHelper::getParams('com_templates')->get('template_positions_display'))
 			{
diff --git a/libraries/cms/router/site.php b/libraries/cms/router/site.php
index 9b7146dd2fc77..a52a1a09bad57 100644
--- a/libraries/cms/router/site.php
+++ b/libraries/cms/router/site.php
@@ -225,7 +225,7 @@ protected function parseRawRoute(&$uri)
 		$this->setVar('Itemid', $this->app->input->getInt('Itemid', null));
 
 		// Only an Itemid  OR if filter language plugin set? Get the full information from the itemid
-		if (count($this->getVars()) == 1 || ($this->app->getLanguageFilter() && count($this->getVars()) == 2))
+		if (count($this->getVars()) === 1 || ($this->app->getLanguageFilter() && count($this->getVars()) === 2))
 		{
 			$item = $this->menu->getItem($this->getVar('Itemid'));
 
@@ -323,7 +323,7 @@ protected function parseSefRoute(&$uri)
 					if (!$this->app->getLanguageFilter())
 					{
 						// Exact route match. We can break iteration because exact item was found.
-						if ($item->route == $route_lowercase)
+						if ($item->route === $route_lowercase)
 						{
 							$found = $item;
 							break;
@@ -336,22 +336,22 @@ protected function parseSefRoute(&$uri)
 						}
 					}
 					// Multilingual site.
-					elseif ($item->language === '*' || $item->language == $lang_tag)
+					elseif ($item->language === '*' || $item->language === $lang_tag)
 					{
 						// Exact route match.
-						if ($item->route == $route_lowercase)
+						if ($item->route === $route_lowercase)
 						{
 							$found = $item;
 
 							// Break iteration only if language is matched.
-							if ($item->language == $lang_tag)
+							if ($item->language === $lang_tag)
 							{
 								break;
 							}
 						}
 
 						// Partial route match. Item with highest level or same language takes priority.
-						if (!$found || $found->level < $item->level || $item->language == $lang_tag)
+						if (!$found || $found->level < $item->level || $item->language === $lang_tag)
 						{
 							$found = $item;
 						}
@@ -495,7 +495,7 @@ protected function buildSefRoute(&$uri)
 		$crouter   = $this->getComponentRouter($component);
 		$parts     = $crouter->build($query);
 		$result    = implode('/', $parts);
-		$tmp       = ($result != "") ? $result : '';
+		$tmp       = ($result !== '') ? $result : '';
 
 		// Build the application route
 		$built = false;
@@ -597,7 +597,7 @@ protected function processBuildRules(&$uri, $stage = self::PROCESS_DURING)
 			$query = $uri->getQuery(true);
 			if ($this->_mode != 1
 				&& isset($query['Itemid'])
-				&& (count($query) == 2 || (count($query) == 3 && isset($query['lang']))))
+				&& (count($query) === 2 || (count($query) === 3 && isset($query['lang']))))
 			{
 				// Get the active menu item
 				$itemid = $uri->getVar('Itemid');
diff --git a/libraries/cms/table/contenthistory.php b/libraries/cms/table/contenthistory.php
index 8ae796042b5a4..a9f6c587c890f 100644
--- a/libraries/cms/table/contenthistory.php
+++ b/libraries/cms/table/contenthistory.php
@@ -201,7 +201,7 @@ public function deleteOldVersions($maxVersions)
 		$idsToSave = $db->loadColumn(0);
 
 		// Don't process delete query unless we have at least the maximum allowed versions
-		if (count($idsToSave) == (int) $maxVersions)
+		if (count($idsToSave) === (int) $maxVersions)
 		{
 			// Delete any rows not in our list and and not flagged to keep forever.
 			$query = $db->getQuery(true);
diff --git a/libraries/cms/table/contenttype.php b/libraries/cms/table/contenttype.php
index aec631e710c1f..e702396d4e15b 100644
--- a/libraries/cms/table/contenttype.php
+++ b/libraries/cms/table/contenttype.php
@@ -39,7 +39,7 @@ public function __construct($db)
 	public function check()
 	{
 		// Check for valid name.
-		if (trim($this->type_title) == '')
+		if (trim($this->type_title) === '')
 		{
 			throw new UnexpectedValueException(sprintf('The title is empty'));
 		}
diff --git a/libraries/cms/table/corecontent.php b/libraries/cms/table/corecontent.php
index f850d96fd1602..0f94609da65ef 100644
--- a/libraries/cms/table/corecontent.php
+++ b/libraries/cms/table/corecontent.php
@@ -93,21 +93,21 @@ public function bind($array, $ignore = '')
 	 */
 	public function check()
 	{
-		if (trim($this->core_title) == '')
+		if (trim($this->core_title) === '')
 		{
 			$this->setError(JText::_('JLIB_CMS_WARNING_PROVIDE_VALID_NAME'));
 
 			return false;
 		}
 
-		if (trim($this->core_alias) == '')
+		if (trim($this->core_alias) === '')
 		{
 			$this->core_alias = $this->core_title;
 		}
 
 		$this->core_alias = JApplicationHelper::stringURLSafe($this->core_alias);
 
-		if (trim(str_replace('-', '', $this->core_alias)) == '')
+		if (trim(str_replace('-', '', $this->core_alias)) === '')
 		{
 			$this->core_alias = JFactory::getDate()->format('Y-m-d-H-i-s');
 		}
@@ -392,7 +392,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 		}
 
 		// If checkin is supported and all rows were adjusted, check them in.
-		if ($checkin && (count($pks) == $this->_db->getAffectedRows()))
+		if ($checkin && (count($pks) === $this->_db->getAffectedRows()))
 		{
 			// Checkin the rows.
 			foreach ($pks as $pk)
diff --git a/libraries/cms/toolbar/toolbar.php b/libraries/cms/toolbar/toolbar.php
index 1438e9d857019..16081047bd57c 100644
--- a/libraries/cms/toolbar/toolbar.php
+++ b/libraries/cms/toolbar/toolbar.php
@@ -298,7 +298,7 @@ public function addButtonPath($path)
 			$dir = trim($dir);
 
 			// Add trailing separators as needed.
-			if (substr($dir, -1) != DIRECTORY_SEPARATOR)
+			if (substr($dir, -1) !== DIRECTORY_SEPARATOR)
 			{
 				// Directory
 				$dir .= DIRECTORY_SEPARATOR;
diff --git a/libraries/cms/ucm/type.php b/libraries/cms/ucm/type.php
index bfbe6a74f7830..64dcac4d30578 100644
--- a/libraries/cms/ucm/type.php
+++ b/libraries/cms/ucm/type.php
@@ -165,7 +165,7 @@ public function getTypeByTable($tableName)
 			$tableFromType = json_decode($type->table);
 			$tableNameFromType = $tableFromType->special->prefix . $tableFromType->special->type;
 
-			if ($tableNameFromType == $tableName)
+			if ($tableNameFromType === $tableName)
 			{
 				return $type;
 			}

From 1ff621a3b071aa1430b2936504097a2deb8a66c1 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 4 Oct 2016 06:43:17 +0300
Subject: [PATCH 31/43] Changes that occurred during PR discussion

---
 libraries/cms/plugin/plugin.php | 6 ++----
 libraries/cms/search/helper.php | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libraries/cms/plugin/plugin.php b/libraries/cms/plugin/plugin.php
index 7759aa68b7ab8..3e19236b54d8f 100644
--- a/libraries/cms/plugin/plugin.php
+++ b/libraries/cms/plugin/plugin.php
@@ -97,9 +97,8 @@ public function __construct(&$subject, $config = array())
 		if (property_exists($this, 'app'))
 		{
 			$reflection = new ReflectionClass($this);
-			$appProperty = $reflection->getProperty('app');
 
-			if ($appProperty->isPrivate() === false && $this->app === null)
+			if ($reflection->getProperty('app')->isPrivate() === false && $this->app === null)
 			{
 				$this->app = JFactory::getApplication();
 			}
@@ -108,9 +107,8 @@ public function __construct(&$subject, $config = array())
 		if (property_exists($this, 'db'))
 		{
 			$reflection = new ReflectionClass($this);
-			$dbProperty = $reflection->getProperty('db');
 
-			if ($dbProperty->isPrivate() === false && $this->db === null)
+			if ($reflection->getProperty('db')->isPrivate() === false && $this->db === null)
 			{
 				$this->db = JFactory::getDbo();
 			}
diff --git a/libraries/cms/search/helper.php b/libraries/cms/search/helper.php
index 85d608cdcc849..a8bf385b4b27d 100644
--- a/libraries/cms/search/helper.php
+++ b/libraries/cms/search/helper.php
@@ -43,7 +43,7 @@ public static function logSearch($term, $component)
 				->from($db->quoteName('#__core_log_searches'))
 				->where($db->quoteName('search_term') . ' = ' . $db->quote($search_term));
 			$db->setQuery($query);
-			$hits = (int) ($db->loadResult());
+			$hits = (int) $db->loadResult();
 
 			// Reset the $query object
 			$query->clear();

From c67b374ba9c32066eb835fd4a7d02293fb4ba809 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Mon, 12 Dec 2016 23:49:58 +0200
Subject: [PATCH 32/43] Remove some unnecessary parentheses

---
 libraries/cms/html/behavior.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/cms/html/behavior.php b/libraries/cms/html/behavior.php
index df935c69035fb..15b54335c6081 100644
--- a/libraries/cms/html/behavior.php
+++ b/libraries/cms/html/behavior.php
@@ -290,13 +290,13 @@ public static function tooltip($selector = '.hasTip', $params = array())
 		$opt['maxTitleChars'] = (isset($params['maxTitleChars']) && ($params['maxTitleChars'])) ? (int) $params['maxTitleChars'] : 50;
 
 		// Offsets needs an array in the format: array('x'=>20, 'y'=>30)
-		$opt['offset']    = (isset($params['offset']) && (is_array($params['offset']))) ? $params['offset'] : null;
-		$opt['showDelay'] = (isset($params['showDelay'])) ? (int) $params['showDelay'] : null;
-		$opt['hideDelay'] = (isset($params['hideDelay'])) ? (int) $params['hideDelay'] : null;
-		$opt['className'] = (isset($params['className'])) ? $params['className'] : null;
+		$opt['offset']    = isset($params['offset']) && is_array($params['offset']) ? $params['offset'] : null;
+		$opt['showDelay'] = isset($params['showDelay']) ? (int) $params['showDelay'] : null;
+		$opt['hideDelay'] = isset($params['hideDelay']) ? (int) $params['hideDelay'] : null;
+		$opt['className'] = isset($params['className']) ? $params['className'] : null;
 		$opt['fixed']     = isset($params['fixed']) && $params['fixed'];
-		$opt['onShow']    = (isset($params['onShow'])) ? '\\' . $params['onShow'] : null;
-		$opt['onHide']    = (isset($params['onHide'])) ? '\\' . $params['onHide'] : null;
+		$opt['onShow']    = isset($params['onShow']) ? '\\' . $params['onShow'] : null;
+		$opt['onHide']    = isset($params['onHide']) ? '\\' . $params['onHide'] : null;
 
 		$options = JHtml::getJSObject($opt);
 

From 7e02da08f8f46f1ba3d4d763d214e6b6f526041c Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Mon, 12 Dec 2016 23:52:20 +0200
Subject: [PATCH 33/43] Removed empty if-group and reversed condition

---
 libraries/cms/component/helper.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/libraries/cms/component/helper.php b/libraries/cms/component/helper.php
index 63c61d102a3ee..849e5413bf010 100644
--- a/libraries/cms/component/helper.php
+++ b/libraries/cms/component/helper.php
@@ -238,12 +238,7 @@ public static function filterText($text)
 		$whiteListTags        = array_unique($whiteListTags);
 		$whiteListAttributes  = array_unique($whiteListAttributes);
 
-		// Unfiltered assumes first priority.
-		if ($unfiltered)
-		{
-			// Dont apply filtering.
-		}
-		else
+		if (!$unfiltered)
 		{
 			// Custom blacklist precedes Default blacklist
 			if ($customList)

From 4b30c1787ad9bf121b3f549c61c0a6673600af40 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 13 Jun 2017 18:12:01 +0300
Subject: [PATCH 34/43] Corrections on errors during merge (Conflict resolving)

---
 libraries/cms/html/string.php         | 8 ++++----
 libraries/cms/installer/installer.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/cms/html/string.php b/libraries/cms/html/string.php
index 9932d48fb1c33..5f375e4b861fe 100644
--- a/libraries/cms/html/string.php
+++ b/libraries/cms/html/string.php
@@ -36,7 +36,7 @@ abstract class JHtmlString
 	public static function truncate($text, $length = 0, $noSplit = true, $allowHtml = true)
 	{
 		// Assume a lone open tag is invalid HTML.
-		if ($length === 1 && $text[0] ==== '<')
+		if ($length === 1 && $text[0] === '<')
 		{
 			return '...';
 		}
@@ -63,7 +63,7 @@ public static function truncate($text, $length = 0, $noSplit = true, $allowHtml
 		{
 			$tmp = trim(StringHelper::substr($text, 0, $length));
 
-			if ($tmp[0] ==== '<' && strpos($tmp, '>') === false)
+			if ($tmp[0] === '<' && strpos($tmp, '>') === false)
 			{
 				return '...';
 			}
@@ -176,13 +176,13 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
 		}
 
 		// Take care of short simple cases.
-		if ($maxLength <= 3 && $html[0] !=== '<' && strpos(substr($html, 0, $maxLength - 1), '<') === false && $baseLength > $maxLength)
+		if ($maxLength <= 3 && $html[0] !== '<' && strpos(substr($html, 0, $maxLength - 1), '<') === false && $baseLength > $maxLength)
 		{
 			return '...';
 		}
 
 		// Deal with maximum length of 1 where the string starts with a tag.
-		if ($maxLength === 1 && $html[0] ==== '<')
+		if ($maxLength === 1 && $html[0] === '<')
 		{
 			$endTagPos = strlen(strstr($html, '>', true));
 			$tag = substr($html, 1, $endTagPos);
diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
index 9c6e3f7a0ec58..9e774adf382e1 100644
--- a/libraries/cms/installer/installer.php
+++ b/libraries/cms/installer/installer.php
@@ -2224,7 +2224,7 @@ public static function parseXMLInstallFile($path)
 		// Extensions use 'extension' as the root tag.  Languages use 'metafile' instead
 
 		$name = $xml->getName();
-		if ($name !=== 'extension' && $name !=== 'metafile')
+		if ($name !== 'extension' && $name !== 'metafile')
 		{
 			unset($xml);
 

From e3f86173d991a1da62c0c0ff732ae375e01177fc Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 13 Jun 2017 18:15:45 +0300
Subject: [PATCH 35/43] Missed one.

---
 libraries/cms/helper/media.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/cms/helper/media.php b/libraries/cms/helper/media.php
index f92fc5b65911a..117dcbb9ca5fa 100644
--- a/libraries/cms/helper/media.php
+++ b/libraries/cms/helper/media.php
@@ -362,13 +362,13 @@ public function countFiles($dir)
 
 			while (($entry = $d->read()) !== false)
 			{
-				if ($entry[0] !=== '.' && is_file($dir . DIRECTORY_SEPARATOR . $entry)
+				if ($entry[0] !== '.' && is_file($dir . DIRECTORY_SEPARATOR . $entry)
 					&& strpos($entry, '.html') === false && strpos($entry, '.php') === false)
 				{
 					$total_file++;
 				}
 
-				if ($entry[0] !=== '.' && is_dir($dir . DIRECTORY_SEPARATOR . $entry))
+				if ($entry[0] !== '.' && is_dir($dir . DIRECTORY_SEPARATOR . $entry))
 				{
 					$total_dir++;
 				}

From 7d7b3cd53dc7c1657bda2d8eaf51436a651d2574 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 13 Jun 2017 18:22:22 +0300
Subject: [PATCH 36/43] Remove a parenthesis

---
 libraries/cms/application/site.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/cms/application/site.php b/libraries/cms/application/site.php
index acb41d84e4374..18c76b8c79c76 100644
--- a/libraries/cms/application/site.php
+++ b/libraries/cms/application/site.php
@@ -748,7 +748,7 @@ protected function render()
 				$template = $this->getTemplate(true);
 				$file     = $this->input->get('tmpl', 'index');
 
-				if (($file === 'offline') && !$this->get('offline'))
+				if ($file === 'offline' && !$this->get('offline'))
 				{
 					$this->set('themeFile', 'index.php');
 				}

From 42a6146422b52a6da751f7791f9553e4925c9a18 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 13 Jun 2017 22:14:23 +0300
Subject: [PATCH 37/43] Changes according to reviewer's comment

---
 libraries/cms/helper/media.php        | 3 +--
 libraries/cms/html/tabs.php           | 1 -
 libraries/cms/installer/installer.php | 1 +
 libraries/cms/plugin/plugin.php       | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libraries/cms/helper/media.php b/libraries/cms/helper/media.php
index 117dcbb9ca5fa..082e411907f84 100644
--- a/libraries/cms/helper/media.php
+++ b/libraries/cms/helper/media.php
@@ -362,8 +362,7 @@ public function countFiles($dir)
 
 			while (($entry = $d->read()) !== false)
 			{
-				if ($entry[0] !== '.' && is_file($dir . DIRECTORY_SEPARATOR . $entry)
-					&& strpos($entry, '.html') === false && strpos($entry, '.php') === false)
+				if ($entry[0] !== '.' && strpos($entry, '.html') === false && strpos($entry, '.php') === false && is_file($dir . DIRECTORY_SEPARATOR . $entry))
 				{
 					$total_file++;
 				}
diff --git a/libraries/cms/html/tabs.php b/libraries/cms/html/tabs.php
index c0df62500591a..19727861471f9 100644
--- a/libraries/cms/html/tabs.php
+++ b/libraries/cms/html/tabs.php
@@ -9,7 +9,6 @@
 
 defined('JPATH_PLATFORM') or die;
 
-
 /**
  * Utility class for Tabs elements.
  *
diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
index 9e774adf382e1..39f7151797453 100644
--- a/libraries/cms/installer/installer.php
+++ b/libraries/cms/installer/installer.php
@@ -2224,6 +2224,7 @@ public static function parseXMLInstallFile($path)
 		// Extensions use 'extension' as the root tag.  Languages use 'metafile' instead
 
 		$name = $xml->getName();
+
 		if ($name !== 'extension' && $name !== 'metafile')
 		{
 			unset($xml);
diff --git a/libraries/cms/plugin/plugin.php b/libraries/cms/plugin/plugin.php
index d8d5406781dfa..ff456e0449bbe 100644
--- a/libraries/cms/plugin/plugin.php
+++ b/libraries/cms/plugin/plugin.php
@@ -97,7 +97,7 @@ public function __construct(&$subject, $config = array())
 		{
 			$reflection = new ReflectionClass($this);
 
-			if ($reflection->getProperty('app')->isPrivate() === false && $this->app === null)
+			if ($this->app === null && $reflection->getProperty('app')->isPrivate() === false)
 			{
 				$this->app = JFactory::getApplication();
 			}
@@ -107,7 +107,7 @@ public function __construct(&$subject, $config = array())
 		{
 			$reflection = new ReflectionClass($this);
 
-			if ($reflection->getProperty('db')->isPrivate() === false && $this->db === null)
+			if ($this->db === null && $reflection->getProperty('db')->isPrivate() === false)
 			{
 				$this->db = JFactory::getDbo();
 			}

From cb5ee9390fc5f45bebd2fc57a5e82e4b9d1e295b Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 13 Jun 2017 22:46:28 +0300
Subject: [PATCH 38/43] Revert change because of failure

---
 libraries/cms/plugin/plugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/cms/plugin/plugin.php b/libraries/cms/plugin/plugin.php
index ff456e0449bbe..d8d5406781dfa 100644
--- a/libraries/cms/plugin/plugin.php
+++ b/libraries/cms/plugin/plugin.php
@@ -97,7 +97,7 @@ public function __construct(&$subject, $config = array())
 		{
 			$reflection = new ReflectionClass($this);
 
-			if ($this->app === null && $reflection->getProperty('app')->isPrivate() === false)
+			if ($reflection->getProperty('app')->isPrivate() === false && $this->app === null)
 			{
 				$this->app = JFactory::getApplication();
 			}
@@ -107,7 +107,7 @@ public function __construct(&$subject, $config = array())
 		{
 			$reflection = new ReflectionClass($this);
 
-			if ($this->db === null && $reflection->getProperty('db')->isPrivate() === false)
+			if ($reflection->getProperty('db')->isPrivate() === false && $this->db === null)
 			{
 				$this->db = JFactory::getDbo();
 			}

From bb1002281b359c7d8c53c0b70bdfb9d38aa4caa1 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 13 Jun 2017 23:17:28 +0300
Subject: [PATCH 39/43] Changes according to reviewer's comment + a few more
 changes found last minute

---
 libraries/cms/html/menu.php             | 18 +++----
 libraries/cms/pagination/pagination.php | 68 ++++++++++++-------------
 libraries/cms/table/contenthistory.php  | 10 ++--
 3 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/libraries/cms/html/menu.php b/libraries/cms/html/menu.php
index 00f2de9fc99ee..27b982ebcc89e 100644
--- a/libraries/cms/html/menu.php
+++ b/libraries/cms/html/menu.php
@@ -84,7 +84,7 @@ public static function menuItems($config = array())
 			$clientId = array_key_exists('clientid', $config) ? $config['clientid'] : 0;
 			$menus    = static::menus($clientId);
 
-			$db = JFactory::getDbo();
+			$db    = JFactory::getDbo();
 			$query = $db->getQuery(true)
 				->select('a.id AS value, a.title AS text, a.level, a.menutype, a.client_id')
 				->from('#__menu AS a')
@@ -191,9 +191,9 @@ public static function menuItemList($name, $selected = null, $attribs = null, $c
 		return JHtml::_(
 			'select.genericlist', $options, $name,
 			array(
-				'id' => isset($config['id']) ? $config['id'] : 'assetgroups_' . (++$count),
-				'list.attr' => ($attribs === null ? 'class="inputbox" size="1"' : $attribs),
-				'list.select' => (int) $selected,
+				'id'             => isset($config['id']) ? $config['id'] : 'assetgroups_' . (++$count),
+				'list.attr'      => $attribs === null ? 'class="inputbox" size="1"' : $attribs,
+				'list.select'    => (int) $selected,
 				'list.translate' => false,
 			)
 		);
@@ -307,7 +307,7 @@ public static function linkOptions($all = false, $unassigned = false, $clientId
 		}
 
 		$lastMenuType = null;
-		$tmpMenuType = null;
+		$tmpMenuType  = null;
 
 		foreach ($list as $list_a)
 		{
@@ -318,9 +318,9 @@ public static function linkOptions($all = false, $unassigned = false, $clientId
 					$mitems[] = JHtml::_('select.option', '</OPTGROUP>');
 				}
 
-				$mitems[] = JHtml::_('select.option', '<OPTGROUP>', $list_a->menutype);
+				$mitems[]     = JHtml::_('select.option', '<OPTGROUP>', $list_a->menutype);
 				$lastMenuType = $list_a->menutype;
-				$tmpMenuType = $list_a->menutype;
+				$tmpMenuType  = $list_a->menutype;
 			}
 
 			$mitems[] = JHtml::_('select.option', $list_a->id, $list_a->title);
@@ -377,10 +377,10 @@ public static function treerecurse($id, $indent, $list, &$children, $maxlevel =
 					$txt = $pre . $v->title;
 				}
 
-				$list[$id] = $v;
+				$list[$id]           = $v;
 				$list[$id]->treename = $indent . $txt;
 				$list[$id]->children = count(@$children[$id]);
-				$list = static::treerecurse($id, $indent . $spacer, $list, $children, $maxlevel, $level + 1, $type);
+				$list                = static::treerecurse($id, $indent . $spacer, $list, $children, $maxlevel, $level + 1, $type);
 			}
 		}
 
diff --git a/libraries/cms/pagination/pagination.php b/libraries/cms/pagination/pagination.php
index 5a4dc27fff269..0098f8bf707ae 100644
--- a/libraries/cms/pagination/pagination.php
+++ b/libraries/cms/pagination/pagination.php
@@ -168,7 +168,7 @@ public function __construct($total, $limitstart, $limit, $prefix = '', JApplicat
 		}
 
 		// If we are viewing all records set the view all flag to true.
-		if ($limit == 0)
+		if ($limit === 0)
 		{
 			$this->viewall = true;
 		}
@@ -318,7 +318,7 @@ public function getPagesLinks()
 		// Build the page navigation list.
 		$data = $this->_buildDataObject();
 
-		$list = array();
+		$list           = array();
 		$list['prefix'] = $this->prefix;
 
 		$itemOverride = false;
@@ -359,34 +359,34 @@ public function getPagesLinks()
 		if ($data->all->base !== null)
 		{
 			$list['all']['active'] = true;
-			$list['all']['data'] = $itemOverride ? pagination_item_active($data->all) : $this->_item_active($data->all);
+			$list['all']['data']   = $itemOverride ? pagination_item_active($data->all) : $this->_item_active($data->all);
 		}
 		else
 		{
 			$list['all']['active'] = false;
-			$list['all']['data'] = $itemOverride ? pagination_item_inactive($data->all) : $this->_item_inactive($data->all);
+			$list['all']['data']   = $itemOverride ? pagination_item_inactive($data->all) : $this->_item_inactive($data->all);
 		}
 
 		if ($data->start->base !== null)
 		{
 			$list['start']['active'] = true;
-			$list['start']['data'] = $itemOverride ? pagination_item_active($data->start) : $this->_item_active($data->start);
+			$list['start']['data']   = $itemOverride ? pagination_item_active($data->start) : $this->_item_active($data->start);
 		}
 		else
 		{
 			$list['start']['active'] = false;
-			$list['start']['data'] = $itemOverride ? pagination_item_inactive($data->start) : $this->_item_inactive($data->start);
+			$list['start']['data']   = $itemOverride ? pagination_item_inactive($data->start) : $this->_item_inactive($data->start);
 		}
 
 		if ($data->previous->base !== null)
 		{
 			$list['previous']['active'] = true;
-			$list['previous']['data'] = $itemOverride ? pagination_item_active($data->previous) : $this->_item_active($data->previous);
+			$list['previous']['data']   = $itemOverride ? pagination_item_active($data->previous) : $this->_item_active($data->previous);
 		}
 		else
 		{
 			$list['previous']['active'] = false;
-			$list['previous']['data'] = $itemOverride ? pagination_item_inactive($data->previous) : $this->_item_inactive($data->previous);
+			$list['previous']['data']   = $itemOverride ? pagination_item_inactive($data->previous) : $this->_item_inactive($data->previous);
 		}
 
 		// Make sure it exists
@@ -397,35 +397,35 @@ public function getPagesLinks()
 			if ($page->base !== null)
 			{
 				$list['pages'][$i]['active'] = true;
-				$list['pages'][$i]['data'] = $itemOverride ? pagination_item_active($page) : $this->_item_active($page);
+				$list['pages'][$i]['data']   = $itemOverride ? pagination_item_active($page) : $this->_item_active($page);
 			}
 			else
 			{
 				$list['pages'][$i]['active'] = false;
-				$list['pages'][$i]['data'] = $itemOverride ? pagination_item_inactive($page) : $this->_item_inactive($page);
+				$list['pages'][$i]['data']   = $itemOverride ? pagination_item_inactive($page) : $this->_item_inactive($page);
 			}
 		}
 
 		if ($data->next->base !== null)
 		{
 			$list['next']['active'] = true;
-			$list['next']['data'] = $itemOverride ? pagination_item_active($data->next) : $this->_item_active($data->next);
+			$list['next']['data']   = $itemOverride ? pagination_item_active($data->next) : $this->_item_active($data->next);
 		}
 		else
 		{
 			$list['next']['active'] = false;
-			$list['next']['data'] = $itemOverride ? pagination_item_inactive($data->next) : $this->_item_inactive($data->next);
+			$list['next']['data']   = $itemOverride ? pagination_item_inactive($data->next) : $this->_item_inactive($data->next);
 		}
 
 		if ($data->end->base !== null)
 		{
 			$list['end']['active'] = true;
-			$list['end']['data'] = $itemOverride ? pagination_item_active($data->end) : $this->_item_active($data->end);
+			$list['end']['data']   = $itemOverride ? pagination_item_active($data->end) : $this->_item_active($data->end);
 		}
 		else
 		{
 			$list['end']['active'] = false;
-			$list['end']['data'] = $itemOverride ? pagination_item_inactive($data->end) : $this->_item_inactive($data->end);
+			$list['end']['data']   = $itemOverride ? pagination_item_inactive($data->end) : $this->_item_inactive($data->end);
 		}
 
 		if ($this->total > $this->limit)
@@ -451,7 +451,7 @@ public function getPagesLinks()
 	public function getPaginationLinks($layoutId = 'joomla.pagination.links', $options = array())
 	{
 		// Allow to receive a null layout
-		$layoutId = ($layoutId === null) ? 'joomla.pagination.links' : $layoutId;
+		$layoutId = $layoutId === null ? 'joomla.pagination.links' : $layoutId;
 
 		$list = array(
 			'prefix'       => $this->prefix,
@@ -484,15 +484,15 @@ public function getPaginationPages()
 			$data = $this->_buildDataObject();
 
 			// All
-			$list['all']['active'] = ($data->all->base !== null);
+			$list['all']['active'] = $data->all->base !== null;
 			$list['all']['data']   = $data->all;
 
 			// Start
-			$list['start']['active'] = ($data->start->base !== null);
+			$list['start']['active'] = $data->start->base !== null;
 			$list['start']['data']   = $data->start;
 
 			// Previous link
-			$list['previous']['active'] = ($data->previous->base !== null);
+			$list['previous']['active'] = $data->previous->base !== null;
 			$list['previous']['data']   = $data->previous;
 
 			// Make sure it exists
@@ -500,14 +500,14 @@ public function getPaginationPages()
 
 			foreach ($data->pages as $i => $page)
 			{
-				$list['pages'][$i]['active'] = ($page->base !== null);
+				$list['pages'][$i]['active'] = $page->base !== null;
 				$list['pages'][$i]['data']   = $page;
 			}
 
-			$list['next']['active'] = ($data->next->base !== null);
+			$list['next']['active'] = $data->next->base !== null;
 			$list['next']['data']   = $data->next;
 
-			$list['end']['active'] = ($data->end->base !== null);
+			$list['end']['active'] = $data->end->base !== null;
 			$list['end']['data']   = $data->end;
 		}
 
@@ -779,7 +779,7 @@ protected function _buildDataObject()
 		}
 
 		// Set the start and previous data objects.
-		$data->start = new JPaginationObject(JText::_('JLIB_HTML_START'), $this->prefix);
+		$data->start    = new JPaginationObject(JText::_('JLIB_HTML_START'), $this->prefix);
 		$data->previous = new JPaginationObject(JText::_('JPREV'), $this->prefix);
 
 		if ($this->pagesCurrent > 1)
@@ -789,29 +789,29 @@ protected function _buildDataObject()
 			// Set the empty for removal from route
 			// @todo remove code: $page = $page == 0 ? '' : $page;
 
-			$data->start->base = '0';
-			$data->start->link = JRoute::_($params . '&' . $this->prefix . 'limitstart=0');
+			$data->start->base    = '0';
+			$data->start->link    = JRoute::_($params . '&' . $this->prefix . 'limitstart=0');
 			$data->previous->base = $page;
 			$data->previous->link = JRoute::_($params . '&' . $this->prefix . 'limitstart=' . $page);
 		}
 
 		// Set the next and end data objects.
 		$data->next = new JPaginationObject(JText::_('JNEXT'), $this->prefix);
-		$data->end = new JPaginationObject(JText::_('JLIB_HTML_END'), $this->prefix);
+		$data->end  = new JPaginationObject(JText::_('JLIB_HTML_END'), $this->prefix);
 
 		if ($this->pagesCurrent < $this->pagesTotal)
 		{
 			$next = $this->pagesCurrent * $this->limit;
-			$end = ($this->pagesTotal - 1) * $this->limit;
+			$end  = ($this->pagesTotal - 1) * $this->limit;
 
 			$data->next->base = $next;
 			$data->next->link = JRoute::_($params . '&' . $this->prefix . 'limitstart=' . $next);
-			$data->end->base = $end;
-			$data->end->link = JRoute::_($params . '&' . $this->prefix . 'limitstart=' . $end);
+			$data->end->base  = $end;
+			$data->end->link  = JRoute::_($params . '&' . $this->prefix . 'limitstart=' . $end);
 		}
 
 		$data->pages = array();
-		$stop = $this->pagesStop;
+		$stop        = $this->pagesStop;
 
 		for ($i = $this->pagesStart; $i <= $stop; $i++)
 		{
@@ -819,7 +819,7 @@ protected function _buildDataObject()
 
 			$data->pages[$i] = new JPaginationObject($i, $this->prefix);
 
-			if ($i != $this->pagesCurrent || $this->viewall)
+			if ($i !== $this->pagesCurrent || $this->viewall)
 			{
 				$data->pages[$i]->base = $offset;
 				$data->pages[$i]->link = JRoute::_($params . '&' . $this->prefix . 'limitstart=' . $offset);
@@ -850,8 +850,8 @@ public function set($property, $value = null)
 
 		if (strpos($property, '.'))
 		{
-			$prop = explode('.', $property);
-			$prop[1] = ucfirst($prop[1]);
+			$prop     = explode('.', $property);
+			$prop[1]  = ucfirst($prop[1]);
 			$property = implode($prop);
 		}
 
@@ -875,8 +875,8 @@ public function get($property, $default = null)
 
 		if (strpos($property, '.'))
 		{
-			$prop = explode('.', $property);
-			$prop[1] = ucfirst($prop[1]);
+			$prop     = explode('.', $property);
+			$prop[1]  = ucfirst($prop[1]);
 			$property = implode($prop);
 		}
 
diff --git a/libraries/cms/table/contenthistory.php b/libraries/cms/table/contenthistory.php
index d29068cad0ff8..3f7dda8bbd1a4 100644
--- a/libraries/cms/table/contenthistory.php
+++ b/libraries/cms/table/contenthistory.php
@@ -56,7 +56,7 @@ public function __construct($db)
 			'hits',
 			'path',
 		);
-		$this->convertToInt = array('publish_up', 'publish_down', 'ordering', 'featured');
+		$this->convertToInt  = array('publish_up', 'publish_down', 'ordering', 'featured');
 	}
 
 	/**
@@ -127,12 +127,12 @@ public function getSha1($jsonData, JTableContenttype $typeTable)
 				// Go one level down for JSON column values
 				foreach ($value as $subName => $subValue)
 				{
-					$object->$subName = (is_int($subValue) || is_bool($subValue) || $subValue === null) ? (string) $subValue : $subValue;
+					$object->$subName = is_int($subValue) || is_bool($subValue) || $subValue === null ? (string) $subValue : $subValue;
 				}
 			}
 			else
 			{
-				$object->$name = (is_int($value) || is_bool($value) || $value === null) ? (string) $value : $value;
+				$object->$name = is_int($value) || is_bool($value) || $value === null ? (string) $value : $value;
 			}
 		}
 
@@ -163,7 +163,7 @@ public function getSha1($jsonData, JTableContenttype $typeTable)
 	 */
 	public function getHashMatch()
 	{
-		$db = $this->_db;
+		$db    = $this->_db;
 		$query = $db->getQuery(true);
 		$query->select('*')
 			->from($db->quoteName('#__ucm_history'))
@@ -189,7 +189,7 @@ public function deleteOldVersions($maxVersions)
 		$result = true;
 
 		// Get the list of version_id values we want to save
-		$db = $this->_db;
+		$db    = $this->_db;
 		$query = $db->getQuery(true);
 		$query->select($db->quoteName('version_id'))
 			->from($db->quoteName('#__ucm_history'))

From c4157d985b410e0be2bde09d11d913ad36c15735 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 13 Jun 2017 23:23:58 +0300
Subject: [PATCH 40/43] reversed change, though according to the method's doc
 that value should have been an integer...

---
 libraries/cms/pagination/pagination.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/cms/pagination/pagination.php b/libraries/cms/pagination/pagination.php
index 0098f8bf707ae..b8713e6af19c4 100644
--- a/libraries/cms/pagination/pagination.php
+++ b/libraries/cms/pagination/pagination.php
@@ -168,7 +168,7 @@ public function __construct($total, $limitstart, $limit, $prefix = '', JApplicat
 		}
 
 		// If we are viewing all records set the view all flag to true.
-		if ($limit === 0)
+		if ($limit == 0)
 		{
 			$this->viewall = true;
 		}

From ec2c21af0c76248ec9300739d1863cefb08ae846 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Tue, 13 Jun 2017 23:32:08 +0300
Subject: [PATCH 41/43] Hopefully fixed...

---
 libraries/cms/pagination/pagination.php | 2 +-
 libraries/cms/table/contenthistory.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/cms/pagination/pagination.php b/libraries/cms/pagination/pagination.php
index b8713e6af19c4..0098f8bf707ae 100644
--- a/libraries/cms/pagination/pagination.php
+++ b/libraries/cms/pagination/pagination.php
@@ -168,7 +168,7 @@ public function __construct($total, $limitstart, $limit, $prefix = '', JApplicat
 		}
 
 		// If we are viewing all records set the view all flag to true.
-		if ($limit == 0)
+		if ($limit === 0)
 		{
 			$this->viewall = true;
 		}
diff --git a/libraries/cms/table/contenthistory.php b/libraries/cms/table/contenthistory.php
index 3f7dda8bbd1a4..6a2242282689a 100644
--- a/libraries/cms/table/contenthistory.php
+++ b/libraries/cms/table/contenthistory.php
@@ -127,12 +127,12 @@ public function getSha1($jsonData, JTableContenttype $typeTable)
 				// Go one level down for JSON column values
 				foreach ($value as $subName => $subValue)
 				{
-					$object->$subName = is_int($subValue) || is_bool($subValue) || $subValue === null ? (string) $subValue : $subValue;
+					$object->$subName = (is_int($subValue) || is_bool($subValue) || $subValue === null) ? (string) $subValue : $subValue;
 				}
 			}
 			else
 			{
-				$object->$name = is_int($value) || is_bool($value) || $value === null ? (string) $value : $value;
+				$object->$name = (is_int($value) || is_bool($value) || $value === null) ? (string) $value : $value;
 			}
 		}
 

From c0d3b44bf662a3db17969989f7e01d0029f5835f Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Wed, 14 Jun 2017 00:04:56 +0300
Subject: [PATCH 42/43] Hopefully fixed...

---
 libraries/cms/pagination/pagination.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/cms/pagination/pagination.php b/libraries/cms/pagination/pagination.php
index 0098f8bf707ae..dad0d2903260c 100644
--- a/libraries/cms/pagination/pagination.php
+++ b/libraries/cms/pagination/pagination.php
@@ -168,7 +168,7 @@ public function __construct($total, $limitstart, $limit, $prefix = '', JApplicat
 		}
 
 		// If we are viewing all records set the view all flag to true.
-		if ($limit === 0)
+		if ($limit == 0)
 		{
 			$this->viewall = true;
 		}
@@ -819,7 +819,7 @@ protected function _buildDataObject()
 
 			$data->pages[$i] = new JPaginationObject($i, $this->prefix);
 
-			if ($i !== $this->pagesCurrent || $this->viewall)
+			if ($i != $this->pagesCurrent || $this->viewall)
 			{
 				$data->pages[$i]->base = $offset;
 				$data->pages[$i]->link = JRoute::_($params . '&' . $this->prefix . 'limitstart=' . $offset);

From 3619945edc188f727b198f3801eb031bec5eae0e Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Wed, 14 Jun 2017 00:08:46 +0300
Subject: [PATCH 43/43] Re-apply some changes

---
 libraries/cms/pagination/pagination.php | 2 +-
 libraries/cms/table/contenthistory.php  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/cms/pagination/pagination.php b/libraries/cms/pagination/pagination.php
index dad0d2903260c..dbc9e3ba3411d 100644
--- a/libraries/cms/pagination/pagination.php
+++ b/libraries/cms/pagination/pagination.php
@@ -168,7 +168,7 @@ public function __construct($total, $limitstart, $limit, $prefix = '', JApplicat
 		}
 
 		// If we are viewing all records set the view all flag to true.
-		if ($limit == 0)
+		if ($limit === 0)
 		{
 			$this->viewall = true;
 		}
diff --git a/libraries/cms/table/contenthistory.php b/libraries/cms/table/contenthistory.php
index 6a2242282689a..3f7dda8bbd1a4 100644
--- a/libraries/cms/table/contenthistory.php
+++ b/libraries/cms/table/contenthistory.php
@@ -127,12 +127,12 @@ public function getSha1($jsonData, JTableContenttype $typeTable)
 				// Go one level down for JSON column values
 				foreach ($value as $subName => $subValue)
 				{
-					$object->$subName = (is_int($subValue) || is_bool($subValue) || $subValue === null) ? (string) $subValue : $subValue;
+					$object->$subName = is_int($subValue) || is_bool($subValue) || $subValue === null ? (string) $subValue : $subValue;
 				}
 			}
 			else
 			{
-				$object->$name = (is_int($value) || is_bool($value) || $value === null) ? (string) $value : $value;
+				$object->$name = is_int($value) || is_bool($value) || $value === null ? (string) $value : $value;
 			}
 		}