From 2aa44e9e9fe4b949fbd4dc303a86757ebbb20d68 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 17:55:34 +0300
Subject: [PATCH 01/19] Elvis

---
 components/com_ajax/ajax.php                                  | 2 +-
 components/com_config/model/cms.php                           | 2 +-
 components/com_contact/views/contact/tmpl/default_links.php   | 2 +-
 components/com_content/helpers/icon.php                       | 2 +-
 components/com_content/views/archive/tmpl/default_items.php   | 2 +-
 components/com_content/views/article/tmpl/default_links.php   | 4 ++--
 components/com_content/views/article/view.html.php            | 2 +-
 .../com_content/views/category/tmpl/default_articles.php      | 2 +-
 components/com_content/views/category/view.feed.php           | 2 +-
 components/com_content/views/featured/view.feed.php           | 2 +-
 components/com_tags/views/tag/view.feed.php                   | 2 +-
 components/com_tags/views/tags/view.feed.php                  | 2 +-
 components/com_users/models/reset.php                         | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/components/com_ajax/ajax.php b/components/com_ajax/ajax.php
index 6c469cf2f2686..fb3d837f8318b 100644
--- a/components/com_ajax/ajax.php
+++ b/components/com_ajax/ajax.php
@@ -82,7 +82,7 @@
 			$class = 'Mod' . ucfirst($module) . 'Helper';
 		}
 
-		$method = $input->get('method') ? $input->get('method') : 'get';
+		$method = $input->get('method') ?: 'get';
 
 		if (is_file($helperFile))
 		{
diff --git a/components/com_config/model/cms.php b/components/com_config/model/cms.php
index f6966288ab1a2..b1c0b10ed6991 100644
--- a/components/com_config/model/cms.php
+++ b/components/com_config/model/cms.php
@@ -218,7 +218,7 @@ protected function cleanCache($group = null, $client_id = 0)
 		$dispatcher = JEventDispatcher::getInstance();
 
 		$options = array(
-			'defaultgroup' => ($group) ? $group : (isset($this->option) ? $this->option : JFactory::getApplication()->input->get('option')),
+			'defaultgroup' => ($group) ?: (isset($this->option) ? $this->option : JFactory::getApplication()->input->get('option')),
 			'cachebase' => ($client_id) ? JPATH_ADMINISTRATOR . '/cache' : $conf->get('cache_path', JPATH_SITE . '/cache'));
 
 		$cache = JCache::getInstance('callback', $options);
diff --git a/components/com_contact/views/contact/tmpl/default_links.php b/components/com_contact/views/contact/tmpl/default_links.php
index 4a38c96c5f9d1..8901ac9d6f9dc 100644
--- a/components/com_contact/views/contact/tmpl/default_links.php
+++ b/components/com_contact/views/contact/tmpl/default_links.php
@@ -36,7 +36,7 @@
 			$link = (0 === strpos($link, 'http')) ? $link : 'http://' . $link;
 
 			// If no label is present, take the link
-			$label = ($label) ? $label : $link;
+			$label = ($label) ?: $link;
 			?>
 			<li>
 				<a href="<?php echo $link; ?>" itemprop="url">
diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php
index a0a034fca05f6..78d1ed117e72d 100644
--- a/components/com_content/helpers/icon.php
+++ b/components/com_content/helpers/icon.php
@@ -190,7 +190,7 @@ public static function edit($article, $params, $attribs = array(), $legacy = fal
 		}
 
 		$date   = JHtml::_('date', $article->created);
-		$author = $article->created_by_alias ? $article->created_by_alias : $article->author;
+		$author = $article->created_by_alias ?: $article->author;
 
 		$overlib .= '&lt;br /&gt;';
 		$overlib .= $date;
diff --git a/components/com_content/views/archive/tmpl/default_items.php b/components/com_content/views/archive/tmpl/default_items.php
index 5ffaaedddd253..9d8588d5f8724 100644
--- a/components/com_content/views/archive/tmpl/default_items.php
+++ b/components/com_content/views/archive/tmpl/default_items.php
@@ -29,7 +29,7 @@
 				</h2>
 				<?php if ($params->get('show_author') && !empty($item->author )) : ?>
 					<div class="createdby" itemprop="author" itemscope itemtype="https://schema.org/Person">
-					<?php $author = ($item->created_by_alias) ? $item->created_by_alias : $item->author; ?>
+					<?php $author = ($item->created_by_alias) ?: $item->author; ?>
 					<?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
 						<?php if (!empty($item->contact_link) && $params->get('link_author') == true) : ?>
 							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author, array('itemprop' => 'url'))); ?>
diff --git a/components/com_content/views/article/tmpl/default_links.php b/components/com_content/views/article/tmpl/default_links.php
index 6aef351033479..05254f7386be3 100644
--- a/components/com_content/views/article/tmpl/default_links.php
+++ b/components/com_content/views/article/tmpl/default_links.php
@@ -35,10 +35,10 @@
 				endif;
 
 				// If no label is present, take the link
-				$label = ($label) ? $label : $link;
+				$label = ($label) ?: $link;
 
 				// If no target is present, use the default
-				$target = $target ? $target : $params->get('target' . $id);
+				$target = $target ?: $params->get('target' . $id);
 				?>
 			<li class="content-links-<?php echo $id; ?>">
 				<?php
diff --git a/components/com_content/views/article/view.html.php b/components/com_content/views/article/view.html.php
index d5caf988879ed..4686f86d9c0b2 100644
--- a/components/com_content/views/article/view.html.php
+++ b/components/com_content/views/article/view.html.php
@@ -279,7 +279,7 @@ protected function _prepareDocument()
 
 		if ($app->get('MetaAuthor') == '1')
 		{
-			$author = $this->item->created_by_alias ? $this->item->created_by_alias : $this->item->author;
+			$author = $this->item->created_by_alias ?: $this->item->author;
 			$this->document->setMetaData('author', $author);
 		}
 
diff --git a/components/com_content/views/category/tmpl/default_articles.php b/components/com_content/views/category/tmpl/default_articles.php
index c6bc7f85b04cf..ab3addb4bd4df 100644
--- a/components/com_content/views/category/tmpl/default_articles.php
+++ b/components/com_content/views/category/tmpl/default_articles.php
@@ -177,7 +177,7 @@
 				<td <?php echo $headerAuthor; ?> class="list-author">
 					<?php if (!empty($article->author) || !empty($article->created_by_alias)) : ?>
 						<?php $author = $article->author ?>
-						<?php $author = ($article->created_by_alias ? $article->created_by_alias : $author);?>
+						<?php $author = ($article->created_by_alias ?: $author);?>
 						<?php if (!empty($article->contact_link) && $this->params->get('link_author') == true) : ?>
 							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $article->contact_link, $author)); ?>
 						<?php else: ?>
diff --git a/components/com_content/views/category/view.feed.php b/components/com_content/views/category/view.feed.php
index 0223547bd7f89..d13d0d45d03b4 100644
--- a/components/com_content/views/category/view.feed.php
+++ b/components/com_content/views/category/view.feed.php
@@ -51,6 +51,6 @@ protected function reconcileNames($item)
 			$item->description .= '<p class="feed-readmore"><a target="_blank" href ="' . $link . '">' . JText::_('COM_CONTENT_FEED_READMORE') . '</a></p>';
 		}
 
-		$item->author = $item->created_by_alias ? $item->created_by_alias : $item->author;
+		$item->author = $item->created_by_alias ?: $item->author;
 	}
 }
diff --git a/components/com_content/views/featured/view.feed.php b/components/com_content/views/featured/view.feed.php
index e01bb49335e65..9d27d6bdf3abf 100644
--- a/components/com_content/views/featured/view.feed.php
+++ b/components/com_content/views/featured/view.feed.php
@@ -60,7 +60,7 @@ public function display($tpl = null)
 			$row->fulltext = $db->loadResult();
 
 			$description = ($params->get('feed_summary', 0) ? $row->introtext . $row->fulltext : $row->introtext);
-			$author      = $row->created_by_alias ? $row->created_by_alias : $row->author;
+			$author      = $row->created_by_alias ?: $row->author;
 
 			// Load individual item creator class
 			$item           = new JFeedItem;
diff --git a/components/com_tags/views/tag/view.feed.php b/components/com_tags/views/tag/view.feed.php
index b4788a061adbe..30be7986525a4 100644
--- a/components/com_tags/views/tag/view.feed.php
+++ b/components/com_tags/views/tag/view.feed.php
@@ -57,7 +57,7 @@ public function display($tpl = null)
 
 				// Strip HTML from feed item description text
 				$description = $item->core_body;
-				$author      = $item->core_created_by_alias ? $item->core_created_by_alias : $item->author;
+				$author      = $item->core_created_by_alias ?: $item->author;
 				$date        = ($item->displayDate ? date('r', strtotime($item->displayDate)) : '');
 
 				// Load individual item creator class
diff --git a/components/com_tags/views/tags/view.feed.php b/components/com_tags/views/tags/view.feed.php
index c1adf9cc9dda6..f8d0330f00873 100644
--- a/components/com_tags/views/tags/view.feed.php
+++ b/components/com_tags/views/tags/view.feed.php
@@ -51,7 +51,7 @@ public function display($tpl = null)
 
 			// Strip HTML from feed item description text
 			$description = $item->description;
-			$author      = $item->created_by_alias ? $item->created_by_alias : $item->author;
+			$author      = $item->created_by_alias ?: $item->author;
 			$date        = ($item->displayDate ? date('r', strtotime($item->displayDate)) : '');
 
 			// Load individual item creator class
diff --git a/components/com_users/models/reset.php b/components/com_users/models/reset.php
index eef0d87187639..5a0cef807ec6e 100644
--- a/components/com_users/models/reset.php
+++ b/components/com_users/models/reset.php
@@ -500,7 +500,7 @@ public function checkResetLimit($user)
 		$resetHours = (int) $params->get('reset_time');
 		$result = true;
 
-		$lastResetTime = strtotime($user->lastResetTime) ? strtotime($user->lastResetTime) : 0;
+		$lastResetTime = strtotime($user->lastResetTime) ?: 0;
 		$hoursSinceLastReset = (strtotime(JFactory::getDate()->toSql()) - $lastResetTime) / 3600;
 
 		if ($hoursSinceLastReset > $resetHours)

From cafbc0bee670d4eb58c78ed10a14337aa4ccb4e2 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 17:57:37 +0300
Subject: [PATCH 02/19] Merge nested positive ifs

---
 components/com_config/model/templates.php | 7 ++-----
 components/com_content/models/form.php    | 6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/components/com_config/model/templates.php b/components/com_config/model/templates.php
index fa11999839f0c..fc3485ef90d6f 100644
--- a/components/com_config/model/templates.php
+++ b/components/com_config/model/templates.php
@@ -108,13 +108,10 @@ protected function preprocessForm(JForm $form, $data, $group = 'content')
 			$formFile = JPath::clean(JPATH_BASE . '/templates/' . $template . '/templateDetails.xml');
 		}
 
-		if (file_exists($formFile))
+		// Get the template form.
+		if (file_exists($formFile) && !$form->loadFile($formFile, false, '//config'))
 		{
-			// Get the template form.
-			if (!$form->loadFile($formFile, false, '//config'))
-			{
 				throw new Exception(JText::_('JERROR_LOADFILE_FAILED'));
-			}
 		}
 
 		// Attempt to load the xml file.
diff --git a/components/com_content/models/form.php b/components/com_content/models/form.php
index c39be47a16b08..3833b225e8a34 100644
--- a/components/com_content/models/form.php
+++ b/components/com_content/models/form.php
@@ -179,17 +179,15 @@ public function getReturnPage()
 	public function save($data)
 	{
 		// Associations are not edited in frontend ATM so we have to inherit them
-		if (JLanguageAssociations::isEnabled() && !empty($data['id']))
+		if (JLanguageAssociations::isEnabled() && !empty($data['id'])
+			&& $associations = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $data['id']))
 		{
-			if ($associations = JLanguageAssociations::getAssociations('com_content', '#__content', 'com_content.item', $data['id']))
-			{
 				foreach ($associations as $tag => $associated)
 				{
 					$associations[$tag] = (int) $associated->id;
 				}
 
 				$data['associations'] = $associations;
-			}
 		}
 
 		return parent::save($data);

From 330d82c3d6b20e357fa35200c8084f9e76c742ca Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 18:40:02 +0300
Subject: [PATCH 03/19] Replaced some " with ' and proposed HEREDOC for bigger
 SQL Statements, otherwise concatenated. The issue here ,is of course what's
 the best way to deal with complicated conditions or otherwise dynamically
 created SQL.

---
 components/com_banners/models/banners.php     | 38 ++++++++++++-------
 components/com_contact/helpers/route.php      |  4 +-
 components/com_contact/models/category.php    |  2 +-
 .../views/contact/tmpl/default_profile.php    |  6 +--
 .../com_contact/views/contact/view.html.php   | 36 +++++++++---------
 .../views/featured/tmpl/default_items.php     |  2 +-
 components/com_content/helpers/route.php      |  4 +-
 components/com_content/models/articles.php    |  2 +-
 .../com_content/views/archive/view.html.php   |  4 +-
 .../views/category/tmpl/default_articles.php  |  6 +--
 components/com_newsfeeds/helpers/route.php    |  4 +-
 .../views/newsfeed/tmpl/default.php           | 14 +++----
 .../com_tags/views/tag/tmpl/list_items.php    |  6 +--
 components/com_tags/views/tag/view.feed.php   |  2 +-
 components/com_tags/views/tags/view.feed.php  |  2 +-
 components/com_users/helpers/html/users.php   |  2 +-
 components/com_users/models/registration.php  |  4 +-
 17 files changed, 75 insertions(+), 63 deletions(-)

diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php
index aea8d854e4066..d63894bc844b2 100644
--- a/components/com_banners/models/banners.php
+++ b/components/com_banners/models/banners.php
@@ -152,31 +152,43 @@ protected function getListQuery()
 				foreach ($keywords as $keyword)
 				{
 					$keyword = trim($keyword);
-					$condition1 = "a.own_prefix=1 "
-						. " AND a.metakey_prefix=SUBSTRING(" . $db->quote($keyword) . ",1,LENGTH( a.metakey_prefix)) "
-						. " OR a.own_prefix=0 "
-						. " AND cl.own_prefix=1 "
-						. " AND cl.metakey_prefix=SUBSTRING(" . $db->quote($keyword) . ",1,LENGTH(cl.metakey_prefix)) "
-						. " OR a.own_prefix=0 "
-						. " AND cl.own_prefix=0 "
-						. " AND " . ($prefix == substr($keyword, 0, strlen($prefix)) ? '1' : '0');
 
-					$condition2 = "a.metakey REGEXP '[[:<:]]" . $db->escape($keyword) . "[[:>:]]'";
+					$quotedKeyword = $db->quote($keyword);
+					$prefixCondition = ($prefix == substr($keyword, 0, strlen($prefix)) ? '1' : '0');
+
+					$condition1 = /** @lang SQL */
+						<<<SQL
+a.own_prefix=1 
+AND a.metakey_prefix=SUBSTRING($quotedKeyword,1,LENGTH( a.metakey_prefix)) 
+OR a.own_prefix=0 
+AND cl.own_prefix=1 
+AND cl.metakey_prefix=SUBSTRING($quotedKeyword,1,LENGTH(cl.metakey_prefix)) 
+OR a.own_prefix=0 
+AND cl.own_prefix=0 
+AND $prefixCondition
+SQL;
+
+					// Todo: Check with other Joomla members if the above change makes enough sense if the above is not a complete
+					//       Statement and there are other conditions following.
+					//       The other question is of course, if such queries will in future all be done with the query builder
+
+					$escapedKeyword = $db->escape($keyword);
+					$condition2 = "a.metakey REGEXP '[[:<:]]" . $escapedKeyword . "[[:>:]]'";
 
 					if ($cid)
 					{
-						$condition2 .= " OR cl.metakey REGEXP '[[:<:]]" . $db->escape($keyword) . "[[:>:]]'";
+						$condition2 .= " OR cl.metakey REGEXP '[[:<:]]" . $escapedKeyword . "[[:>:]]'";
 					}
 
 					if ($categoryId)
 					{
-						$condition2 .= " OR cat.metakey REGEXP '[[:<:]]" . $db->escape($keyword) . "[[:>:]]'";
+						$condition2 .= " OR cat.metakey REGEXP '[[:<:]]" . $escapedKeyword . "[[:>:]]'";
 					}
 
-					$temp[] = "($condition1) AND ($condition2)";
+					$temp = "($condition1) AND ($condition2)";
 				}
 
-				$query->where('(' . implode(' OR ', $temp) . ')');
+				$query->where($temp);
 			}
 		}
 
diff --git a/components/com_contact/helpers/route.php b/components/com_contact/helpers/route.php
index 6b3f210238c14..f6f69996dbdb4 100644
--- a/components/com_contact/helpers/route.php
+++ b/components/com_contact/helpers/route.php
@@ -54,7 +54,7 @@ public static function getContactRoute($id, $catid, $language = 0)
 			}
 		}
 
-		if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+		if ($language && $language != '*' && JLanguageMultilang::isEnabled())
 		{
 			$link .= '&lang=' . $language;
 			$needles['language'] = $language;
@@ -106,7 +106,7 @@ public static function getCategoryRoute($catid, $language = 0)
 			$needles['category']   = $catids;
 			$needles['categories'] = $catids;
 
-			if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+			if ($language && $language != '*' && JLanguageMultilang::isEnabled())
 			{
 				$link .= '&lang=' . $language;
 				$needles['language'] = $language;
diff --git a/components/com_contact/models/category.php b/components/com_contact/models/category.php
index 044d42b783d74..1c6c22ae3b04d 100644
--- a/components/com_contact/models/category.php
+++ b/components/com_contact/models/category.php
@@ -159,7 +159,7 @@ protected function getListQuery()
 
 		// Join over the users for the author and modified_by names.
 		$query->select("CASE WHEN a.created_by_alias > ' ' THEN a.created_by_alias ELSE ua.name END AS author")
-			->select("ua.email AS author_email")
+			->select('ua.email AS author_email')
 
 			->join('LEFT', '#__users AS ua ON ua.id = a.created_by')
 			->join('LEFT', '#__users AS uam ON uam.id = a.modified_by');
diff --git a/components/com_contact/views/contact/tmpl/default_profile.php b/components/com_contact/views/contact/tmpl/default_profile.php
index 1e699d1ad2dc1..650af2c79d929 100644
--- a/components/com_contact/views/contact/tmpl/default_profile.php
+++ b/components/com_contact/views/contact/tmpl/default_profile.php
@@ -19,17 +19,17 @@
 					$profile->text = htmlspecialchars($profile->value, ENT_COMPAT, 'UTF-8');
 
 					switch ($profile->id) :
-						case "profile_website":
+						case 'profile_website':
 							$v_http = substr($profile->value, 0, 4);
 
-							if ($v_http == "http") :
+							if ($v_http == 'http') :
 								echo '<dd><a href="' . $profile->text . '">' . JStringPunycode::urlToUTF8($profile->text) . '</a></dd>';
 							else :
 								echo '<dd><a href="http://' . $profile->text . '">' . JStringPunycode::urlToUTF8($profile->text) . '</a></dd>';
 							endif;
 							break;
 
-						case "profile_dob":
+						case 'profile_dob':
 							echo '<dd>' . JHtml::_('date', $profile->text, JText::_('DATE_FORMAT_LC4'), false) . '</dd>';
 						break;
 
diff --git a/components/com_contact/views/contact/view.html.php b/components/com_contact/views/contact/view.html.php
index 174c5b37d5fc8..f0c8f336bf0a6 100644
--- a/components/com_contact/views/contact/view.html.php
+++ b/components/com_contact/views/contact/view.html.php
@@ -138,12 +138,12 @@ public function display($tpl = null)
 		{
 			case 1 :
 				// Text
-				$params->set('marker_address',   JText::_('COM_CONTACT_ADDRESS') . ": ");
-				$params->set('marker_email',     JText::_('JGLOBAL_EMAIL') . ": ");
-				$params->set('marker_telephone', JText::_('COM_CONTACT_TELEPHONE') . ": ");
-				$params->set('marker_fax',       JText::_('COM_CONTACT_FAX') . ": ");
-				$params->set('marker_mobile',    JText::_('COM_CONTACT_MOBILE') . ": ");
-				$params->set('marker_misc',      JText::_('COM_CONTACT_OTHER_INFORMATION') . ": ");
+				$params->set('marker_address',   JText::_('COM_CONTACT_ADDRESS') . ': ');
+				$params->set('marker_email',     JText::_('JGLOBAL_EMAIL') . ': ');
+				$params->set('marker_telephone', JText::_('COM_CONTACT_TELEPHONE') . ': ');
+				$params->set('marker_fax',       JText::_('COM_CONTACT_FAX') . ': ');
+				$params->set('marker_mobile',    JText::_('COM_CONTACT_MOBILE') . ': ');
+				$params->set('marker_misc',      JText::_('COM_CONTACT_OTHER_INFORMATION') . ': ');
 				$params->set('marker_class',     'jicons-text');
 				break;
 
@@ -161,60 +161,60 @@ public function display($tpl = null)
 			default :
 				if ($params->get('icon_address'))
 				{
-					$image1 = JHtml::_('image', $params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS') . ": ", null, false);
+					$image1 = JHtml::_('image', $params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS') . ': ', null, false);
 				}
 				else
 				{
-					$image1 = JHtml::_('image', 'contacts/' . $params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS') . ": ", null, true);
+					$image1 = JHtml::_('image', 'contacts/' . $params->get('icon_address', 'con_address.png'), JText::_('COM_CONTACT_ADDRESS') . ': ', null, true);
 				}
 
 				if ($params->get('icon_email'))
 				{
-					$image2 = JHtml::_('image', $params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL') . ": ", null, false);
+					$image2 = JHtml::_('image', $params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL') . ': ', null, false);
 				}
 				else
 				{
-					$image2 = JHtml::_('image', 'contacts/' . $params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL') . ": ", null, true);
+					$image2 = JHtml::_('image', 'contacts/' . $params->get('icon_email', 'emailButton.png'), JText::_('JGLOBAL_EMAIL') . ': ', null, true);
 				}
 
 				if ($params->get('icon_telephone'))
 				{
-					$image3 = JHtml::_('image', $params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE') . ": ", null, false);
+					$image3 = JHtml::_('image', $params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE') . ': ', null, false);
 				}
 				else
 				{
-					$image3 = JHtml::_('image', 'contacts/' . $params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE') . ": ", null, true);
+					$image3 = JHtml::_('image', 'contacts/' . $params->get('icon_telephone', 'con_tel.png'), JText::_('COM_CONTACT_TELEPHONE') . ': ', null, true);
 				}
 
 				if ($params->get('icon_fax'))
 				{
-					$image4 = JHtml::_('image', $params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX') . ": ", null, false);
+					$image4 = JHtml::_('image', $params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX') . ': ', null, false);
 				}
 				else
 				{
-					$image4 = JHtml::_('image', 'contacts/' . $params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX') . ": ", null, true);
+					$image4 = JHtml::_('image', 'contacts/' . $params->get('icon_fax', 'con_fax.png'), JText::_('COM_CONTACT_FAX') . ': ', null, true);
 				}
 
 				if ($params->get('icon_misc'))
 				{
-					$image5 = JHtml::_('image', $params->get('icon_misc', 'con_info.png'), JText::_('COM_CONTACT_OTHER_INFORMATION') . ": ", null, false);
+					$image5 = JHtml::_('image', $params->get('icon_misc', 'con_info.png'), JText::_('COM_CONTACT_OTHER_INFORMATION') . ': ', null, false);
 				}
 				else
 				{
 					$image5 = JHtml::_(
 						'image',
 						'contacts/' . $params->get('icon_misc', 'con_info.png'),
-						JText::_('COM_CONTACT_OTHER_INFORMATION') . ": ", null, true
+						JText::_('COM_CONTACT_OTHER_INFORMATION') . ': ', null, true
 					);
 				}
 
 				if ($params->get('icon_mobile'))
 				{
-					$image6 = JHtml::_('image', $params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE') . ": ", null, false);
+					$image6 = JHtml::_('image', $params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE') . ': ', null, false);
 				}
 				else
 				{
-					$image6 = JHtml::_('image', 'contacts/' . $params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE') . ": ", null, true);
+					$image6 = JHtml::_('image', 'contacts/' . $params->get('icon_mobile', 'con_mobile.png'), JText::_('COM_CONTACT_MOBILE') . ': ', null, true);
 				}
 
 				$params->set('marker_address',   $image1);
diff --git a/components/com_contact/views/featured/tmpl/default_items.php b/components/com_contact/views/featured/tmpl/default_items.php
index 0e5d96a2a2086..04654ae96441b 100644
--- a/components/com_contact/views/featured/tmpl/default_items.php
+++ b/components/com_contact/views/featured/tmpl/default_items.php
@@ -95,7 +95,7 @@
 
 		<tbody>
 			<?php foreach ($this->items as $i => $item) : ?>
-				<tr class="<?php echo ($i % 2) ? "odd" : "even"; ?>" itemscope itemtype="https://schema.org/Person">
+				<tr class="<?php echo ($i % 2) ? 'odd' : 'even'; ?>" itemscope itemtype="https://schema.org/Person">
 					<td class="item-num">
 						<?php echo $i; ?>
 					</td>
diff --git a/components/com_content/helpers/route.php b/components/com_content/helpers/route.php
index 5dece4143a292..48187a2978e7b 100644
--- a/components/com_content/helpers/route.php
+++ b/components/com_content/helpers/route.php
@@ -51,7 +51,7 @@ public static function getArticleRoute($id, $catid = 0, $language = 0)
 			}
 		}
 
-		if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+		if ($language && $language != '*' && JLanguageMultilang::isEnabled())
 		{
 			$link .= '&lang=' . $language;
 			$needles['language'] = $language;
@@ -100,7 +100,7 @@ public static function getCategoryRoute($catid, $language = 0)
 			$needles['category']   = $catids;
 			$needles['categories'] = $catids;
 
-			if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+			if ($language && $language != '*' && JLanguageMultilang::isEnabled())
 			{
 				$link .= '&lang=' . $language;
 				$needles['language'] = $language;
diff --git a/components/com_content/models/articles.php b/components/com_content/models/articles.php
index 15d0fa8f61967..55d447ea25983 100644
--- a/components/com_content/models/articles.php
+++ b/components/com_content/models/articles.php
@@ -244,7 +244,7 @@ protected function getListQuery()
 
 		// Join over the users for the author and modified_by names.
 		$query->select("CASE WHEN a.created_by_alias > ' ' THEN a.created_by_alias ELSE ua.name END AS author")
-			->select("ua.email AS author_email")
+			->select('ua.email AS author_email')
 
 			->join('LEFT', '#__users AS ua ON ua.id = a.created_by')
 			->join('LEFT', '#__users AS uam ON uam.id = a.modified_by');
diff --git a/components/com_content/views/archive/view.html.php b/components/com_content/views/archive/view.html.php
index fba1f4b064596..f16cf51915d5d 100644
--- a/components/com_content/views/archive/view.html.php
+++ b/components/com_content/views/archive/view.html.php
@@ -136,8 +136,8 @@ public function display($tpl = null)
 		$this->params     = &$params;
 		$this->user       = &$user;
 		$this->pagination = &$pagination;
-		$this->pagination->setAdditionalUrlParam("month", $state->get('filter.month'));
-		$this->pagination->setAdditionalUrlParam("year", $state->get('filter.year'));
+		$this->pagination->setAdditionalUrlParam('month', $state->get('filter.month'));
+		$this->pagination->setAdditionalUrlParam('year', $state->get('filter.year'));
 
 		$this->_prepareDocument();
 
diff --git a/components/com_content/views/category/tmpl/default_articles.php b/components/com_content/views/category/tmpl/default_articles.php
index ab3addb4bd4df..7f032315e674f 100644
--- a/components/com_content/views/category/tmpl/default_articles.php
+++ b/components/com_content/views/category/tmpl/default_articles.php
@@ -98,11 +98,11 @@
 				</th>
 				<?php if ($date = $this->params->get('list_show_date')) : ?>
 					<th id="categorylist_header_date">
-						<?php if ($date == "created") : ?>
+						<?php if ($date == 'created') : ?>
 							<?php echo JHtml::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.created', $listDirn, $listOrder); ?>
-						<?php elseif ($date == "modified") : ?>
+						<?php elseif ($date == 'modified') : ?>
 							<?php echo JHtml::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.modified', $listDirn, $listOrder); ?>
-						<?php elseif ($date == "published") : ?>
+						<?php elseif ($date == 'published') : ?>
 							<?php echo JHtml::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.publish_up', $listDirn, $listOrder); ?>
 						<?php endif; ?>
 					</th>
diff --git a/components/com_newsfeeds/helpers/route.php b/components/com_newsfeeds/helpers/route.php
index 6ad2c5bdc386d..d28a1e1a1bfc2 100644
--- a/components/com_newsfeeds/helpers/route.php
+++ b/components/com_newsfeeds/helpers/route.php
@@ -50,7 +50,7 @@ public static function getNewsfeedRoute($id, $catid, $language = 0)
 			}
 		}
 
-		if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+		if ($language && $language != '*' && JLanguageMultilang::isEnabled())
 		{
 			$link .= '&lang=' . $language;
 			$needles['language'] = $language;
@@ -100,7 +100,7 @@ public static function getCategoryRoute($catid, $language = 0)
 			$needles['category'] = $catids;
 			$needles['categories'] = $catids;
 
-			if ($language && $language != "*" && JLanguageMultilang::isEnabled())
+			if ($language && $language != '*' && JLanguageMultilang::isEnabled())
 			{
 				$link .= '&lang=' . $language;
 				$needles['language'] = $language;
diff --git a/components/com_newsfeeds/views/newsfeed/tmpl/default.php b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
index 7bb18bd4ac9d1..f73f4c79eb944 100644
--- a/components/com_newsfeeds/views/newsfeed/tmpl/default.php
+++ b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
@@ -17,31 +17,31 @@
 {
 	$lang      = JFactory::getLanguage();
 	$myrtl     = $this->newsfeed->rtl;
-	$direction = " ";
+	$direction = ' ';
 
 		if ($lang->isRtl() && $myrtl == 0)
 		{
-			$direction = " redirect-rtl";
+			$direction = ' redirect-rtl';
 		}
 		elseif ($lang->isRtl() && $myrtl == 1)
 		{
-			$direction = " redirect-ltr";
+			$direction = ' redirect-ltr';
 		}
 		elseif ($lang->isRtl() && $myrtl == 2)
 		{
-			$direction = " redirect-rtl";
+			$direction = ' redirect-rtl';
 		}
 		elseif ($myrtl == 0)
 		{
-			$direction = " redirect-ltr";
+			$direction = ' redirect-ltr';
 		}
 		elseif ($myrtl == 1)
 		{
-			$direction = " redirect-ltr";
+			$direction = ' redirect-ltr';
 		}
 		elseif ($myrtl == 2)
 		{
-			$direction = " redirect-rtl";
+			$direction = ' redirect-rtl';
 		}
 		$images = json_decode($this->item->images);
 	?>
diff --git a/components/com_tags/views/tag/tmpl/list_items.php b/components/com_tags/views/tag/tmpl/list_items.php
index f55ae0ecfeb6a..5214e99cc715b 100644
--- a/components/com_tags/views/tag/tmpl/list_items.php
+++ b/components/com_tags/views/tag/tmpl/list_items.php
@@ -68,11 +68,11 @@
 					</th>
 					<?php if ($date = $this->params->get('tag_list_show_date')) : ?>
 						<th id="categorylist_header_date">
-							<?php if ($date == "created") : ?>
+							<?php if ($date == 'created') : ?>
 								<?php echo JHtml::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_created_time', $listDirn, $listOrder); ?>
-							<?php elseif ($date == "modified") : ?>
+							<?php elseif ($date == 'modified') : ?>
 								<?php echo JHtml::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_modified_time', $listDirn, $listOrder); ?>
-							<?php elseif ($date == "published") : ?>
+							<?php elseif ($date == 'published') : ?>
 								<?php echo JHtml::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_publish_up', $listDirn, $listOrder); ?>
 							<?php endif; ?>
 						</th>
diff --git a/components/com_tags/views/tag/view.feed.php b/components/com_tags/views/tag/view.feed.php
index 30be7986525a4..e3199b329cc02 100644
--- a/components/com_tags/views/tag/view.feed.php
+++ b/components/com_tags/views/tag/view.feed.php
@@ -35,7 +35,7 @@ public function display($tpl = null)
 		$feedEmail        = $app->get('feed_email', 'none');
 		$document->editor = $fromName;
 
-		if ($feedEmail != "none")
+		if ($feedEmail != 'none')
 		{
 			$document->editorEmail = $siteEmail;
 		}
diff --git a/components/com_tags/views/tags/view.feed.php b/components/com_tags/views/tags/view.feed.php
index f8d0330f00873..2242b4a115913 100644
--- a/components/com_tags/views/tags/view.feed.php
+++ b/components/com_tags/views/tags/view.feed.php
@@ -35,7 +35,7 @@ public function display($tpl = null)
 		$feedEmail        = $app->get('feed_email', 'none');
 		$document->editor = $fromName;
 
-		if ($feedEmail != "none")
+		if ($feedEmail != 'none')
 		{
 			$document->editorEmail = $siteEmail;
 		}
diff --git a/components/com_users/helpers/html/users.php b/components/com_users/helpers/html/users.php
index b9c6b1245d57b..ed46f5020f655 100644
--- a/components/com_users/helpers/html/users.php
+++ b/components/com_users/helpers/html/users.php
@@ -92,7 +92,7 @@ public static function helpsite($value)
 
 			$value = htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
 
-			if (substr($value, 0, 4) == "http")
+			if (substr($value, 0, 4) == 'http')
 			{
 				return '<a href="' . $value . '">' . $text . '</a>';
 			}
diff --git a/components/com_users/models/registration.php b/components/com_users/models/registration.php
index 64c3d5d897b2d..cfc8df9956ee7 100644
--- a/components/com_users/models/registration.php
+++ b/components/com_users/models/registration.php
@@ -670,11 +670,11 @@ public function register($temp)
 
 		if ($useractivation == 1)
 		{
-			return "useractivate";
+			return 'useractivate';
 		}
 		elseif ($useractivation == 2)
 		{
-			return "adminactivate";
+			return 'adminactivate';
 		}
 		else
 		{

From 22859e7f8fef5bfa5b475b6052b85e517f633d7b Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 18:41:00 +0300
Subject: [PATCH 04/19] Removed unnecessary parentheses

---
 components/com_banners/models/banners.php                 | 2 +-
 components/com_config/model/cms.php                       | 4 ++--
 components/com_contact/models/contact.php                 | 2 +-
 components/com_contact/router.php                         | 8 ++++----
 components/com_contact/views/category/view.html.php       | 2 +-
 .../com_contact/views/contact/tmpl/default_links.php      | 2 +-
 components/com_content/models/article.php                 | 4 ++--
 components/com_content/models/articles.php                | 2 +-
 .../com_content/views/archive/tmpl/default_items.php      | 2 +-
 components/com_content/views/archive/view.html.php        | 4 ++--
 components/com_content/views/article/tmpl/default.php     | 6 +++---
 .../com_content/views/article/tmpl/default_links.php      | 2 +-
 components/com_content/views/article/view.html.php        | 2 +-
 components/com_content/views/category/tmpl/blog.php       | 4 ++--
 components/com_content/views/category/view.html.php       | 2 +-
 components/com_content/views/featured/tmpl/default.php    | 4 ++--
 components/com_content/views/featured/view.html.php       | 4 ++--
 components/com_content/views/form/view.html.php           | 2 +-
 components/com_newsfeeds/models/newsfeed.php              | 2 +-
 components/com_newsfeeds/router.php                       | 6 +++---
 components/com_newsfeeds/views/newsfeed/tmpl/default.php  | 4 ++--
 components/com_newsfeeds/views/newsfeed/view.html.php     | 4 ++--
 components/com_tags/router.php                            | 4 ++--
 components/com_tags/views/tag/tmpl/default.php            | 2 +-
 components/com_tags/views/tag/tmpl/list.php               | 2 +-
 components/com_tags/views/tag/view.html.php               | 2 +-
 components/com_tags/views/tags/tmpl/default_items.php     | 2 +-
 components/com_users/models/reset.php                     | 2 +-
 components/com_users/views/login/tmpl/default_login.php   | 2 +-
 components/com_users/views/login/tmpl/default_logout.php  | 2 +-
 30 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php
index d63894bc844b2..cb5b0c337f656 100644
--- a/components/com_banners/models/banners.php
+++ b/components/com_banners/models/banners.php
@@ -120,7 +120,7 @@ protected function getListQuery()
 				$query->where($categoryEquals);
 			}
 		}
-		elseif ((is_array($categoryId)) && (count($categoryId) > 0))
+		elseif (is_array($categoryId) && (count($categoryId) > 0))
 		{
 			$categoryId = ArrayHelper::toInteger($categoryId);
 			$categoryId = implode(',', $categoryId);
diff --git a/components/com_config/model/cms.php b/components/com_config/model/cms.php
index b1c0b10ed6991..29aa70375adf7 100644
--- a/components/com_config/model/cms.php
+++ b/components/com_config/model/cms.php
@@ -218,8 +218,8 @@ protected function cleanCache($group = null, $client_id = 0)
 		$dispatcher = JEventDispatcher::getInstance();
 
 		$options = array(
-			'defaultgroup' => ($group) ?: (isset($this->option) ? $this->option : JFactory::getApplication()->input->get('option')),
-			'cachebase' => ($client_id) ? JPATH_ADMINISTRATOR . '/cache' : $conf->get('cache_path', JPATH_SITE . '/cache'));
+			'defaultgroup' => $group ?: (isset($this->option) ? $this->option : JFactory::getApplication()->input->get('option')),
+			'cachebase' => $client_id ? JPATH_ADMINISTRATOR . '/cache' : $conf->get('cache_path', JPATH_SITE . '/cache'));
 
 		$cache = JCache::getInstance('callback', $options);
 		$cache->clean();
diff --git a/components/com_contact/models/contact.php b/components/com_contact/models/contact.php
index 32f5e535183ed..f19e65b89179b 100644
--- a/components/com_contact/models/contact.php
+++ b/components/com_contact/models/contact.php
@@ -199,7 +199,7 @@ public function &getItem($pk = null)
 				}
 
 				// Check for published state if filter set.
-				if (((is_numeric($published)) || (is_numeric($archived))) && (($data->published != $published) && ($data->published != $archived)))
+				if ((is_numeric($published) || is_numeric($archived)) && (($data->published != $published) && ($data->published != $archived)))
 				{
 					JError::raiseError(404, JText::_('COM_CONTACT_ERROR_CONTACT_NOT_FOUND'));
 				}
diff --git a/components/com_contact/router.php b/components/com_contact/router.php
index 3de9dc7910d1c..863e075318b22 100644
--- a/components/com_contact/router.php
+++ b/components/com_contact/router.php
@@ -42,8 +42,8 @@ public function build(&$query)
 			$menuItem = $this->menu->getItem($query['Itemid']);
 		}
 
-		$mView = (empty($menuItem->query['view'])) ? null : $menuItem->query['view'];
-		$mId = (empty($menuItem->query['id'])) ? null : $menuItem->query['id'];
+		$mView = empty($menuItem->query['view']) ? null : $menuItem->query['view'];
+		$mId = empty($menuItem->query['id']) ? null : $menuItem->query['id'];
 
 		if (isset($query['view']))
 		{
@@ -58,7 +58,7 @@ public function build(&$query)
 		}
 
 		// Are we dealing with a contact that is attached to a menu item?
-		if (isset($view) && ($mView == $view) and (isset($query['id'])) and ($mId == (int) $query['id']))
+		if (isset($view) && ($mView == $view) and isset($query['id']) and ($mId == (int) $query['id']))
 		{
 			unset($query['view']);
 			unset($query['catid']);
@@ -196,7 +196,7 @@ public function parse(&$segments)
 
 		$contactCategory = JCategories::getInstance('Contact')->get($id);
 
-		$categories = ($contactCategory) ? $contactCategory->getChildren() : array();
+		$categories = $contactCategory ? $contactCategory->getChildren() : array();
 		$vars['catid'] = $id;
 		$vars['id'] = $id;
 		$found = 0;
diff --git a/components/com_contact/views/category/view.html.php b/components/com_contact/views/category/view.html.php
index 1dde9a62c0988..f548243b5a1a5 100644
--- a/components/com_contact/views/category/view.html.php
+++ b/components/com_contact/views/category/view.html.php
@@ -62,7 +62,7 @@ public function display($tpl = null)
 			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
 			$temp       = new Registry;
 			$temp->loadString($item->params);
-			$item->params = clone($this->params);
+			$item->params = clone$this->params;
 			$item->params->merge($temp);
 
 			if ($item->params->get('show_email_headings', 0) == 1)
diff --git a/components/com_contact/views/contact/tmpl/default_links.php b/components/com_contact/views/contact/tmpl/default_links.php
index 8901ac9d6f9dc..f2dd74c0dfe3e 100644
--- a/components/com_contact/views/contact/tmpl/default_links.php
+++ b/components/com_contact/views/contact/tmpl/default_links.php
@@ -36,7 +36,7 @@
 			$link = (0 === strpos($link, 'http')) ? $link : 'http://' . $link;
 
 			// If no label is present, take the link
-			$label = ($label) ?: $link;
+			$label = $label ?: $link;
 			?>
 			<li>
 				<a href="<?php echo $link; ?>" itemprop="url">
diff --git a/components/com_content/models/article.php b/components/com_content/models/article.php
index b72a4de0a3b40..29addb74d8781 100644
--- a/components/com_content/models/article.php
+++ b/components/com_content/models/article.php
@@ -164,7 +164,7 @@ public function getItem($pk = null)
 				}
 
 				// Check for published state if filter set.
-				if (((is_numeric($published)) || (is_numeric($archived))) && (($data->state != $published) && ($data->state != $archived)))
+				if ((is_numeric($published) || is_numeric($archived)) && (($data->state != $published) && ($data->state != $archived)))
 				{
 					return JError::raiseError(404, JText::_('COM_CONTENT_ERROR_ARTICLE_NOT_FOUND'));
 				}
@@ -333,7 +333,7 @@ public function storeVote($pk = 0, $rate = 0)
 			}
 			else
 			{
-				if ($userIP != ($rating->lastip))
+				if ($userIP != $rating->lastip)
 				{
 					$query = $db->getQuery(true);
 
diff --git a/components/com_content/models/articles.php b/components/com_content/models/articles.php
index 55d447ea25983..bbce74cf4fcf6 100644
--- a/components/com_content/models/articles.php
+++ b/components/com_content/models/articles.php
@@ -498,7 +498,7 @@ protected function getListQuery()
 		}
 
 		// Process the filter for list views with user-entered filters
-		if ((is_object($params)) && ($params->get('filter_field') != 'hide') && ($filter = $this->getState('list.filter')))
+		if (is_object($params) && ($params->get('filter_field') != 'hide') && ($filter = $this->getState('list.filter')))
 		{
 			// Clean filter variable
 			$filter = JString::strtolower($filter);
diff --git a/components/com_content/views/archive/tmpl/default_items.php b/components/com_content/views/archive/tmpl/default_items.php
index 9d8588d5f8724..546d10a95f384 100644
--- a/components/com_content/views/archive/tmpl/default_items.php
+++ b/components/com_content/views/archive/tmpl/default_items.php
@@ -29,7 +29,7 @@
 				</h2>
 				<?php if ($params->get('show_author') && !empty($item->author )) : ?>
 					<div class="createdby" itemprop="author" itemscope itemtype="https://schema.org/Person">
-					<?php $author = ($item->created_by_alias) ?: $item->author; ?>
+					<?php $author = $item->created_by_alias ?: $item->author; ?>
 					<?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
 						<?php if (!empty($item->contact_link) && $params->get('link_author') == true) : ?>
 							<?php echo JText::sprintf('COM_CONTENT_WRITTEN_BY', JHtml::_('link', $this->item->contact_link, $author, array('itemprop' => 'url'))); ?>
diff --git a/components/com_content/views/archive/view.html.php b/components/com_content/views/archive/view.html.php
index f16cf51915d5d..c6ee431cbd96b 100644
--- a/components/com_content/views/archive/view.html.php
+++ b/components/com_content/views/archive/view.html.php
@@ -45,8 +45,8 @@ public function display($tpl = null)
 
 		foreach ($items as $item)
 		{
-			$item->catslug     = ($item->category_alias) ? ($item->catid . ':' . $item->category_alias) : $item->catid;
-			$item->parent_slug = ($item->parent_alias) ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+			$item->catslug     = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid;
+			$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
 
 			// No link for ROOT category
 			if ($item->parent_alias == 'root')
diff --git a/components/com_content/views/article/tmpl/default.php b/components/com_content/views/article/tmpl/default.php
index a6e6de972ad4c..d9e2b217e1090 100644
--- a/components/com_content/views/article/tmpl/default.php
+++ b/components/com_content/views/article/tmpl/default.php
@@ -94,7 +94,7 @@
 	<?php endif; ?>
 	<?php if ($params->get('access-view')):?>
 	<?php if (isset($images->image_fulltext) && !empty($images->image_fulltext)) : ?>
-	<?php $imgfloat = (empty($images->float_fulltext)) ? $params->get('float_fulltext') : $images->float_fulltext; ?>
+	<?php $imgfloat = empty($images->float_fulltext) ? $params->get('float_fulltext') : $images->float_fulltext; ?>
 	<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image"> <img
 	<?php if ($images->image_fulltext_caption):
 		echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_fulltext_caption) . '"';
@@ -151,13 +151,13 @@
 		elseif ($readmore = $attribs->alternative_readmore) :
 			echo $readmore;
 			if ($params->get('show_readmore_title', 0) != 0) :
-				echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit'));
+				echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit'));
 			endif;
 		elseif ($params->get('show_readmore_title', 0) == 0) :
 			echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE');
 		else :
 			echo JText::_('COM_CONTENT_READ_MORE');
-			echo JHtml::_('string.truncate', ($this->item->title), $params->get('readmore_limit'));
+			echo JHtml::_('string.truncate', $this->item->title, $params->get('readmore_limit'));
 		endif; ?>
 		</a>
 	</p>
diff --git a/components/com_content/views/article/tmpl/default_links.php b/components/com_content/views/article/tmpl/default_links.php
index 05254f7386be3..f049c96e9e7de 100644
--- a/components/com_content/views/article/tmpl/default_links.php
+++ b/components/com_content/views/article/tmpl/default_links.php
@@ -35,7 +35,7 @@
 				endif;
 
 				// If no label is present, take the link
-				$label = ($label) ?: $link;
+				$label = $label ?: $link;
 
 				// If no target is present, use the default
 				$target = $target ?: $params->get('target' . $id);
diff --git a/components/com_content/views/article/view.html.php b/components/com_content/views/article/view.html.php
index 4686f86d9c0b2..0a5e1aeb4b872 100644
--- a/components/com_content/views/article/view.html.php
+++ b/components/com_content/views/article/view.html.php
@@ -82,7 +82,7 @@ public function display($tpl = null)
 			$currentLink = $active->link;
 
 			// If the current view is the active item and an article view for this article, then the menu item params take priority
-			if (strpos($currentLink, 'view=article') && (strpos($currentLink, '&id=' . (string) $item->id)))
+			if (strpos($currentLink, 'view=article') && strpos($currentLink, '&id=' . (string) $item->id))
 			{
 				// Load layout from active query (in case it is an alternative menu item)
 				if (isset($active->query['layout']))
diff --git a/components/com_content/views/category/tmpl/blog.php b/components/com_content/views/category/tmpl/blog.php
index cd4d0a0a6a899..9c85788ebcf31 100644
--- a/components/com_content/views/category/tmpl/blog.php
+++ b/components/com_content/views/category/tmpl/blog.php
@@ -67,7 +67,7 @@
 	<?php endif; ?>
 
 	<?php
-	$introcount = (count($this->intro_items));
+	$introcount = count($this->intro_items);
 	$counter = 0;
 	?>
 
@@ -78,7 +78,7 @@
 				<?php $row = $counter / $this->columns; ?>
 				<div class="items-row cols-<?php echo (int) $this->columns; ?> <?php echo 'row-' . $row; ?> row-fluid clearfix">
 			<?php endif; ?>
-			<div class="span<?php echo round((12 / $this->columns)); ?>">
+			<div class="span<?php echo round(12 / $this->columns); ?>">
 				<div class="item column-<?php echo $rowcount; ?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?>"
 					itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
 					<?php
diff --git a/components/com_content/views/category/view.html.php b/components/com_content/views/category/view.html.php
index 4b65b92a0e292..0067cc262b978 100644
--- a/components/com_content/views/category/view.html.php
+++ b/components/com_content/views/category/view.html.php
@@ -83,7 +83,7 @@ public function display($tpl = null)
 		{
 			$item->slug = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
 
-			$item->parent_slug = ($item->parent_alias) ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+			$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
 
 			// No link for ROOT category
 			if ($item->parent_alias == 'root')
diff --git a/components/com_content/views/featured/tmpl/default.php b/components/com_content/views/featured/tmpl/default.php
index 49aae30b0633e..3567d746d2843 100644
--- a/components/com_content/views/featured/tmpl/default.php
+++ b/components/com_content/views/featured/tmpl/default.php
@@ -43,7 +43,7 @@
 </div>
 <?php endif; ?>
 <?php
-	$introcount = (count($this->intro_items));
+	$introcount = count($this->intro_items);
 	$counter = 0;
 ?>
 <?php if (!empty($this->intro_items)) : ?>
@@ -58,7 +58,7 @@
 
 		<div class="items-row cols-<?php echo (int) $this->columns;?> <?php echo 'row-' . $row; ?> row-fluid">
 		<?php endif; ?>
-			<div class="item column-<?php echo $rowcount;?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?> span<?php echo round((12 / $this->columns));?>"
+			<div class="item column-<?php echo $rowcount;?><?php echo $item->state == 0 ? ' system-unpublished' : null; ?> span<?php echo round(12 / $this->columns);?>"
 				itemprop="blogPost" itemscope itemtype="https://schema.org/BlogPosting">
 			<?php
 					$this->item = &$item;
diff --git a/components/com_content/views/featured/view.html.php b/components/com_content/views/featured/view.html.php
index b03e6d627237e..f2df737c4d7d2 100644
--- a/components/com_content/views/featured/view.html.php
+++ b/components/com_content/views/featured/view.html.php
@@ -75,8 +75,8 @@ public function display($tpl = null)
 		foreach ($items as &$item)
 		{
 			$item->slug        = $item->alias ? ($item->id . ':' . $item->alias) : $item->id;
-			$item->catslug     = ($item->category_alias) ? ($item->catid . ':' . $item->category_alias) : $item->catid;
-			$item->parent_slug = ($item->parent_alias) ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
+			$item->catslug     = $item->category_alias ? ($item->catid . ':' . $item->category_alias) : $item->catid;
+			$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
 
 			// No link for ROOT category
 			if ($item->parent_alias == 'root')
diff --git a/components/com_content/views/form/view.html.php b/components/com_content/views/form/view.html.php
index ee55e577a3223..3ff7c9c9395ef 100644
--- a/components/com_content/views/form/view.html.php
+++ b/components/com_content/views/form/view.html.php
@@ -44,7 +44,7 @@ public function display($tpl = null)
 
 		if (empty($this->item->id))
 		{
-			$authorised = $user->authorise('core.create', 'com_content') || (count($user->getAuthorisedCategories('com_content', 'core.create')));
+			$authorised = $user->authorise('core.create', 'com_content') || count($user->getAuthorisedCategories('com_content', 'core.create'));
 		}
 		else
 		{
diff --git a/components/com_newsfeeds/models/newsfeed.php b/components/com_newsfeeds/models/newsfeed.php
index f5a7e93703a43..b3406091f205e 100644
--- a/components/com_newsfeeds/models/newsfeed.php
+++ b/components/com_newsfeeds/models/newsfeed.php
@@ -127,7 +127,7 @@ public function &getItem($pk = null)
 
 				// Check for published state if filter set.
 
-				if (((is_numeric($published)) || (is_numeric($archived))) && (($data->published != $published) && ($data->published != $archived)))
+				if ((is_numeric($published) || is_numeric($archived)) && (($data->published != $published) && ($data->published != $archived)))
 				{
 					JError::raiseError(404, JText::_('COM_NEWSFEEDS_ERROR_FEED_NOT_FOUND'));
 				}
diff --git a/components/com_newsfeeds/router.php b/components/com_newsfeeds/router.php
index 5db14446a76ef..e14c3746791d3 100644
--- a/components/com_newsfeeds/router.php
+++ b/components/com_newsfeeds/router.php
@@ -42,8 +42,8 @@ public function build(&$query)
 			$menuItem = $this->menu->getItem($query['Itemid']);
 		}
 
-		$mView = (empty($menuItem->query['view'])) ? null : $menuItem->query['view'];
-		$mId   = (empty($menuItem->query['id'])) ? null : $menuItem->query['id'];
+		$mView = empty($menuItem->query['view']) ? null : $menuItem->query['view'];
+		$mId   = empty($menuItem->query['id']) ? null : $menuItem->query['id'];
 
 		if (isset($query['view']))
 		{
@@ -58,7 +58,7 @@ public function build(&$query)
 		}
 
 		// Are we dealing with a newsfeed that is attached to a menu item?
-		if (isset($query['view']) && ($mView == $query['view']) and (isset($query['id'])) and ($mId == (int) $query['id']))
+		if (isset($query['view']) && ($mView == $query['view']) and isset($query['id']) and ($mId == (int) $query['id']))
 		{
 			unset($query['view']);
 			unset($query['catid']);
diff --git a/components/com_newsfeeds/views/newsfeed/tmpl/default.php b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
index f73f4c79eb944..0d7953e63c5b2 100644
--- a/components/com_newsfeeds/views/newsfeed/tmpl/default.php
+++ b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
@@ -66,7 +66,7 @@
 
 	<!-- Show Images from Component -->
 	<?php  if (isset($images->image_first) and !empty($images->image_first)) : ?>
-	<?php $imgfloat = (empty($images->float_first)) ? $this->params->get('float_first') : $images->float_first; ?>
+	<?php $imgfloat = empty($images->float_first) ? $this->params->get('float_first') : $images->float_first; ?>
 	<div class="img-intro-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?>"> <img
 		<?php if ($images->image_first_caption):
 			echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_first_caption, ENT_COMPAT, 'UTF-8') . '"';
@@ -75,7 +75,7 @@
 	<?php endif; ?>
 
 	<?php  if (isset($images->image_second) and !empty($images->image_second)) : ?>
-	<?php $imgfloat = (empty($images->float_second)) ? $this->params->get('float_second') : $images->float_second; ?>
+	<?php $imgfloat = empty($images->float_second) ? $this->params->get('float_second') : $images->float_second; ?>
 	<div class="pull-<?php echo htmlspecialchars($imgfloat, ENT_COMPAT, 'UTF-8'); ?> item-image"> <img
 	<?php if ($images->image_second_caption):
 		echo 'class="caption"' . ' title="' . htmlspecialchars($images->image_second_caption) . '"';
diff --git a/components/com_newsfeeds/views/newsfeed/view.html.php b/components/com_newsfeeds/views/newsfeed/view.html.php
index 62bef98f4cfe6..12992e7ba8790 100644
--- a/components/com_newsfeeds/views/newsfeed/view.html.php
+++ b/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -96,7 +96,7 @@ public function display($tpl = null)
 			$currentLink = $active->link;
 
 			// If the current view is the active item and an newsfeed view for this feed, then the menu item params take priority
-			if (strpos($currentLink, 'view=newsfeed') && (strpos($currentLink, '&id=' . (string) $item->id)))
+			if (strpos($currentLink, 'view=newsfeed') && strpos($currentLink, '&id=' . (string) $item->id))
 			{
 				// $item->params are the newsfeed params, $temp are the menu item params
 				// Merge so that the menu item params take priority
@@ -139,7 +139,7 @@ public function display($tpl = null)
 		// Check the access to the newsfeed
 		$levels = $user->getAuthorisedViewLevels();
 
-		if (!in_array($item->access, $levels) or ((in_array($item->access, $levels) and (!in_array($item->category_access, $levels)))))
+		if (!in_array($item->access, $levels) or in_array($item->access, $levels) and (!in_array($item->category_access, $levels)))
 		{
 			$app->enqueueMessage(JText::_('JERROR_ALERTNOAUTHOR'), 'error');
 			$app->setHeader('status', 403, true);
diff --git a/components/com_tags/router.php b/components/com_tags/router.php
index 9bec71e8c2bd2..995c0f4d579f8 100644
--- a/components/com_tags/router.php
+++ b/components/com_tags/router.php
@@ -44,8 +44,8 @@ public function build(&$query)
 			$menuItem = $this->menu->getItem($query['Itemid']);
 		}
 
-		$mView = (empty($menuItem->query['view'])) ? null : $menuItem->query['view'];
-		$mId   = (empty($menuItem->query['id'])) ? null : $menuItem->query['id'];
+		$mView = empty($menuItem->query['view']) ? null : $menuItem->query['view'];
+		$mId   = empty($menuItem->query['id']) ? null : $menuItem->query['id'];
 
 		if (is_array($mId))
 		{
diff --git a/components/com_tags/views/tag/tmpl/default.php b/components/com_tags/views/tag/tmpl/default.php
index 034c0ef342c26..b89e700c0ba83 100644
--- a/components/com_tags/views/tag/tmpl/default.php
+++ b/components/com_tags/views/tag/tmpl/default.php
@@ -25,7 +25,7 @@
 		</h2>
 	<?php endif; ?>
 	<?php // We only show a tag description if there is a single tag. ?>
-	<?php if (count($this->item) == 1 && (($this->params->get('tag_list_show_tag_image', 1)) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
+	<?php if (count($this->item) == 1 && ($this->params->get('tag_list_show_tag_image', 1) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
 		<div class="category-desc">
 			<?php $images = json_decode($this->item[0]->images); ?>
 			<?php if ($this->params->get('tag_list_show_tag_image', 1) == 1 && !empty($images->image_fulltext)) : ?>
diff --git a/components/com_tags/views/tag/tmpl/list.php b/components/com_tags/views/tag/tmpl/list.php
index 5a04c87262d75..0355bab4d50e5 100644
--- a/components/com_tags/views/tag/tmpl/list.php
+++ b/components/com_tags/views/tag/tmpl/list.php
@@ -26,7 +26,7 @@
 		</h2>
 	<?php endif; ?>
 	<?php // We only show a tag description if there is a single tag. ?>
-	<?php if (count($this->item) == 1 && (($this->params->get('tag_list_show_tag_image', 1)) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
+	<?php if (count($this->item) == 1 && ($this->params->get('tag_list_show_tag_image', 1) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
 		<div class="category-desc">
 			<?php $images = json_decode($this->item[0]->images); ?>
 			<?php if ($this->params->get('tag_list_show_tag_image', 1) == 1 && !empty($images->image_fulltext)) : ?>
diff --git a/components/com_tags/views/tag/view.html.php b/components/com_tags/views/tag/view.html.php
index a1a08487354e6..4cb25a0b06d98 100644
--- a/components/com_tags/views/tag/view.html.php
+++ b/components/com_tags/views/tag/view.html.php
@@ -138,7 +138,7 @@ public function display($tpl = null)
 			$currentLink = $active->link;
 
 			// If the current view is the active item and an tag view for one tag, then the menu item params take priority
-			if (strpos($currentLink, 'view=tag') && (strpos($currentLink, '&id[0]=' . (string) $item[0]->id)))
+			if (strpos($currentLink, 'view=tag') && strpos($currentLink, '&id[0]=' . (string) $item[0]->id))
 			{
 				// $item->params are the article params, $temp are the menu item params
 				// Merge so that the menu item params take priority
diff --git a/components/com_tags/views/tags/tmpl/default_items.php b/components/com_tags/views/tags/tmpl/default_items.php
index d1e56ad151a5e..db2fdbc8e7320 100644
--- a/components/com_tags/views/tags/tmpl/default_items.php
+++ b/components/com_tags/views/tags/tmpl/default_items.php
@@ -99,7 +99,7 @@
 				<?php $images  = json_decode($item->images); ?>
 				<span class="tag-body">
 			<?php if (!empty($images->image_intro)): ?>
-				<?php $imgfloat = (empty($images->float_intro)) ? $this->params->get('float_intro') : $images->float_intro; ?>
+				<?php $imgfloat = empty($images->float_intro) ? $this->params->get('float_intro') : $images->float_intro; ?>
 				<div class="pull-<?php echo htmlspecialchars($imgfloat); ?> item-image">
 					<img
 						<?php if ($images->image_intro_caption) : ?>
diff --git a/components/com_users/models/reset.php b/components/com_users/models/reset.php
index 5a0cef807ec6e..fd26d16df4dca 100644
--- a/components/com_users/models/reset.php
+++ b/components/com_users/models/reset.php
@@ -307,7 +307,7 @@ public function processResetConfirm($data)
 		}
 
 		// Verify the token
-		if (!(JUserHelper::verifyPassword($data['token'], $user->activation)))
+		if (!JUserHelper::verifyPassword($data['token'], $user->activation))
 		{
 			$this->setError(JText::_('COM_USERS_USER_NOT_FOUND'));
 
diff --git a/components/com_users/views/login/tmpl/default_login.php b/components/com_users/views/login/tmpl/default_login.php
index 7f6c7ccda1bd8..4cf738a3e99cb 100644
--- a/components/com_users/views/login/tmpl/default_login.php
+++ b/components/com_users/views/login/tmpl/default_login.php
@@ -29,7 +29,7 @@
 			<?php echo $this->params->get('login_description'); ?>
 		<?php endif; ?>
 
-		<?php if (($this->params->get('login_image') != '')) :?>
+		<?php if ($this->params->get('login_image') != '') :?>
 			<img src="<?php echo $this->escape($this->params->get('login_image')); ?>" class="login-image" alt="<?php echo JText::_('COM_USERS_LOGIN_IMAGE_ALT')?>"/>
 		<?php endif; ?>
 
diff --git a/components/com_users/views/login/tmpl/default_logout.php b/components/com_users/views/login/tmpl/default_logout.php
index 3647663f840c0..b89abc983c709 100644
--- a/components/com_users/views/login/tmpl/default_logout.php
+++ b/components/com_users/views/login/tmpl/default_logout.php
@@ -26,7 +26,7 @@
 			<?php echo $this->params->get('logout_description'); ?>
 		<?php endif; ?>
 
-		<?php if (($this->params->get('logout_image') != '')) :?>
+		<?php if ($this->params->get('logout_image') != '') :?>
 			<img src="<?php echo $this->escape($this->params->get('logout_image')); ?>" class="thumbnail pull-right logout-image" alt="<?php echo JText::_('COM_USER_LOGOUT_IMAGE_ALT')?>"/>
 		<?php endif; ?>
 

From 66f954e08bb35fd47e883e6d8c8d372c3c970739 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 18:41:32 +0300
Subject: [PATCH 05/19] Removed senseless return;

---
 components/com_content/controllers/article.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/com_content/controllers/article.php b/components/com_content/controllers/article.php
index be4ebf16b112d..a86c062355348 100644
--- a/components/com_content/controllers/article.php
+++ b/components/com_content/controllers/article.php
@@ -286,7 +286,6 @@ protected function getReturnPage()
 	 */
 	protected function postSaveHook(JModelLegacy $model, $validData = array())
 	{
-		return;
 	}
 
 	/**

From 585bbc80d07f6dc4c40e9a53e1420a381c956a95 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 18:42:30 +0300
Subject: [PATCH 06/19] Inline one-time use variables

---
 components/com_content/helpers/icon.php  | 4 +---
 components/com_content/helpers/query.php | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php
index 78d1ed117e72d..80e8db0354bcc 100644
--- a/components/com_content/helpers/icon.php
+++ b/components/com_content/helpers/icon.php
@@ -111,9 +111,7 @@ public static function email($article, $params, $attribs = array(), $legacy = fa
 		$attribs['onclick'] = "window.open(this.href,'win2','" . $status . "'); return false;";
 		$attribs['rel']     = 'nofollow';
 
-		$output = JHtml::_('link', JRoute::_($url), $text, $attribs);
-
-		return $output;
+		return JHtml::_('link', JRoute::_($url), $text, $attribs);
 	}
 
 	/**
diff --git a/components/com_content/helpers/query.php b/components/com_content/helpers/query.php
index bcb789bc03142..4b4d25247eaeb 100644
--- a/components/com_content/helpers/query.php
+++ b/components/com_content/helpers/query.php
@@ -180,9 +180,7 @@ public static function buildVotingQuery($params = null)
 			$join = '';
 		}
 
-		$results = array ('select' => $select, 'join' => $join);
-
-		return $results;
+		return array ('select' => $select, 'join' => $join);
 	}
 
 	/**

From be1c3f8d778f32c12b59b915809714ec286689dd Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 19:06:10 +0300
Subject: [PATCH 07/19] Optimized non-optimal if conditions

---
 components/com_config/controller/helper.php            |  2 +-
 components/com_contact/helpers/route.php               |  4 ++--
 components/com_contact/router.php                      |  6 +++---
 .../views/categories/tmpl/default_items.php            |  6 +++---
 components/com_content/helpers/route.php               |  4 ++--
 components/com_content/models/category.php             |  3 ++-
 components/com_content/router.php                      |  2 +-
 .../views/categories/tmpl/default_items.php            |  6 +++---
 components/com_content/views/category/tmpl/blog.php    |  2 +-
 .../com_content/views/category/tmpl/blog_children.php  |  8 ++++----
 .../views/category/tmpl/default_children.php           |  6 +++---
 components/com_content/views/form/view.html.php        |  2 +-
 components/com_newsfeeds/helpers/route.php             |  4 ++--
 components/com_newsfeeds/router.php                    |  6 +++---
 .../views/categories/tmpl/default_items.php            |  6 +++---
 .../com_newsfeeds/views/category/tmpl/default.php      |  2 +-
 .../views/category/tmpl/default_children.php           |  2 +-
 .../com_newsfeeds/views/newsfeed/tmpl/default.php      | 10 ++++++----
 components/com_tags/helpers/route.php                  |  2 +-
 components/com_tags/models/tag.php                     |  2 +-
 components/com_users/models/profile.php                |  4 ++--
 components/com_users/views/login/tmpl/default.php      |  2 +-
 22 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/components/com_config/controller/helper.php b/components/com_config/controller/helper.php
index 1799294ed91e0..dffb37b40e6d0 100644
--- a/components/com_config/controller/helper.php
+++ b/components/com_config/controller/helper.php
@@ -90,7 +90,7 @@ public function parseController($app)
 		// Some special handling for com_config administrator
 		$option = $app->input->get('option');
 
-		if ($app->isAdmin() && $option == 'com_config')
+		if ($option == 'com_config' && $app->isAdmin())
 		{
 			$component = $app->input->get('component');
 
diff --git a/components/com_contact/helpers/route.php b/components/com_contact/helpers/route.php
index f6f69996dbdb4..8740ab7554d5f 100644
--- a/components/com_contact/helpers/route.php
+++ b/components/com_contact/helpers/route.php
@@ -155,7 +155,7 @@ protected static function _findItem($needles = null)
 
 			foreach ($items as $item)
 			{
-				if (isset($item->query) && isset($item->query['view']))
+				if (isset($item->query, $item->query['view']))
 				{
 					$view = $item->query['view'];
 
@@ -171,7 +171,7 @@ protected static function _findItem($needles = null)
 						* language != * can override existing entries
 						* language == * cannot override existing entries
 						*/
-						if (!isset(self::$lookup[$language][$view][$item->query['id']]) || $item->language != '*')
+						if ($item->language != '*' || !isset(self::$lookup[$language][$view][$item->query['id']]))
 						{
 							self::$lookup[$language][$view][$item->query['id']] = $item->id;
 						}
diff --git a/components/com_contact/router.php b/components/com_contact/router.php
index 863e075318b22..c29bf56db9140 100644
--- a/components/com_contact/router.php
+++ b/components/com_contact/router.php
@@ -58,7 +58,7 @@ public function build(&$query)
 		}
 
 		// Are we dealing with a contact that is attached to a menu item?
-		if (isset($view) && ($mView == $view) and isset($query['id']) and ($mId == (int) $query['id']))
+		if (isset($view, $query['id']) && ($mView == $view) && ($mId == (int) $query['id']))
 		{
 			unset($query['view']);
 			unset($query['catid']);
@@ -66,9 +66,9 @@ public function build(&$query)
 			return $segments;
 		}
 
-		if (isset($view) and ($view == 'category' or $view == 'contact'))
+		if (isset($view) && ($view == 'category' || $view == 'contact'))
 		{
-			if ($mId != (int) $query['id'] || $mView != $view)
+			if ($mView != $view || $mId != (int) $query['id'])
 			{
 				if ($view == 'contact' && isset($query['catid']))
 				{
diff --git a/components/com_contact/views/categories/tmpl/default_items.php b/components/com_contact/views/categories/tmpl/default_items.php
index 2d718bf1f5c83..041ea24a2f232 100644
--- a/components/com_contact/views/categories/tmpl/default_items.php
+++ b/components/com_contact/views/categories/tmpl/default_items.php
@@ -12,7 +12,7 @@
 JHtml::_('bootstrap.tooltip');
 
 $class = ' class="first"';
-if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 ?>
 	<?php foreach($this->items[$this->parent->id] as $id => $item) : ?>
 		<?php
@@ -33,7 +33,7 @@
 							<?php echo $item->numitems; ?>
 						</span>
 					<?php endif; ?>
-					<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
+					<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
 						<a id="category-btn-<?php echo $item->id;?>" href="#category-<?php echo $item->id;?>"
 							data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 					<?php endif;?>
@@ -46,7 +46,7 @@
 					<?php endif; ?>
 				<?php endif; ?>
 
-				<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) :?>
+				<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) :?>
 					<div class="collapse fade" id="category-<?php echo $item->id;?>">
 						<?php
 						$this->items[$item->id] = $item->getChildren();
diff --git a/components/com_content/helpers/route.php b/components/com_content/helpers/route.php
index 48187a2978e7b..a2317a7d8de44 100644
--- a/components/com_content/helpers/route.php
+++ b/components/com_content/helpers/route.php
@@ -174,7 +174,7 @@ protected static function _findItem($needles = null)
 
 			foreach ($items as $item)
 			{
-				if (isset($item->query) && isset($item->query['view']))
+				if (isset($item->query, $item->query['view']))
 				{
 					$view = $item->query['view'];
 
@@ -190,7 +190,7 @@ protected static function _findItem($needles = null)
 						 * language != * can override existing entries
 						 * language == * cannot override existing entries
 						 */
-						if (!isset(self::$lookup[$language][$view][$item->query['id']]) || $item->language != '*')
+						if ($item->language != '*' || !isset(self::$lookup[$language][$view][$item->query['id']]))
 						{
 							self::$lookup[$language][$view][$item->query['id']] = $item->id;
 						}
diff --git a/components/com_content/models/category.php b/components/com_content/models/category.php
index 5906a59c090e1..a47b0b38e4bbf 100644
--- a/components/com_content/models/category.php
+++ b/components/com_content/models/category.php
@@ -457,7 +457,8 @@ public function &getChildren()
 		{
 			$params = $this->getState()->get('params');
 
-			if ($params->get('orderby_pri') == 'alpha' || $params->get('orderby_pri') == 'ralpha')
+			$orderByPri = $params->get('orderby_pri');
+			if ($orderByPri == 'alpha' || $orderByPri == 'ralpha')
 			{
 				$this->_children = ArrayHelper::sortObjects($this->_children, 'title', ($params->get('orderby_pri') == 'alpha') ? 1 : (-1));
 			}
diff --git a/components/com_content/router.php b/components/com_content/router.php
index 9a7ef6e7583fa..2a84ced8114fc 100644
--- a/components/com_content/router.php
+++ b/components/com_content/router.php
@@ -102,7 +102,7 @@ public function build(&$query)
 
 			if ($view == 'article')
 			{
-				if (isset($query['id']) && isset($query['catid']) && $query['catid'])
+				if (isset($query['id'], $query['catid']) && $query['catid'])
 				{
 					$catid = $query['catid'];
 
diff --git a/components/com_content/views/categories/tmpl/default_items.php b/components/com_content/views/categories/tmpl/default_items.php
index d524c4c5fdff3..26d53c8a9eb7b 100644
--- a/components/com_content/views/categories/tmpl/default_items.php
+++ b/components/com_content/views/categories/tmpl/default_items.php
@@ -14,7 +14,7 @@
 $class = ' class="first"';
 $lang  = JFactory::getLanguage();
 
-if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 ?>
 	<?php foreach($this->items[$this->parent->id] as $id => $item) : ?>
 		<?php
@@ -35,7 +35,7 @@
 						<?php echo $item->numitems; ?>
 					</span>
 				<?php endif; ?>
-				<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
+				<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
 					<a id="category-btn-<?php echo $item->id;?>" href="#category-<?php echo $item->id;?>"
 						data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
@@ -51,7 +51,7 @@
 				<?php endif; ?>
 			<?php endif; ?>
 
-			<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) :?>
+			<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) :?>
 				<div class="collapse fade" id="category-<?php echo $item->id;?>">
 				<?php
 				$this->items[$item->id] = $item->getChildren();
diff --git a/components/com_content/views/category/tmpl/blog.php b/components/com_content/views/category/tmpl/blog.php
index 9c85788ebcf31..33107f9a0fc46 100644
--- a/components/com_content/views/category/tmpl/blog.php
+++ b/components/com_content/views/category/tmpl/blog.php
@@ -101,7 +101,7 @@
 		</div>
 	<?php endif; ?>
 
-	<?php if (!empty($this->children[$this->category->id]) && $this->maxLevel != 0) : ?>
+	<?php if ($this->maxLevel != 0 && !empty($this->children[$this->category->id])) : ?>
 		<div class="cat-children">
 			<?php if ($this->params->get('show_category_heading_title_text', 1) == 1) : ?>
 				<h3> <?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?> </h3>
diff --git a/components/com_content/views/category/tmpl/blog_children.php b/components/com_content/views/category/tmpl/blog_children.php
index 52b9486ed6866..5d86a92de18ca 100644
--- a/components/com_content/views/category/tmpl/blog_children.php
+++ b/components/com_content/views/category/tmpl/blog_children.php
@@ -14,7 +14,7 @@
 $class = ' class="first"';
 $lang  = JFactory::getLanguage();
 
-if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) : ?>
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) : ?>
 
 	<?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
 		<?php
@@ -35,7 +35,7 @@
 				<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id)); ?>">
 				<?php echo $this->escape($child->title); ?></a>
 
-				<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
+				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
 			</h3>
@@ -49,7 +49,7 @@
 					</span>
 				<?php endif; ?>
 
-				<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
+				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
 			</h3>
@@ -63,7 +63,7 @@
 			<?php endif; ?>
 			<?php endif; ?>
 
-			<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
+			<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 			<div class="collapse fade" id="category-<?php echo $child->id; ?>">
 				<?php
 				$this->children[$child->id] = $child->getChildren();
diff --git a/components/com_content/views/category/tmpl/default_children.php b/components/com_content/views/category/tmpl/default_children.php
index 0515757e82439..f8ffba5a3b221 100644
--- a/components/com_content/views/category/tmpl/default_children.php
+++ b/components/com_content/views/category/tmpl/default_children.php
@@ -36,7 +36,7 @@
 				<a href="<?php echo JRoute::_(ContentHelperRoute::getCategoryRoute($child->id));?>">
 				<?php echo $this->escape($child->title); ?></a>
 
-				<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
+				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
 			</h3>
@@ -49,7 +49,7 @@
 					</span>
 				<?php endif; ?>
 
-				<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) : ?>
+				<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) : ?>
 					<a href="#category-<?php echo $child->id;?>" data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 				<?php endif;?>
 			<?php endif;?>
@@ -62,7 +62,7 @@
 				<?php endif; ?>
 			<?php endif; ?>
 
-			<?php if (count($child->getChildren()) > 0 && $this->maxLevel > 1) :?>
+			<?php if ($this->maxLevel > 1 && count($child->getChildren()) > 0) :?>
 			<div class="collapse fade" id="category-<?php echo $child->id;?>">
 				<?php
 				$this->children[$child->id] = $child->getChildren();
diff --git a/components/com_content/views/form/view.html.php b/components/com_content/views/form/view.html.php
index 3ff7c9c9395ef..49e1053fb1f81 100644
--- a/components/com_content/views/form/view.html.php
+++ b/components/com_content/views/form/view.html.php
@@ -104,7 +104,7 @@ public function display($tpl = null)
 		}
 
 		// Propose current language as default when creating new article
-		if (JLanguageMultilang::isEnabled() && empty($this->item->id))
+		if (empty($this->item->id) && JLanguageMultilang::isEnabled())
 		{
 			$lang = JFactory::getLanguage()->getTag();
 			$this->form->setFieldAttribute('language', 'default', $lang);
diff --git a/components/com_newsfeeds/helpers/route.php b/components/com_newsfeeds/helpers/route.php
index d28a1e1a1bfc2..3137902c72819 100644
--- a/components/com_newsfeeds/helpers/route.php
+++ b/components/com_newsfeeds/helpers/route.php
@@ -150,7 +150,7 @@ protected static function _findItem($needles = null)
 
 			foreach ($items as $item)
 			{
-				if (isset($item->query) && isset($item->query['view']))
+				if (isset($item->query, $item->query['view']))
 				{
 					$view = $item->query['view'];
 
@@ -164,7 +164,7 @@ protected static function _findItem($needles = null)
 						/* Here it will become a bit tricky
 						 language != * can override existing entries
 						 language == * cannot override existing entries */
-						if (!isset(self::$lookup[$language][$view][$item->query['id']]) || $item->language != '*')
+						if ($item->language != '*' || !isset(self::$lookup[$language][$view][$item->query['id']]))
 						{
 							self::$lookup[$language][$view][$item->query['id']] = $item->id;
 						}
diff --git a/components/com_newsfeeds/router.php b/components/com_newsfeeds/router.php
index e14c3746791d3..5849d8bb7a614 100644
--- a/components/com_newsfeeds/router.php
+++ b/components/com_newsfeeds/router.php
@@ -58,7 +58,7 @@ public function build(&$query)
 		}
 
 		// Are we dealing with a newsfeed that is attached to a menu item?
-		if (isset($query['view']) && ($mView == $query['view']) and isset($query['id']) and ($mId == (int) $query['id']))
+		if (isset($query['view'], $query['id']) && ($mView == $query['view']) && ($mId == (int) $query['id']))
 		{
 			unset($query['view']);
 			unset($query['catid']);
@@ -67,9 +67,9 @@ public function build(&$query)
 			return $segments;
 		}
 
-		if (isset($view) and ($view == 'category' or $view == 'newsfeed'))
+		if (isset($view) && ($view == 'category' || $view == 'newsfeed'))
 		{
-			if ($mId != (int) $query['id'] || $mView != $view)
+			if ($mView != $view || $mId != (int) $query['id'])
 			{
 				if ($view == 'newsfeed' && isset($query['catid']))
 				{
diff --git a/components/com_newsfeeds/views/categories/tmpl/default_items.php b/components/com_newsfeeds/views/categories/tmpl/default_items.php
index be131feb2b098..5bbb6c899842e 100644
--- a/components/com_newsfeeds/views/categories/tmpl/default_items.php
+++ b/components/com_newsfeeds/views/categories/tmpl/default_items.php
@@ -12,7 +12,7 @@
 JHtml::_('bootstrap.tooltip');
 
 $class = ' class="first"';
-if (count($this->items[$this->parent->id]) > 0 && $this->maxLevelcat != 0) :
+if ($this->maxLevelcat != 0 && count($this->items[$this->parent->id]) > 0) :
 ?>
 	<?php foreach($this->items[$this->parent->id] as $id => $item) : ?>
 		<?php
@@ -33,7 +33,7 @@
 							<?php echo $item->numitems; ?>
 						</span>
 					<?php endif; ?>
-					<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) : ?>
+					<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) : ?>
 						<a id="category-btn-<?php echo $item->id;?>" href="#category-<?php echo $item->id;?>"
 							data-toggle="collapse" data-toggle="button" class="btn btn-mini pull-right"><span class="icon-plus"></span></a>
 					<?php endif;?>
@@ -46,7 +46,7 @@
 					<?php endif; ?>
 				<?php endif; ?>
 
-				<?php if (count($item->getChildren()) > 0 && $this->maxLevelcat > 1) :?>
+				<?php if ($this->maxLevelcat > 1 && count($item->getChildren()) > 0) :?>
 					<div class="collapse fade" id="category-<?php echo $item->id;?>">
 					<?php
 					$this->items[$item->id] = $item->getChildren();
diff --git a/components/com_newsfeeds/views/category/tmpl/default.php b/components/com_newsfeeds/views/category/tmpl/default.php
index 8041e75aaee00..0c4bdbe233723 100644
--- a/components/com_newsfeeds/views/category/tmpl/default.php
+++ b/components/com_newsfeeds/views/category/tmpl/default.php
@@ -46,7 +46,7 @@
 
 	<?php echo $this->loadTemplate('items'); ?>
 
-	<?php if (!empty($this->children[$this->category->id]) && $this->maxLevel != 0) : ?>
+	<?php if ($this->maxLevel != 0 && !empty($this->children[$this->category->id])) : ?>
 		<div class="cat-children">
 			<h3><?php echo JText::_('JGLOBAL_SUBCATEGORIES'); ?></h3>
 			<?php echo $this->loadTemplate('children'); ?>
diff --git a/components/com_newsfeeds/views/category/tmpl/default_children.php b/components/com_newsfeeds/views/category/tmpl/default_children.php
index a8fc4fec30b60..b53b1610b925d 100644
--- a/components/com_newsfeeds/views/category/tmpl/default_children.php
+++ b/components/com_newsfeeds/views/category/tmpl/default_children.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 $class = ' class="first"';
-if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) :
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
 ?>
 <ul>
 <?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
diff --git a/components/com_newsfeeds/views/newsfeed/tmpl/default.php b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
index 0d7953e63c5b2..8c87f06db4e68 100644
--- a/components/com_newsfeeds/views/newsfeed/tmpl/default.php
+++ b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
@@ -19,15 +19,17 @@
 	$myrtl     = $this->newsfeed->rtl;
 	$direction = ' ';
 
-		if ($lang->isRtl() && $myrtl == 0)
+	$isRtl= $lang->isRtl();
+
+		if ($isRtl && $myrtl == 0)
 		{
 			$direction = ' redirect-rtl';
 		}
-		elseif ($lang->isRtl() && $myrtl == 1)
+		elseif ($isRtl && $myrtl == 1)
 		{
 			$direction = ' redirect-ltr';
 		}
-		elseif ($lang->isRtl() && $myrtl == 2)
+		elseif ($isRtl && $myrtl == 2)
 		{
 			$direction = ' redirect-rtl';
 		}
@@ -93,7 +95,7 @@
 	<?php endif; ?>
 
 	<!-- Show Image -->
-	<?php if (isset($this->rssDoc->image) && isset($this->rssDoc->imagetitle) && $this->params->get('show_feed_image')) : ?>
+	<?php if (isset($this->rssDoc->image, $this->rssDoc->imagetitle) && $this->params->get('show_feed_image')) : ?>
 	<div>
 			<img src="<?php echo $this->rssDoc->image; ?>" alt="<?php echo $this->rssDoc->image->decription; ?>" />
 </div>
diff --git a/components/com_tags/helpers/route.php b/components/com_tags/helpers/route.php
index eb3f448a750fa..9a1b4ecadf4d4 100644
--- a/components/com_tags/helpers/route.php
+++ b/components/com_tags/helpers/route.php
@@ -126,7 +126,7 @@ protected static function _findItem($needles = null)
 			{
 				foreach ($items as $item)
 				{
-					if (isset($item->query) && isset($item->query['view']))
+					if (isset($item->query, $item->query['view']))
 					{
 						$lang = ($item->language != '' ? $item->language : '*');
 
diff --git a/components/com_tags/models/tag.php b/components/com_tags/models/tag.php
index 433000b8d8850..0aace06090231 100644
--- a/components/com_tags/models/tag.php
+++ b/components/com_tags/models/tag.php
@@ -258,7 +258,7 @@ protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
 	 */
 	public function getItem($pk = null)
 	{
-		if (!isset($this->item) ||$this->item === null)
+		if (!isset($this->item))
 		{
 			$this->item = false;
 
diff --git a/components/com_users/models/profile.php b/components/com_users/models/profile.php
index 5e45ccae75284..9751ecab95647 100644
--- a/components/com_users/models/profile.php
+++ b/components/com_users/models/profile.php
@@ -204,7 +204,7 @@ public function getForm($data = array(), $loadData = true)
 
 		$this->setState('user.username.compliant', $isUsernameCompliant);
 
-		if (!JComponentHelper::getParams('com_users')->get('change_login_name') && $isUsernameCompliant)
+		if ($isUsernameCompliant && !JComponentHelper::getParams('com_users')->get('change_login_name'))
 		{
 			$form->setFieldAttribute('username', 'class', '');
 			$form->setFieldAttribute('username', 'filter', '');
@@ -323,7 +323,7 @@ public function save($data)
 		$username            = $data['username'];
 		$isUsernameCompliant = $this->getState('user.username.compliant');
 
-		if (!JComponentHelper::getParams('com_users')->get('change_login_name') && $isUsernameCompliant)
+		if ($isUsernameCompliant && !JComponentHelper::getParams('com_users')->get('change_login_name'))
 		{
 			unset($data['username']);
 		}
diff --git a/components/com_users/views/login/tmpl/default.php b/components/com_users/views/login/tmpl/default.php
index 31e3f84792145..4203a1e7202d1 100644
--- a/components/com_users/views/login/tmpl/default.php
+++ b/components/com_users/views/login/tmpl/default.php
@@ -11,7 +11,7 @@
 
 $cookieLogin = $this->user->get('cookieLogin');
 
-if ($this->user->get('guest') || !empty($cookieLogin))
+if (!empty($cookieLogin) || $this->user->get('guest'))
 {
 	// The user is not logged in or needs to provide a password.
 	echo $this->loadTemplate('login');

From 7e6df29f94854cef59990438528773a9b23d8368 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 19:09:17 +0300
Subject: [PATCH 08/19] Fixed callable call in loop termination condition

---
 components/com_content/views/archive/view.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/com_content/views/archive/view.html.php b/components/com_content/views/archive/view.html.php
index c6ee431cbd96b..22f57456fda84 100644
--- a/components/com_content/views/archive/view.html.php
+++ b/components/com_content/views/archive/view.html.php
@@ -114,7 +114,7 @@ public function display($tpl = null)
 		$years = array();
 		$years[] = JHtml::_('select.option', null, JText::_('JYEAR'));
 
-		for ($i = 0; $i < count($this->years); $i++)
+		for ($i = 0, $iMax = count($this->years); $i < $iMax; $i++)
 		{
 			$years[] = JHtml::_('select.option', $this->years[$i], $this->years[$i]);
 		}

From 2ad8098d31a4ace370ec87bfde3ebc4b6d7fa911 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 19:12:20 +0300
Subject: [PATCH 09/19] Replaced is_null() with ===

---
 components/com_contact/helpers/association.php           | 2 +-
 components/com_content/helpers/association.php           | 2 +-
 components/com_content/views/form/tmpl/edit.php          | 4 ++--
 components/com_newsfeeds/helpers/association.php         | 2 +-
 components/com_newsfeeds/views/newsfeed/tmpl/default.php | 4 ++--
 components/com_users/models/rules/loginuniquefield.php   | 4 ++--
 components/com_users/models/rules/logoutuniquefield.php  | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/com_contact/helpers/association.php b/components/com_contact/helpers/association.php
index 2f2be6c3956ae..e84ba08f2a06d 100644
--- a/components/com_contact/helpers/association.php
+++ b/components/com_contact/helpers/association.php
@@ -33,7 +33,7 @@ abstract class ContactHelperAssociation extends CategoryHelperAssociation
 	public static function getAssociations($id = 0, $view = null)
 	{
 		$jinput = JFactory::getApplication()->input;
-		$view   = is_null($view) ? $jinput->get('view') : $view;
+		$view   = $view === null ? $jinput->get('view') : $view;
 		$id     = empty($id) ? $jinput->getInt('id') : $id;
 
 		if ($view == 'contact')
diff --git a/components/com_content/helpers/association.php b/components/com_content/helpers/association.php
index 278cdbeb5e8b5..5a5c87387914d 100644
--- a/components/com_content/helpers/association.php
+++ b/components/com_content/helpers/association.php
@@ -33,7 +33,7 @@ abstract class ContentHelperAssociation extends CategoryHelperAssociation
 	public static function getAssociations($id = 0, $view = null)
 	{
 		$jinput = JFactory::getApplication()->input;
-		$view   = is_null($view) ? $jinput->get('view') : $view;
+		$view   = $view === null ? $jinput->get('view') : $view;
 		$id     = empty($id) ? $jinput->getInt('id') : $id;
 
 		if ($view == 'article')
diff --git a/components/com_content/views/form/tmpl/edit.php b/components/com_content/views/form/tmpl/edit.php
index 08b4bbfdef11f..43196e60f058c 100644
--- a/components/com_content/views/form/tmpl/edit.php
+++ b/components/com_content/views/form/tmpl/edit.php
@@ -82,7 +82,7 @@
 				<div class="tab-pane active" id="editor">
 					<?php echo $this->form->renderField('title'); ?>
 
-					<?php if (is_null($this->item->id)) : ?>
+					<?php if ($this->item->id === null) : ?>
 						<?php echo $this->form->renderField('alias'); ?>
 					<?php endif; ?>
 
@@ -142,7 +142,7 @@
 						<?php echo $this->form->renderField('publish_down'); ?>
 					<?php endif; ?>
 					<?php echo $this->form->renderField('access'); ?>
-					<?php if (is_null($this->item->id)):?>
+					<?php if ($this->item->id === null):?>
 						<div class="control-group">
 							<div class="control-label">
 							</div>
diff --git a/components/com_newsfeeds/helpers/association.php b/components/com_newsfeeds/helpers/association.php
index 48f0ea4f8c467..b70b15172062f 100644
--- a/components/com_newsfeeds/helpers/association.php
+++ b/components/com_newsfeeds/helpers/association.php
@@ -33,7 +33,7 @@ abstract class NewsfeedsHelperAssociation extends CategoryHelperAssociation
 	public static function getAssociations($id = 0, $view = null)
 	{
 		$jinput = JFactory::getApplication()->input;
-		$view   = is_null($view) ? $jinput->get('view') : $view;
+		$view   = $view === null ? $jinput->get('view') : $view;
 		$id     = empty($id) ? $jinput->getInt('id') : $id;
 
 		if ($view == 'newsfeed')
diff --git a/components/com_newsfeeds/views/newsfeed/tmpl/default.php b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
index 8c87f06db4e68..c48fe1904d7dc 100644
--- a/components/com_newsfeeds/views/newsfeed/tmpl/default.php
+++ b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
@@ -112,9 +112,9 @@
 		}
 		?>
 		<?php
-			$uri   = !empty($this->rssDoc[$i]->guid) || !is_null($this->rssDoc[$i]->guid) ? trim($this->rssDoc[$i]->guid) : trim($this->rssDoc[$i]->uri);
+			$uri   = !empty($this->rssDoc[$i]->guid) || $this->rssDoc[$i]->guid !== null ? trim($this->rssDoc[$i]->guid) : trim($this->rssDoc[$i]->uri);
 			$uri   = substr($uri, 0, 4) != 'http' ? $this->item->link : $uri;
-			$text  = !empty($this->rssDoc[$i]->content) || !is_null($this->rssDoc[$i]->content) ? trim($this->rssDoc[$i]->content) : trim($this->rssDoc[$i]->description);
+			$text  = !empty($this->rssDoc[$i]->content) || $this->rssDoc[$i]->content !== null ? trim($this->rssDoc[$i]->content) : trim($this->rssDoc[$i]->description);
 			$title = trim($this->rssDoc[$i]->title);
 		?>
 			<li>
diff --git a/components/com_users/models/rules/loginuniquefield.php b/components/com_users/models/rules/loginuniquefield.php
index 850cce29b6fdb..e92502ed12f22 100644
--- a/components/com_users/models/rules/loginuniquefield.php
+++ b/components/com_users/models/rules/loginuniquefield.php
@@ -41,12 +41,12 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry
 		$loginRedirectUrl       = $input['params']->login_redirect_url;
 		$loginRedirectMenuitem  = $input['params']->login_redirect_menuitem;
 
-		if (is_null($form))
+		if ($form === null)
 		{
 			throw new InvalidArgumentException(sprintf('The value for $form must not be null in %s', get_class($this)));
 		}
 
-		if (is_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/components/com_users/models/rules/logoutuniquefield.php b/components/com_users/models/rules/logoutuniquefield.php
index 4be8fa388a4d4..993be34cef570 100644
--- a/components/com_users/models/rules/logoutuniquefield.php
+++ b/components/com_users/models/rules/logoutuniquefield.php
@@ -41,12 +41,12 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry
 		$logoutRedirectUrl      = $input['params']->logout_redirect_url;
 		$logoutRedirectMenuitem = $input['params']->logout_redirect_menuitem;
 
-		if (is_null($form))
+		if ($form === null)
 		{
 			throw new InvalidArgumentException(sprintf('The value for $form must not be null in %s', get_class($this)));
 		}
 
-		if (is_null($input))
+		if ($input === null)
 		{
 			throw new InvalidArgumentException(sprintf('The value for $input must not be null in %s', get_class($this)));
 		}

From f0c739296a8fecf852024623045bb893dbcd0480 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 19:15:21 +0300
Subject: [PATCH 10/19] Fixed non-optimal regular expressions

---
 components/com_search/models/search.php          | 2 +-
 components/com_search/views/search/view.html.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/com_search/models/search.php b/components/com_search/models/search.php
index c7b5df0026286..775c6182c1b28 100644
--- a/components/com_search/models/search.php
+++ b/components/com_search/models/search.php
@@ -107,7 +107,7 @@ public function setSearch($keyword, $match = 'all', $ordering = 'newest')
 
 			if ($match !== 'exact')
 			{
-				$keyword = preg_replace('#\xE3\x80\x80#s', ' ', $keyword);
+				$keyword = preg_replace('#\xE3\x80\x80#', ' ', $keyword);
 			}
 
 			$this->setState('keyword', $keyword);
diff --git a/components/com_search/views/search/view.html.php b/components/com_search/views/search/view.html.php
index 4b0d4823cd074..8f75ab095c84d 100644
--- a/components/com_search/views/search/view.html.php
+++ b/components/com_search/views/search/view.html.php
@@ -153,8 +153,8 @@ public function display($tpl = null)
 				}
 				else
 				{
-					$searchworda = preg_replace('#\xE3\x80\x80#s', ' ', $searchword);
-					$searchwords = preg_split("/\s+/u", $searchworda);
+					$searchworda = preg_replace('#\xE3\x80\x80#', ' ', $searchword);
+					$searchwords = preg_split('/\s+/u', $searchworda);
 					$needle      = $searchwords[0];
 				}
 

From d6c7e42237d4d2cea9240e5b4fd222a182ed24b0 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 19:16:09 +0300
Subject: [PATCH 11/19] Short syntax for applied operation

---
 components/com_content/helpers/icon.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/com_content/helpers/icon.php b/components/com_content/helpers/icon.php
index 80e8db0354bcc..84eb0d5332ed0 100644
--- a/components/com_content/helpers/icon.php
+++ b/components/com_content/helpers/icon.php
@@ -55,7 +55,7 @@ public static function create($category, $params, $attribs = array(), $legacy =
 		// Add the button classes to the attribs array
 		if (isset($attribs['class']))
 		{
-			$attribs['class'] = $attribs['class'] . ' btn btn-primary';
+			$attribs['class'] .= ' btn btn-primary';
 		}
 		else
 		{

From b89b4e17abbc5802ac61ffb71762c72930a8dfc9 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 19:19:16 +0300
Subject: [PATCH 12/19] Do not use strlen to check for empty string

---
 components/com_contact/views/contact/tmpl/default_form.php | 2 +-
 components/com_users/views/profile/tmpl/default_custom.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/com_contact/views/contact/tmpl/default_form.php b/components/com_contact/views/contact/tmpl/default_form.php
index 31b0e2b282b99..ef21ae02405cd 100644
--- a/components/com_contact/views/contact/tmpl/default_form.php
+++ b/components/com_contact/views/contact/tmpl/default_form.php
@@ -22,7 +22,7 @@
 			<?php $fields = $this->form->getFieldset($fieldset->name); ?>
 			<?php if (count($fields)) : ?>
 				<fieldset>
-					<?php if (isset($fieldset->label) && strlen($legend = trim(JText::_($fieldset->label)))) : ?>
+					<?php if (isset($fieldset->label) && ($legend = trim(JText::_($fieldset->label))) !== '') : ?>
 						<legend><?php echo $legend; ?></legend>
 					<?php endif; ?>
 					<?php foreach ($fields as $field) : ?>
diff --git a/components/com_users/views/profile/tmpl/default_custom.php b/components/com_users/views/profile/tmpl/default_custom.php
index 5a93f6fbaf5df..dccb60d50c67e 100644
--- a/components/com_users/views/profile/tmpl/default_custom.php
+++ b/components/com_users/views/profile/tmpl/default_custom.php
@@ -28,7 +28,7 @@
 	<?php $fields = $this->form->getFieldset($group); ?>
 	<?php if (count($fields)) : ?>
 		<fieldset id="users-profile-custom-<?php echo $group; ?>" class="users-profile-custom-<?php echo $group; ?>">
-			<?php if (isset($fieldset->label) && strlen($legend = trim(JText::_($fieldset->label)))) : ?>
+			<?php if (isset($fieldset->label) && ($legend = trim(JText::_($fieldset->label))) !== '') : ?>
 				<legend><?php echo $legend; ?></legend>
 			<?php endif; ?>
 			<dl class="dl-horizontal">

From 656a9c21cf29148778492a8d1c4736d2b278ee67 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 19:22:11 +0300
Subject: [PATCH 13/19] Replace strstr() with strpos() for some cases

---
 components/com_wrapper/views/wrapper/view.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/com_wrapper/views/wrapper/view.html.php b/components/com_wrapper/views/wrapper/view.html.php
index 312ac1e6fd99a..d045048a009d2 100644
--- a/components/com_wrapper/views/wrapper/view.html.php
+++ b/components/com_wrapper/views/wrapper/view.html.php
@@ -86,7 +86,7 @@ public function display($tpl = null)
 				// Relative url in component. Use server http_host.
 				$wrapper->url = 'http://' . $_SERVER['HTTP_HOST'] . $url;
 			}
-			elseif (!strstr($url, 'http') && !strstr($url, 'https'))
+			elseif (strpos($url, 'http') === false && strpos($url, 'https') === false)
 			{
 				$wrapper->url = 'http://' . $url;
 			}

From 79c41e3b9c8f3bcfa7d72389ba5c656c9bf405a2 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 19:29:34 +0300
Subject: [PATCH 14/19] Replace some substr() with strpos()

---
 components/com_newsfeeds/views/newsfeed/tmpl/default.php | 2 +-
 components/com_users/helpers/html/users.php              | 2 +-
 components/com_wrapper/views/wrapper/view.html.php       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/com_newsfeeds/views/newsfeed/tmpl/default.php b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
index c48fe1904d7dc..08618d4f6d78d 100644
--- a/components/com_newsfeeds/views/newsfeed/tmpl/default.php
+++ b/components/com_newsfeeds/views/newsfeed/tmpl/default.php
@@ -113,7 +113,7 @@
 		?>
 		<?php
 			$uri   = !empty($this->rssDoc[$i]->guid) || $this->rssDoc[$i]->guid !== null ? trim($this->rssDoc[$i]->guid) : trim($this->rssDoc[$i]->uri);
-			$uri   = substr($uri, 0, 4) != 'http' ? $this->item->link : $uri;
+			$uri   = strpos($uri, 'http') !== 0 ? $this->item->link : $uri;
 			$text  = !empty($this->rssDoc[$i]->content) || $this->rssDoc[$i]->content !== null ? trim($this->rssDoc[$i]->content) : trim($this->rssDoc[$i]->description);
 			$title = trim($this->rssDoc[$i]->title);
 		?>
diff --git a/components/com_users/helpers/html/users.php b/components/com_users/helpers/html/users.php
index ed46f5020f655..2309202bf2fcc 100644
--- a/components/com_users/helpers/html/users.php
+++ b/components/com_users/helpers/html/users.php
@@ -92,7 +92,7 @@ public static function helpsite($value)
 
 			$value = htmlspecialchars($value, ENT_COMPAT, 'UTF-8');
 
-			if (substr($value, 0, 4) == 'http')
+			if (strpos($value, 'http') !== 0)
 			{
 				return '<a href="' . $value . '">' . $text . '</a>';
 			}
diff --git a/components/com_wrapper/views/wrapper/view.html.php b/components/com_wrapper/views/wrapper/view.html.php
index d045048a009d2..2d9375c46014c 100644
--- a/components/com_wrapper/views/wrapper/view.html.php
+++ b/components/com_wrapper/views/wrapper/view.html.php
@@ -81,7 +81,7 @@ public function display($tpl = null)
 		if ($params->def('add_scheme', 1))
 		{
 			// Adds 'http://' if none is set
-			if (substr($url, 0, 1) == '/')
+			if (strpos($url, '/') !== 0)
 			{
 				// Relative url in component. Use server http_host.
 				$wrapper->url = 'http://' . $_SERVER['HTTP_HOST'] . $url;

From 7a935673a331a798b36a952bc77b59f422c1b075 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 19:34:21 +0300
Subject: [PATCH 15/19] Merge unset statements

---
 components/com_config/view/cms/html.php      | 3 +--
 components/com_contact/router.php            | 7 ++-----
 components/com_content/router.php            | 3 +--
 components/com_newsfeeds/router.php          | 7 ++-----
 components/com_search/controller.php         | 3 +--
 components/com_users/controllers/profile.php | 3 +--
 components/com_users/models/profile.php      | 7 ++-----
 components/com_users/models/registration.php | 3 +--
 8 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/components/com_config/view/cms/html.php b/components/com_config/view/cms/html.php
index 6699fef2d6fed..1c9b680b19d58 100644
--- a/components/com_config/view/cms/html.php
+++ b/components/com_config/view/cms/html.php
@@ -126,8 +126,7 @@ public function loadTemplate($tpl = null)
 		if ($this->_template != false)
 		{
 			// Unset so as not to introduce into template scope
-			unset($tpl);
-			unset($file);
+			unset($tpl, $file);
 
 			// Never allow a 'this' property
 			if (isset($this->this))
diff --git a/components/com_contact/router.php b/components/com_contact/router.php
index c29bf56db9140..0b730f9298b20 100644
--- a/components/com_contact/router.php
+++ b/components/com_contact/router.php
@@ -60,9 +60,7 @@ public function build(&$query)
 		// Are we dealing with a contact that is attached to a menu item?
 		if (isset($view, $query['id']) && ($mView == $view) && ($mId == (int) $query['id']))
 		{
-			unset($query['view']);
-			unset($query['catid']);
-			unset($query['id']);
+			unset($query['view'], $query['catid'], $query['id']);
 			return $segments;
 		}
 
@@ -123,8 +121,7 @@ public function build(&$query)
 				}
 			}
 
-			unset($query['id']);
-			unset($query['catid']);
+			unset($query['id'], $query['catid']);
 		}
 
 		if (isset($query['layout']))
diff --git a/components/com_content/router.php b/components/com_content/router.php
index 2a84ced8114fc..98aab9a3680a5 100644
--- a/components/com_content/router.php
+++ b/components/com_content/router.php
@@ -195,8 +195,7 @@ public function build(&$query)
 				$segments[] = $id;
 			}
 
-			unset($query['id']);
-			unset($query['catid']);
+			unset($query['id'], $query['catid']);
 		}
 
 		if ($view == 'archive')
diff --git a/components/com_newsfeeds/router.php b/components/com_newsfeeds/router.php
index 5849d8bb7a614..b632e77715dc0 100644
--- a/components/com_newsfeeds/router.php
+++ b/components/com_newsfeeds/router.php
@@ -60,9 +60,7 @@ public function build(&$query)
 		// Are we dealing with a newsfeed that is attached to a menu item?
 		if (isset($query['view'], $query['id']) && ($mView == $query['view']) && ($mId == (int) $query['id']))
 		{
-			unset($query['view']);
-			unset($query['catid']);
-			unset($query['id']);
+			unset($query['view'], $query['catid'], $query['id']);
 
 			return $segments;
 		}
@@ -124,8 +122,7 @@ public function build(&$query)
 				}
 			}
 
-			unset($query['id']);
-			unset($query['catid']);
+			unset($query['id'], $query['catid']);
 		}
 
 		if (isset($query['layout']))
diff --git a/components/com_search/controller.php b/components/com_search/controller.php
index 313ffadbe239a..3dbef4959b111 100644
--- a/components/com_search/controller.php
+++ b/components/com_search/controller.php
@@ -98,8 +98,7 @@ public function search()
 			}
 		}
 
-		unset($post['task']);
-		unset($post['submit']);
+		unset($post['task'], $post['submit']);
 
 		$uri = JUri::getInstance();
 		$uri->setQuery($post);
diff --git a/components/com_users/controllers/profile.php b/components/com_users/controllers/profile.php
index a2fbdc594def3..f3240bae85755 100644
--- a/components/com_users/controllers/profile.php
+++ b/components/com_users/controllers/profile.php
@@ -136,8 +136,7 @@ public function save()
 			}
 
 			// Unset the passwords.
-			unset($requestData['password1']);
-			unset($requestData['password2']);
+			unset($requestData['password1'], $requestData['password2']);
 
 			// Save the data in the session.
 			$app->setUserState('com_users.edit.profile.data', $requestData);
diff --git a/components/com_users/models/profile.php b/components/com_users/models/profile.php
index 9751ecab95647..56ba57c7633d0 100644
--- a/components/com_users/models/profile.php
+++ b/components/com_users/models/profile.php
@@ -145,8 +145,7 @@ public function getData()
 			}
 
 			// Unset the passwords.
-			unset($this->data->password1);
-			unset($this->data->password2);
+			unset($this->data->password1, $this->data->password2);
 
 			$registry           = new Registry($this->data->params);
 			$this->data->params = $registry->toArray();
@@ -329,10 +328,8 @@ public function save($data)
 		}
 
 		// Unset the block so it does not get overwritten
-		unset($data['block']);
-
 		// Unset the sendEmail so it does not get overwritten
-		unset($data['sendEmail']);
+		unset($data['block'], $data['sendEmail']);
 
 		// Handle the two factor authentication setup
 		if (array_key_exists('twofactor', $data))
diff --git a/components/com_users/models/registration.php b/components/com_users/models/registration.php
index cfc8df9956ee7..e2274ac185476 100644
--- a/components/com_users/models/registration.php
+++ b/components/com_users/models/registration.php
@@ -256,8 +256,7 @@ public function getData()
 			$this->data->groups[] = $system;
 
 			// Unset the passwords.
-			unset($this->data->password1);
-			unset($this->data->password2);
+			unset($this->data->password1, $this->data->password2);
 
 			// Get the dispatcher and load the users plugins.
 			$dispatcher = JEventDispatcher::getInstance();

From 94a33cfe2f22011a3628d83456025d25cdcc6e22 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 19:34:51 +0300
Subject: [PATCH 16/19] Remove silly assignment :smile:

---
 components/com_mailto/controller.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/com_mailto/controller.php b/components/com_mailto/controller.php
index 0be4ae9dd4b7a..e8c1da8117004 100644
--- a/components/com_mailto/controller.php
+++ b/components/com_mailto/controller.php
@@ -135,7 +135,6 @@ public function send()
 
 		// Build the message to send
 		$msg  = JText::_('COM_MAILTO_EMAIL_MSG');
-		$link = $link;
 		$body = sprintf($msg, $SiteName, $sender, $from, $link);
 
 		// Clean the email data

From f5757768f5f1f9a809f932b416adf5b005412740 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 19:53:14 +0300
Subject: [PATCH 17/19] Made string comparisons type safe

---
 components/com_banners/models/banners.php     |  2 +-
 .../com_config/controller/config/display.php  |  2 +-
 components/com_config/controller/display.php  |  2 +-
 components/com_config/controller/helper.php   |  6 +-
 .../controller/templates/display.php          |  2 +-
 .../com_config/view/modules/tmpl/default.php  |  2 +-
 .../view/modules/tmpl/default_options.php     |  2 +-
 .../com_contact/controllers/contact.php       |  2 +-
 .../com_contact/helpers/association.php       |  4 +-
 components/com_contact/helpers/route.php      | 10 ++--
 components/com_contact/models/category.php    |  4 +-
 components/com_contact/router.php             | 10 ++--
 .../com_contact/views/category/view.html.php  |  2 +-
 .../views/contact/tmpl/default.php            | 58 +++++++++----------
 .../views/contact/tmpl/default_links.php      | 10 ++--
 .../views/contact/tmpl/default_profile.php    |  2 +-
 .../com_contact/views/contact/view.html.php   |  4 +-
 components/com_content/controller.php         |  8 +--
 .../com_content/helpers/association.php       |  4 +-
 components/com_content/helpers/route.php      | 12 ++--
 components/com_content/models/articles.php    | 10 ++--
 components/com_content/models/category.php    |  6 +-
 components/com_content/router.php             | 18 +++---
 .../views/archive/tmpl/default.php            |  2 +-
 .../com_content/views/archive/view.html.php   |  2 +-
 .../com_content/views/article/view.html.php   |  6 +-
 .../views/category/tmpl/default_articles.php  | 12 ++--
 .../com_content/views/category/view.html.php  |  8 +--
 .../com_content/views/featured/view.feed.php  |  2 +-
 .../com_content/views/featured/view.html.php  |  2 +-
 components/com_newsfeeds/controller.php       |  2 +-
 .../com_newsfeeds/helpers/association.php     |  4 +-
 components/com_newsfeeds/helpers/route.php    | 10 ++--
 components/com_newsfeeds/router.php           | 10 ++--
 .../views/category/tmpl/default_items.php     |  4 +-
 .../views/category/view.html.php              |  4 +-
 .../views/newsfeed/view.html.php              |  6 +-
 components/com_search/controller.php          |  4 +-
 .../com_search/views/search/view.html.php     |  2 +-
 components/com_tags/controller.php            |  2 +-
 components/com_tags/helpers/route.php         |  2 +-
 components/com_tags/models/tag.php            |  2 +-
 components/com_tags/models/tags.php           |  6 +-
 components/com_tags/router.php                |  4 +-
 .../com_tags/views/tag/tmpl/default_items.php |  2 +-
 .../com_tags/views/tag/tmpl/list_items.php    |  6 +-
 components/com_tags/views/tag/view.feed.php   |  4 +-
 components/com_tags/views/tag/view.html.php   |  2 +-
 components/com_tags/views/tags/view.feed.php  |  4 +-
 components/com_tags/views/tags/view.html.php  |  2 +-
 components/com_users/models/profile.php       |  2 +-
 components/com_users/router.php               | 12 ++--
 .../com_users/views/profile/tmpl/edit.php     |  4 +-
 .../views/registration/tmpl/default.php       |  2 +-
 .../com_users/views/reset/view.html.php       |  2 +-
 55 files changed, 160 insertions(+), 160 deletions(-)

diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php
index cb5b0c337f656..d6321cf9f4e79 100644
--- a/components/com_banners/models/banners.php
+++ b/components/com_banners/models/banners.php
@@ -62,7 +62,7 @@ protected function getListQuery()
 		$cid        = $this->getState('filter.client_id');
 		$categoryId = $this->getState('filter.category_id');
 		$keywords   = $this->getState('filter.keywords');
-		$randomise  = ($ordering == 'random');
+		$randomise  = ($ordering === 'random');
 		$nullDate   = $db->quote($db->getNullDate());
 		$nowDate    = $db->quote(JFactory::getDate()->toSql());
 
diff --git a/components/com_config/controller/config/display.php b/components/com_config/controller/config/display.php
index 05ce1d580a6e9..125621161e10f 100644
--- a/components/com_config/controller/config/display.php
+++ b/components/com_config/controller/config/display.php
@@ -59,7 +59,7 @@ public function execute()
 
 		if (class_exists($viewClass))
 		{
-			if ($viewName != 'close')
+			if ($viewName !== 'close')
 			{
 				$model = new $modelClass;
 
diff --git a/components/com_config/controller/display.php b/components/com_config/controller/display.php
index a9049444edd48..83d0eff450298 100644
--- a/components/com_config/controller/display.php
+++ b/components/com_config/controller/display.php
@@ -95,7 +95,7 @@ public function execute()
 			$view->document = $document;
 
 			// Reply for service requests
-			if ($viewFormat == 'json')
+			if ($viewFormat === 'json')
 			{
 				return $view->render();
 			}
diff --git a/components/com_config/controller/helper.php b/components/com_config/controller/helper.php
index dffb37b40e6d0..8fef129d8150a 100644
--- a/components/com_config/controller/helper.php
+++ b/components/com_config/controller/helper.php
@@ -62,7 +62,7 @@ public function parseController($app)
 			}
 		}
 
-		if (empty($tasks[0]) || $tasks[0] == 'Config')
+		if (empty($tasks[0]) || $tasks[0] === 'Config')
 		{
 			$location = 'Config';
 		}
@@ -90,7 +90,7 @@ public function parseController($app)
 		// Some special handling for com_config administrator
 		$option = $app->input->get('option');
 
-		if ($option == 'com_config' && $app->isAdmin())
+		if ($option === 'com_config' && $app->isAdmin())
 		{
 			$component = $app->input->get('component');
 
@@ -98,7 +98,7 @@ public function parseController($app)
 			{
 				$view = 'Component';
 			}
-			elseif ($option == 'com_config')
+			elseif ($option === 'com_config')
 			{
 				$view = 'Application';
 			}
diff --git a/components/com_config/controller/templates/display.php b/components/com_config/controller/templates/display.php
index ddd610247d2d2..2ee48e452acf4 100644
--- a/components/com_config/controller/templates/display.php
+++ b/components/com_config/controller/templates/display.php
@@ -62,7 +62,7 @@ public function execute()
 
 		if (class_exists($viewClass))
 		{
-			if ($viewName != 'close')
+			if ($viewName !== 'close')
 			{
 				$model = new $modelClass;
 
diff --git a/components/com_config/view/modules/tmpl/default.php b/components/com_config/view/modules/tmpl/default.php
index 06c7ee3ab4f13..0a1bb7ca95e2c 100644
--- a/components/com_config/view/modules/tmpl/default.php
+++ b/components/com_config/view/modules/tmpl/default.php
@@ -15,7 +15,7 @@
 JHtml::_('behavior.combobox');
 JHtml::_('formbehavior.chosen', 'select');
 
-$hasContent = empty($this->item['module']) || $this->item['module'] == 'custom' || $this->item['module'] == 'mod_custom';
+$hasContent = empty($this->item['module']) || $this->item['module'] === 'custom' || $this->item['module'] === 'mod_custom';
 
 // If multi-language site, make language read-only
 if (JLanguageMultilang::isEnabled())
diff --git a/components/com_config/view/modules/tmpl/default_options.php b/components/com_config/view/modules/tmpl/default_options.php
index 0589a9f31f911..41ed53b7a2688 100644
--- a/components/com_config/view/modules/tmpl/default_options.php
+++ b/components/com_config/view/modules/tmpl/default_options.php
@@ -37,7 +37,7 @@
 			<div class="controls">
 				<?php
 				// If multi-language site, make menu-type selection read-only
-				if (JLanguageMultilang::isEnabled() && $this->item['module'] == 'mod_menu' && $field->getAttribute('name') == 'menutype')
+				if (JLanguageMultilang::isEnabled() && $this->item['module'] === 'mod_menu' && $field->getAttribute('name') === 'menutype')
 				{
 					$field->__set('readonly', true);
 				}
diff --git a/components/com_contact/controllers/contact.php b/components/com_contact/controllers/contact.php
index 4b6e4b6f77da0..8993230bc55dd 100644
--- a/components/com_contact/controllers/contact.php
+++ b/components/com_contact/controllers/contact.php
@@ -59,7 +59,7 @@ public function submit()
 		// Check for a valid session cookie
 		if ($params->get('validate_session', 0))
 		{
-			if (JFactory::getSession()->getState() != 'active')
+			if (JFactory::getSession()->getState() !== 'active')
 			{
 				JError::raiseWarning(403, JText::_('JLIB_ENVIRONMENT_SESSION_INVALID'));
 
diff --git a/components/com_contact/helpers/association.php b/components/com_contact/helpers/association.php
index e84ba08f2a06d..a3b8ad9338a39 100644
--- a/components/com_contact/helpers/association.php
+++ b/components/com_contact/helpers/association.php
@@ -36,7 +36,7 @@ public static function getAssociations($id = 0, $view = null)
 		$view   = $view === null ? $jinput->get('view') : $view;
 		$id     = empty($id) ? $jinput->getInt('id') : $id;
 
-		if ($view == 'contact')
+		if ($view === 'contact')
 		{
 			if ($id)
 			{
@@ -53,7 +53,7 @@ public static function getAssociations($id = 0, $view = null)
 			}
 		}
 
-		if ($view == 'category' || $view == 'categories')
+		if ($view === 'category' || $view === 'categories')
 		{
 			return self::getCategoryAssociations($id, 'com_contact');
 		}
diff --git a/components/com_contact/helpers/route.php b/components/com_contact/helpers/route.php
index 8740ab7554d5f..2b3394e498f6e 100644
--- a/components/com_contact/helpers/route.php
+++ b/components/com_contact/helpers/route.php
@@ -54,7 +54,7 @@ public static function getContactRoute($id, $catid, $language = 0)
 			}
 		}
 
-		if ($language && $language != '*' && JLanguageMultilang::isEnabled())
+		if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
 		{
 			$link .= '&lang=' . $language;
 			$needles['language'] = $language;
@@ -106,7 +106,7 @@ public static function getCategoryRoute($catid, $language = 0)
 			$needles['category']   = $catids;
 			$needles['categories'] = $catids;
 
-			if ($language && $language != '*' && JLanguageMultilang::isEnabled())
+			if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
 			{
 				$link .= '&lang=' . $language;
 				$needles['language'] = $language;
@@ -145,7 +145,7 @@ protected static function _findItem($needles = null)
 			$attributes = array('component_id');
 			$values     = array($component->id);
 
-			if ($language != '*')
+			if ($language !== '*')
 			{
 				$attributes[] = 'language';
 				$values[] = array($needles['language'], '*');
@@ -171,7 +171,7 @@ protected static function _findItem($needles = null)
 						* language != * can override existing entries
 						* language == * cannot override existing entries
 						*/
-						if ($item->language != '*' || !isset(self::$lookup[$language][$view][$item->query['id']]))
+						if ($item->language !== '*' || !isset(self::$lookup[$language][$view][$item->query['id']]))
 						{
 							self::$lookup[$language][$view][$item->query['id']] = $item->id;
 						}
@@ -199,7 +199,7 @@ protected static function _findItem($needles = null)
 
 		// Check if the active menuitem matches the requested language
 		$active = $menus->getActive();
-		if ($active && ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
+		if ($active && ($language === '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
 		{
 			return $active->id;
 		}
diff --git a/components/com_contact/models/category.php b/components/com_contact/models/category.php
index 1c6c22ae3b04d..57976cd3e6de3 100644
--- a/components/com_contact/models/category.php
+++ b/components/com_contact/models/category.php
@@ -201,7 +201,7 @@ protected function getListQuery()
 		}
 
 		// Set sortname ordering if selected
-		if ($this->getState('list.ordering') == 'sortname')
+		if ($this->getState('list.ordering') === 'sortname')
 		{
 			$query->order($db->escape('a.sortname1') . ' ' . $db->escape($this->getState('list.direction', 'ASC')))
 				->order($db->escape('a.sortname2') . ' ' . $db->escape($this->getState('list.direction', 'ASC')))
@@ -235,7 +235,7 @@ protected function populateState($ordering = null, $direction = null)
 		// List state information
 		$format = $app->input->getWord('format');
 
-		if ($format == 'feed')
+		if ($format === 'feed')
 		{
 			$limit = $app->get('feed_limit');
 		}
diff --git a/components/com_contact/router.php b/components/com_contact/router.php
index 0b730f9298b20..665047cc8532f 100644
--- a/components/com_contact/router.php
+++ b/components/com_contact/router.php
@@ -49,7 +49,7 @@ public function build(&$query)
 		{
 			$view = $query['view'];
 
-			if (empty($query['Itemid']) || empty($menuItem) || $menuItem->component != 'com_contact')
+			if (empty($query['Itemid']) || empty($menuItem) || $menuItem->component !== 'com_contact')
 			{
 				$segments[] = $query['view'];
 			}
@@ -64,11 +64,11 @@ public function build(&$query)
 			return $segments;
 		}
 
-		if (isset($view) && ($view == 'category' || $view == 'contact'))
+		if (isset($view) && ($view === 'category' || $view === 'contact'))
 		{
 			if ($mView != $view || $mId != (int) $query['id'])
 			{
-				if ($view == 'contact' && isset($query['catid']))
+				if ($view === 'contact' && isset($query['catid']))
 				{
 					$catid = $query['catid'];
 				}
@@ -106,7 +106,7 @@ public function build(&$query)
 					$segments = array_merge($segments, array_reverse($array));
 				}
 
-				if ($view == 'contact')
+				if ($view === 'contact')
 				{
 					if ($advanced)
 					{
@@ -136,7 +136,7 @@ public function build(&$query)
 			}
 			else
 			{
-				if ($query['layout'] == 'default')
+				if ($query['layout'] === 'default')
 				{
 					unset($query['layout']);
 				}
diff --git a/components/com_contact/views/category/view.html.php b/components/com_contact/views/category/view.html.php
index f548243b5a1a5..49fa1643d5062 100644
--- a/components/com_contact/views/category/view.html.php
+++ b/components/com_contact/views/category/view.html.php
@@ -100,7 +100,7 @@ protected function prepareDocument()
 			$path = array(array('title' => $this->category->title, 'link' => ''));
 			$category = $this->category->getParent();
 
-			while (($menu->query['option'] != 'com_contact' || $menu->query['view'] == 'contact' || $id != $category->id) && $category->id > 1)
+			while (($menu->query['option'] !== 'com_contact' || $menu->query['view'] === 'contact' || $id != $category->id) && $category->id > 1)
 			{
 				$path[] = array('title' => $category->title, 'link' => ContactHelperRoute::getCategoryRoute($category->id));
 				$category = $category->getParent();
diff --git a/components/com_contact/views/contact/tmpl/default.php b/components/com_contact/views/contact/tmpl/default.php
index ce35f95861ea7..3ee38a51e745a 100644
--- a/components/com_contact/views/contact/tmpl/default.php
+++ b/components/com_contact/views/contact/tmpl/default.php
@@ -34,11 +34,11 @@
 
 	<?php $show_contact_category = $tparams->get('show_contact_category'); ?>
 
-	<?php if ($show_contact_category == 'show_no_link') : ?>
+	<?php if ($show_contact_category === 'show_no_link') : ?>
 		<h3>
 			<span class="contact-category"><?php echo $this->contact->category_title; ?></span>
 		</h3>
-	<?php elseif ($show_contact_category == 'show_with_link') : ?>
+	<?php elseif ($show_contact_category === 'show_with_link') : ?>
 		<?php $contactLink = ContactHelperRoute::getCategoryRoute($this->contact->catid); ?>
 		<h3>
 			<span class="contact-category"><a href="<?php echo $contactLink; ?>">
@@ -65,13 +65,13 @@
 	
 	<?php $presentation_style = $tparams->get('presentation_style'); ?>
 
-	<?php if ($presentation_style == 'sliders') : ?>
+	<?php if ($presentation_style === 'sliders') : ?>
 		<?php echo JHtml::_('bootstrap.startAccordion', 'slide-contact', array('active' => 'basic-details')); ?>
 		<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_DETAILS'), 'basic-details'); ?>
-	<?php elseif ($presentation_style == 'tabs') : ?>
+	<?php elseif ($presentation_style === 'tabs') : ?>
 		<?php echo JHtml::_('bootstrap.startTabSet', 'myTab', array('active' => 'basic-details')); ?>
 		<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'basic-details', JText::_('COM_CONTACT_DETAILS')); ?>
-	<?php elseif ($presentation_style == 'plain') : ?>
+	<?php elseif ($presentation_style === 'plain') : ?>
 		<?php echo '<h3>' . JText::_('COM_CONTACT_DETAILS') . '</h3>'; ?>
 	<?php endif; ?>
 
@@ -97,26 +97,26 @@
 		<?php echo JText::_('COM_CONTACT_VCARD'); ?></a>
 	<?php endif; ?>
 
-	<?php if ($presentation_style == 'sliders') : ?>
+	<?php if ($presentation_style === 'sliders') : ?>
 		<?php echo JHtml::_('bootstrap.endSlide'); ?>
-	<?php elseif ($presentation_style == 'tabs') : ?>
+	<?php elseif ($presentation_style === 'tabs') : ?>
 		<?php echo JHtml::_('bootstrap.endTab'); ?>
 	<?php endif; ?>
 
 	<?php if ($tparams->get('show_email_form') && ($this->contact->email_to || $this->contact->user_id)) : ?>
-		<?php if ($presentation_style == 'sliders') : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_EMAIL_FORM'), 'display-form'); ?>
-		<?php elseif ($presentation_style == 'tabs') : ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-form', JText::_('COM_CONTACT_EMAIL_FORM')); ?>
-		<?php elseif ($presentation_style == 'plain') : ?>
+		<?php elseif ($presentation_style === 'plain') : ?>
 			<?php echo '<h3>' . JText::_('COM_CONTACT_EMAIL_FORM') . '</h3>'; ?>
 		<?php endif; ?>
 
 		<?php echo $this->loadTemplate('form'); ?>
 
-		<?php if ($presentation_style == 'sliders') : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.endSlide'); ?>
-		<?php elseif ($presentation_style == 'tabs') : ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
 	<?php endif; ?>
@@ -126,47 +126,47 @@
 	<?php endif; ?>
 
 	<?php if ($tparams->get('show_articles') && $this->contact->user_id && $this->contact->articles) : ?>
-		<?php if ($presentation_style == 'sliders') : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('JGLOBAL_ARTICLES'), 'display-articles'); ?>
-		<?php elseif ($presentation_style == 'tabs') : ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-articles', JText::_('JGLOBAL_ARTICLES')); ?>
-		<?php elseif ($presentation_style == 'plain') : ?>
+		<?php elseif ($presentation_style === 'plain') : ?>
 			<?php echo '<h3>' . JText::_('JGLOBAL_ARTICLES') . '</h3>'; ?>
 		<?php endif; ?>
 
 		<?php echo $this->loadTemplate('articles'); ?>
 
-		<?php if ($presentation_style == 'sliders') : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.endSlide'); ?>
-		<?php elseif ($presentation_style == 'tabs') : ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
 	<?php endif; ?>
 
 	<?php if ($tparams->get('show_profile') && $this->contact->user_id && JPluginHelper::isEnabled('user', 'profile')) : ?>
-		<?php if ($presentation_style == 'sliders') : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_PROFILE'), 'display-profile'); ?>
-		<?php elseif ($presentation_style == 'tabs') : ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-profile', JText::_('COM_CONTACT_PROFILE')); ?>
-		<?php elseif ($presentation_style == 'plain') : ?>
+		<?php elseif ($presentation_style === 'plain') : ?>
 			<?php echo '<h3>' . JText::_('COM_CONTACT_PROFILE') . '</h3>'; ?>
 		<?php endif; ?>
 
 		<?php echo $this->loadTemplate('profile'); ?>
 
-		<?php if ($presentation_style == 'sliders') : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.endSlide'); ?>
-		<?php elseif ($presentation_style == 'tabs') : ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
 	<?php endif; ?>
 
 	<?php if ($this->contact->misc && $tparams->get('show_misc')) : ?>
-		<?php if ($presentation_style == 'sliders') : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_OTHER_INFORMATION'), 'display-misc'); ?>
-		<?php elseif ($presentation_style == 'tabs') : ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-misc', JText::_('COM_CONTACT_OTHER_INFORMATION')); ?>
-		<?php elseif ($presentation_style == 'plain') : ?>
+		<?php elseif ($presentation_style === 'plain') : ?>
 			<?php echo '<h3>' . JText::_('COM_CONTACT_OTHER_INFORMATION') . '</h3>'; ?>
 		<?php endif; ?>
 
@@ -185,16 +185,16 @@
 			</dl>
 		</div>
 
-		<?php if ($presentation_style == 'sliders') : ?>
+		<?php if ($presentation_style === 'sliders') : ?>
 			<?php echo JHtml::_('bootstrap.endSlide'); ?>
-		<?php elseif ($presentation_style == 'tabs') : ?>
+		<?php elseif ($presentation_style === 'tabs') : ?>
 			<?php echo JHtml::_('bootstrap.endTab'); ?>
 		<?php endif; ?>
 	<?php endif; ?>
 
-	<?php if ($presentation_style == 'sliders') : ?>
+	<?php if ($presentation_style === 'sliders') : ?>
 		<?php echo JHtml::_('bootstrap.endAccordion'); ?>
-	<?php elseif ($presentation_style == 'tabs') : ?>
+	<?php elseif ($presentation_style === 'tabs') : ?>
 		<?php echo JHtml::_('bootstrap.endTabSet'); ?>
 	<?php endif; ?>
 
diff --git a/components/com_contact/views/contact/tmpl/default_links.php b/components/com_contact/views/contact/tmpl/default_links.php
index f2dd74c0dfe3e..8f7ecddb9171b 100644
--- a/components/com_contact/views/contact/tmpl/default_links.php
+++ b/components/com_contact/views/contact/tmpl/default_links.php
@@ -10,13 +10,13 @@
 defined('_JEXEC') or die;
 ?>
 
-<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
+<?php if ($this->params->get('presentation_style') === 'sliders') : ?>
 	<?php echo JHtml::_('bootstrap.addSlide', 'slide-contact', JText::_('COM_CONTACT_LINKS'), 'display-links'); ?>
 <?php endif; ?>
-<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
+<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
 	<?php echo JHtml::_('bootstrap.addTab', 'myTab', 'display-links', JText::_('COM_CONTACT_LINKS')); ?>
 <?php endif; ?>
-<?php if ($this->params->get('presentation_style') == 'plain'):?>
+<?php if ($this->params->get('presentation_style') === 'plain'):?>
 	<?php echo '<h3>' . JText::_('COM_CONTACT_LINKS') . '</h3>';  ?>
 <?php endif; ?>
 
@@ -47,9 +47,9 @@
 	</ul>
 </div>
 
-<?php if ($this->params->get('presentation_style') == 'sliders') : ?>
+<?php if ($this->params->get('presentation_style') === 'sliders') : ?>
 	<?php echo JHtml::_('bootstrap.endSlide'); ?>
 <?php endif; ?>
-<?php if ($this->params->get('presentation_style') == 'tabs') : ?>
+<?php if ($this->params->get('presentation_style') === 'tabs') : ?>
 	<?php echo JHtml::_('bootstrap.endTab'); ?>
 <?php endif; ?>
diff --git a/components/com_contact/views/contact/tmpl/default_profile.php b/components/com_contact/views/contact/tmpl/default_profile.php
index 650af2c79d929..03c59558edb05 100644
--- a/components/com_contact/views/contact/tmpl/default_profile.php
+++ b/components/com_contact/views/contact/tmpl/default_profile.php
@@ -22,7 +22,7 @@
 						case 'profile_website':
 							$v_http = substr($profile->value, 0, 4);
 
-							if ($v_http == 'http') :
+							if ($v_http === 'http') :
 								echo '<dd><a href="' . $profile->text . '">' . JStringPunycode::urlToUTF8($profile->text) . '</a></dd>';
 							else :
 								echo '<dd><a href="http://' . $profile->text . '">' . JStringPunycode::urlToUTF8($profile->text) . '</a></dd>';
diff --git a/components/com_contact/views/contact/view.html.php b/components/com_contact/views/contact/view.html.php
index f0c8f336bf0a6..fc23735bc935a 100644
--- a/components/com_contact/views/contact/view.html.php
+++ b/components/com_contact/views/contact/view.html.php
@@ -344,7 +344,7 @@ protected function _prepareDocument()
 		$id = (int) @$menu->query['id'];
 
 		// If the menu item does not concern this contact
-		if ($menu && ($menu->query['option'] != 'com_contact' || $menu->query['view'] != 'contact' || $id != $this->item->id))
+		if ($menu && ($menu->query['option'] !== 'com_contact' || $menu->query['view'] !== 'contact' || $id != $this->item->id))
 		{
 			// If this is not a single contact menu item, set the page title to the contact title
 			if ($this->item->name)
@@ -355,7 +355,7 @@ protected function _prepareDocument()
 			$path = array(array('title' => $this->contact->name, 'link' => ''));
 			$category = JCategories::getInstance('Contact')->get($this->contact->catid);
 
-			while ($category && ($menu->query['option'] != 'com_contact' || $menu->query['view'] == 'contact' || $id != $category->id) && $category->id > 1)
+			while ($category && ($menu->query['option'] !== 'com_contact' || $menu->query['view'] === 'contact' || $id != $category->id) && $category->id > 1)
 			{
 				$path[] = array('title' => $category->title, 'link' => ContactHelperRoute::getCategoryRoute($this->contact->catid));
 				$category = $category->getParent();
diff --git a/components/com_content/controller.php b/components/com_content/controller.php
index ae86b40a271b4..efaf6c087d4ca 100644
--- a/components/com_content/controller.php
+++ b/components/com_content/controller.php
@@ -70,8 +70,8 @@ public function display($cachable = false, $urlparams = false)
 		$user = JFactory::getUser();
 
 		if ($user->get('id')
-			|| ($this->input->getMethod() == 'POST'
-			&& (($vName == 'category' && $this->input->get('layout') != 'blog') || $vName == 'archive' )))
+			|| ($this->input->getMethod() === 'POST'
+			&& (($vName === 'category' && $this->input->get('layout') !== 'blog') || $vName === 'archive' )))
 		{
 			$cachable = false;
 		}
@@ -95,13 +95,13 @@ public function display($cachable = false, $urlparams = false)
 			'Itemid' => 'INT');
 
 		// Check for edit form.
-		if ($vName == 'form' && !$this->checkEditId('com_content.edit.article', $id))
+		if ($vName === 'form' && !$this->checkEditId('com_content.edit.article', $id))
 		{
 			// Somehow the person just went to the form - we don't allow that.
 			return JError::raiseError(403, JText::sprintf('JLIB_APPLICATION_ERROR_UNHELD_ID', $id));
 		}
 
-		if ($vName == 'article')
+		if ($vName === 'article')
 		{
 			// Get/Create the model
 			if ($model = $this->getModel($vName))
diff --git a/components/com_content/helpers/association.php b/components/com_content/helpers/association.php
index 5a5c87387914d..bea3aca6295b8 100644
--- a/components/com_content/helpers/association.php
+++ b/components/com_content/helpers/association.php
@@ -36,7 +36,7 @@ public static function getAssociations($id = 0, $view = null)
 		$view   = $view === null ? $jinput->get('view') : $view;
 		$id     = empty($id) ? $jinput->getInt('id') : $id;
 
-		if ($view == 'article')
+		if ($view === 'article')
 		{
 			if ($id)
 			{
@@ -53,7 +53,7 @@ public static function getAssociations($id = 0, $view = null)
 			}
 		}
 
-		if ($view == 'category' || $view == 'categories')
+		if ($view === 'category' || $view === 'categories')
 		{
 			return self::getCategoryAssociations($id, 'com_content');
 		}
diff --git a/components/com_content/helpers/route.php b/components/com_content/helpers/route.php
index a2317a7d8de44..be3434a5f7681 100644
--- a/components/com_content/helpers/route.php
+++ b/components/com_content/helpers/route.php
@@ -51,7 +51,7 @@ public static function getArticleRoute($id, $catid = 0, $language = 0)
 			}
 		}
 
-		if ($language && $language != '*' && JLanguageMultilang::isEnabled())
+		if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
 		{
 			$link .= '&lang=' . $language;
 			$needles['language'] = $language;
@@ -100,7 +100,7 @@ public static function getCategoryRoute($catid, $language = 0)
 			$needles['category']   = $catids;
 			$needles['categories'] = $catids;
 
-			if ($language && $language != '*' && JLanguageMultilang::isEnabled())
+			if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
 			{
 				$link .= '&lang=' . $language;
 				$needles['language'] = $language;
@@ -164,7 +164,7 @@ protected static function _findItem($needles = null)
 			$attributes = array('component_id');
 			$values     = array($component->id);
 
-			if ($language != '*')
+			if ($language !== '*')
 			{
 				$attributes[] = 'language';
 				$values[]     = array($needles['language'], '*');
@@ -190,7 +190,7 @@ protected static function _findItem($needles = null)
 						 * language != * can override existing entries
 						 * language == * cannot override existing entries
 						 */
-						if ($item->language != '*' || !isset(self::$lookup[$language][$view][$item->query['id']]))
+						if ($item->language !== '*' || !isset(self::$lookup[$language][$view][$item->query['id']]))
 						{
 							self::$lookup[$language][$view][$item->query['id']] = $item->id;
 						}
@@ -220,8 +220,8 @@ protected static function _findItem($needles = null)
 		$active = $menus->getActive();
 
 		if ($active
-			&& $active->component == 'com_content'
-			&& ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
+			&& $active->component === 'com_content'
+			&& ($language === '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
 		{
 			return $active->id;
 		}
diff --git a/components/com_content/models/articles.php b/components/com_content/models/articles.php
index bbce74cf4fcf6..813e81a0541e0 100644
--- a/components/com_content/models/articles.php
+++ b/components/com_content/models/articles.php
@@ -224,7 +224,7 @@ protected function getListQuery()
 		// Join over the frontpage articles if required.
 		if ($this->getState('filter.frontpage'))
 		{
-			if ($orderby_sec == 'front')
+			if ($orderby_sec === 'front')
 			{
 				$query->join('INNER', '#__content_frontpage AS fp ON fp.content_id = a.id');
 			}
@@ -233,7 +233,7 @@ protected function getListQuery()
 				$query->where('a.featured = 1');
 			}
 		}
-		elseif ($orderby_sec == 'front' || $this->getState('list.ordering') == 'fp.ordering')
+		elseif ($orderby_sec === 'front' || $this->getState('list.ordering') === 'fp.ordering')
 		{
 			$query->join('LEFT', '#__content_frontpage AS fp ON fp.content_id = a.id');
 		}
@@ -498,7 +498,7 @@ protected function getListQuery()
 		}
 
 		// Process the filter for list views with user-entered filters
-		if (is_object($params) && ($params->get('filter_field') != 'hide') && ($filter = $this->getState('list.filter')))
+		if (is_object($params) && ($params->get('filter_field') !== 'hide') && ($filter = $this->getState('list.filter')))
 		{
 			// Clean filter variable
 			$filter = JString::strtolower($filter);
@@ -587,8 +587,8 @@ public function getItems()
 			/*For blogs, article params override menu item params only if menu param = 'use_article'
 			Otherwise, menu item params control the layout
 			If menu item is 'use_article' and there is no article param, use global*/
-			if (($input->getString('layout') == 'blog') || ($input->getString('view') == 'featured')
-				|| ($this->getState('params')->get('layout_type') == 'blog'))
+			if (($input->getString('layout') === 'blog') || ($input->getString('view') === 'featured')
+				|| ($this->getState('params')->get('layout_type') === 'blog'))
 			{
 				// Create an array of just the params set to 'use_article'
 				$menuParamsArray = $this->getState('params')->toArray();
diff --git a/components/com_content/models/category.php b/components/com_content/models/category.php
index a47b0b38e4bbf..a2035f7d10160 100644
--- a/components/com_content/models/category.php
+++ b/components/com_content/models/category.php
@@ -187,7 +187,7 @@ protected function populateState($ordering = null, $direction = null)
 		$this->setState('list.start', $app->input->get('limitstart', 0, 'uint'));
 
 		// Set limit for query. If list, use parameter. If blog, add blog parameters for limit.
-		if (($app->input->get('layout') == 'blog') || $params->get('layout_type') == 'blog')
+		if (($app->input->get('layout') === 'blog') || $params->get('layout_type') === 'blog')
 		{
 			$limit = $params->get('num_leading_articles') + $params->get('num_intro_articles') + $params->get('num_links');
 			$this->setState('list.links', $params->get('num_links'));
@@ -458,9 +458,9 @@ public function &getChildren()
 			$params = $this->getState()->get('params');
 
 			$orderByPri = $params->get('orderby_pri');
-			if ($orderByPri == 'alpha' || $orderByPri == 'ralpha')
+			if ($orderByPri === 'alpha' || $orderByPri === 'ralpha')
 			{
-				$this->_children = ArrayHelper::sortObjects($this->_children, 'title', ($params->get('orderby_pri') == 'alpha') ? 1 : (-1));
+				$this->_children = ArrayHelper::sortObjects($this->_children, 'title', ($params->get('orderby_pri') === 'alpha') ? 1 : (-1));
 			}
 		}
 
diff --git a/components/com_content/router.php b/components/com_content/router.php
index 98aab9a3680a5..1dc9e49baab52 100644
--- a/components/com_content/router.php
+++ b/components/com_content/router.php
@@ -52,7 +52,7 @@ public function build(&$query)
 		}
 
 		// Check again
-		if ($menuItemGiven && isset($menuItem) && $menuItem->component != 'com_content')
+		if ($menuItemGiven && isset($menuItem) && $menuItem->component !== 'com_content')
 		{
 			$menuItemGiven = false;
 			unset($query['Itemid']);
@@ -91,7 +91,7 @@ public function build(&$query)
 			return $segments;
 		}
 
-		if ($view == 'category' || $view == 'article')
+		if ($view === 'category' || $view === 'article')
 		{
 			if (!$menuItemGiven)
 			{
@@ -100,7 +100,7 @@ public function build(&$query)
 
 			unset($query['view']);
 
-			if ($view == 'article')
+			if ($view === 'article')
 			{
 				if (isset($query['id'], $query['catid']) && $query['catid'])
 				{
@@ -181,7 +181,7 @@ public function build(&$query)
 
 			$segments = array_merge($segments, $array);
 
-			if ($view == 'article')
+			if ($view === 'article')
 			{
 				if ($advanced)
 				{
@@ -198,9 +198,9 @@ public function build(&$query)
 			unset($query['id'], $query['catid']);
 		}
 
-		if ($view == 'archive')
+		if ($view === 'archive')
 		{
-			if (!$menuItemGiven || $menuItem->query['view'] != 'archive')
+			if (!$menuItemGiven || $menuItem->query['view'] !== 'archive')
 			{
 				// Did not work without removing Itemid
 				if (isset($menuItem))
@@ -226,7 +226,7 @@ public function build(&$query)
 			}
 		}
 
-		if ($view == 'featured')
+		if ($view === 'featured')
 		{
 			if (!$menuItemGiven)
 			{
@@ -251,7 +251,7 @@ public function build(&$query)
 			}
 			else
 			{
-				if ($query['layout'] == 'default')
+				if ($query['layout'] === 'default')
 				{
 					unset($query['layout']);
 				}
@@ -305,7 +305,7 @@ public function parse(&$segments)
 			$vars['view'] = $segments[0];
 
 			// Called if no menu item created
-			if ($vars['view'] == 'archive')
+			if ($vars['view'] === 'archive')
 			{
 				$vars['year']  = $count >= 2 ? $segments[$count - 2] : null;
 				$vars['month'] = $segments[$count - 1];
diff --git a/components/com_content/views/archive/tmpl/default.php b/components/com_content/views/archive/tmpl/default.php
index f14093209c2e8..252e8710cbc78 100644
--- a/components/com_content/views/archive/tmpl/default.php
+++ b/components/com_content/views/archive/tmpl/default.php
@@ -24,7 +24,7 @@
 <form id="adminForm" action="<?php echo JRoute::_('index.php')?>" method="post" class="form-inline">
 	<fieldset class="filters">
 	<div class="filter-search">
-		<?php if ($this->params->get('filter_field') != 'hide') : ?>
+		<?php if ($this->params->get('filter_field') !== 'hide') : ?>
 		<label class="filter-search-lbl element-invisible" for="filter-search"><?php echo JText::_('COM_CONTENT_TITLE_FILTER_LABEL') . '&#160;'; ?></label>
 		<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->filter); ?>" class="inputbox span2" onchange="document.getElementById('adminForm').submit();" placeholder="<?php echo JText::_('COM_CONTENT_TITLE_FILTER_LABEL'); ?>" />
 		<?php endif; ?>
diff --git a/components/com_content/views/archive/view.html.php b/components/com_content/views/archive/view.html.php
index 22f57456fda84..cb76db1fddfd9 100644
--- a/components/com_content/views/archive/view.html.php
+++ b/components/com_content/views/archive/view.html.php
@@ -49,7 +49,7 @@ public function display($tpl = null)
 			$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
 
 			// No link for ROOT category
-			if ($item->parent_alias == 'root')
+			if ($item->parent_alias === 'root')
 			{
 				$item->parent_slug = null;
 			}
diff --git a/components/com_content/views/article/view.html.php b/components/com_content/views/article/view.html.php
index 0a5e1aeb4b872..5c04b0754925f 100644
--- a/components/com_content/views/article/view.html.php
+++ b/components/com_content/views/article/view.html.php
@@ -62,7 +62,7 @@ public function display($tpl = null)
 		$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
 
 		// No link for ROOT category
-		if ($item->parent_alias == 'root')
+		if ($item->parent_alias === 'root')
 		{
 			$item->parent_slug = null;
 		}
@@ -208,7 +208,7 @@ protected function _prepareDocument()
 		$id = (int) @$menu->query['id'];
 
 		// If the menu item does not concern this article
-		if ($menu && ($menu->query['option'] != 'com_content' || $menu->query['view'] != 'article' || $id != $this->item->id))
+		if ($menu && ($menu->query['option'] !== 'com_content' || $menu->query['view'] !== 'article' || $id != $this->item->id))
 		{
 			// If this is not a single article menu item, set the page title to the article title
 			if ($this->item->title)
@@ -219,7 +219,7 @@ protected function _prepareDocument()
 			$path     = array(array('title' => $this->item->title, 'link' => ''));
 			$category = JCategories::getInstance('Content')->get($this->item->catid);
 
-			while ($category && ($menu->query['option'] != 'com_content' || $menu->query['view'] == 'article' || $id != $category->id) && $category->id > 1)
+			while ($category && ($menu->query['option'] !== 'com_content' || $menu->query['view'] === 'article' || $id != $category->id) && $category->id > 1)
 			{
 				$path[]   = array('title' => $category->title, 'link' => ContentHelperRoute::getCategoryRoute($category->id));
 				$category = $category->getParent();
diff --git a/components/com_content/views/category/tmpl/default_articles.php b/components/com_content/views/category/tmpl/default_articles.php
index 7f032315e674f..3fdc27954199a 100644
--- a/components/com_content/views/category/tmpl/default_articles.php
+++ b/components/com_content/views/category/tmpl/default_articles.php
@@ -34,11 +34,11 @@
 ?>
 
 <form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
-<?php if ($this->params->get('show_headings') || $this->params->get('filter_field') != 'hide' || $this->params->get('show_pagination_limit')) :?>
+<?php if ($this->params->get('show_headings') || $this->params->get('filter_field') !== 'hide' || $this->params->get('show_pagination_limit')) :?>
 	<fieldset class="filters btn-toolbar clearfix">
-		<?php if ($this->params->get('filter_field') != 'hide') :?>
+		<?php if ($this->params->get('filter_field') !== 'hide') :?>
 			<div class="btn-group">
-				<?php if ($this->params->get('filter_field') != 'tag') :?>
+				<?php if ($this->params->get('filter_field') !== 'tag') :?>
 					<label class="filter-search-lbl element-invisible" for="filter-search">
 						<?php echo JText::_('COM_CONTENT_' . $this->params->get('filter_field') . '_FILTER_LABEL') . '&#160;'; ?>
 					</label>
@@ -98,11 +98,11 @@
 				</th>
 				<?php if ($date = $this->params->get('list_show_date')) : ?>
 					<th id="categorylist_header_date">
-						<?php if ($date == 'created') : ?>
+						<?php if ($date === 'created') : ?>
 							<?php echo JHtml::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.created', $listDirn, $listOrder); ?>
-						<?php elseif ($date == 'modified') : ?>
+						<?php elseif ($date === 'modified') : ?>
 							<?php echo JHtml::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.modified', $listDirn, $listOrder); ?>
-						<?php elseif ($date == 'published') : ?>
+						<?php elseif ($date === 'published') : ?>
 							<?php echo JHtml::_('grid.sort', 'COM_CONTENT_' . $date . '_DATE', 'a.publish_up', $listDirn, $listOrder); ?>
 						<?php endif; ?>
 					</th>
diff --git a/components/com_content/views/category/view.html.php b/components/com_content/views/category/view.html.php
index 0067cc262b978..1e56c16a6e7b4 100644
--- a/components/com_content/views/category/view.html.php
+++ b/components/com_content/views/category/view.html.php
@@ -86,7 +86,7 @@ public function display($tpl = null)
 			$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
 
 			// No link for ROOT category
-			if ($item->parent_alias == 'root')
+			if ($item->parent_alias === 'root')
 			{
 				$item->parent_slug = null;
 			}
@@ -143,7 +143,7 @@ public function display($tpl = null)
 
 		// For blog layouts, preprocess the breakdown of leading, intro and linked articles.
 		// This makes it much easier for the designer to just interrogate the arrays.
-		if (($params->get('layout_type') == 'blog') || ($this->getLayout() == 'blog'))
+		if (($params->get('layout_type') === 'blog') || ($this->getLayout() === 'blog'))
 		{
 			foreach ($this->items as $i => $item)
 			{
@@ -269,12 +269,12 @@ protected function prepareDocument()
 		$menu = $this->menu;
 		$id = (int) @$menu->query['id'];
 
-		if ($menu && ($menu->query['option'] != 'com_content' || $menu->query['view'] == 'article' || $id != $this->category->id))
+		if ($menu && ($menu->query['option'] !== 'com_content' || $menu->query['view'] === 'article' || $id != $this->category->id))
 		{
 			$path = array(array('title' => $this->category->title, 'link' => ''));
 			$category = $this->category->getParent();
 
-			while (($menu->query['option'] != 'com_content' || $menu->query['view'] == 'article' || $id != $category->id) && $category->id > 1)
+			while (($menu->query['option'] !== 'com_content' || $menu->query['view'] === 'article' || $id != $category->id) && $category->id > 1)
 			{
 				$path[] = array('title' => $category->title, 'link' => ContentHelperRoute::getCategoryRoute($category->id));
 				$category = $category->getParent();
diff --git a/components/com_content/views/featured/view.feed.php b/components/com_content/views/featured/view.feed.php
index 9d27d6bdf3abf..ebaad38fb7acc 100644
--- a/components/com_content/views/featured/view.feed.php
+++ b/components/com_content/views/featured/view.feed.php
@@ -83,7 +83,7 @@ public function display($tpl = null)
 
 			$item->author = $author;
 
-			if ($feedEmail == 'site')
+			if ($feedEmail === 'site')
 			{
 				$item->authorEmail = $siteEmail;
 			}
diff --git a/components/com_content/views/featured/view.html.php b/components/com_content/views/featured/view.html.php
index f2df737c4d7d2..c2838e0cbd27e 100644
--- a/components/com_content/views/featured/view.html.php
+++ b/components/com_content/views/featured/view.html.php
@@ -79,7 +79,7 @@ public function display($tpl = null)
 			$item->parent_slug = $item->parent_alias ? ($item->parent_id . ':' . $item->parent_alias) : $item->parent_id;
 
 			// No link for ROOT category
-			if ($item->parent_alias == 'root')
+			if ($item->parent_alias === 'root')
 			{
 				$item->parent_slug = null;
 			}
diff --git a/components/com_newsfeeds/controller.php b/components/com_newsfeeds/controller.php
index 910094bad49af..8492692e44d08 100644
--- a/components/com_newsfeeds/controller.php
+++ b/components/com_newsfeeds/controller.php
@@ -36,7 +36,7 @@ public function display($cachable = false, $urlparams = false)
 
 		$user = JFactory::getUser();
 
-		if ($user->get('id') || ($this->input->getMethod() == 'POST' && $vName == 'category' ))
+		if ($user->get('id') || ($this->input->getMethod() === 'POST' && $vName === 'category' ))
 		{
 			$cachable = false;
 		}
diff --git a/components/com_newsfeeds/helpers/association.php b/components/com_newsfeeds/helpers/association.php
index b70b15172062f..4c60e0f3815cf 100644
--- a/components/com_newsfeeds/helpers/association.php
+++ b/components/com_newsfeeds/helpers/association.php
@@ -36,7 +36,7 @@ public static function getAssociations($id = 0, $view = null)
 		$view   = $view === null ? $jinput->get('view') : $view;
 		$id     = empty($id) ? $jinput->getInt('id') : $id;
 
-		if ($view == 'newsfeed')
+		if ($view === 'newsfeed')
 		{
 			if ($id)
 			{
@@ -53,7 +53,7 @@ public static function getAssociations($id = 0, $view = null)
 			}
 		}
 
-		if ($view == 'category' || $view == 'categories')
+		if ($view === 'category' || $view === 'categories')
 		{
 			return self::getCategoryAssociations($id, 'com_newsfeeds');
 		}
diff --git a/components/com_newsfeeds/helpers/route.php b/components/com_newsfeeds/helpers/route.php
index 3137902c72819..9ecfeedb76710 100644
--- a/components/com_newsfeeds/helpers/route.php
+++ b/components/com_newsfeeds/helpers/route.php
@@ -50,7 +50,7 @@ public static function getNewsfeedRoute($id, $catid, $language = 0)
 			}
 		}
 
-		if ($language && $language != '*' && JLanguageMultilang::isEnabled())
+		if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
 		{
 			$link .= '&lang=' . $language;
 			$needles['language'] = $language;
@@ -100,7 +100,7 @@ public static function getCategoryRoute($catid, $language = 0)
 			$needles['category'] = $catids;
 			$needles['categories'] = $catids;
 
-			if ($language && $language != '*' && JLanguageMultilang::isEnabled())
+			if ($language && $language !== '*' && JLanguageMultilang::isEnabled())
 			{
 				$link .= '&lang=' . $language;
 				$needles['language'] = $language;
@@ -140,7 +140,7 @@ protected static function _findItem($needles = null)
 			$attributes = array('component_id');
 			$values = array($component->id);
 
-			if ($language != '*')
+			if ($language !== '*')
 			{
 				$attributes[] = 'language';
 				$values[] = array($needles['language'], '*');
@@ -164,7 +164,7 @@ protected static function _findItem($needles = null)
 						/* Here it will become a bit tricky
 						 language != * can override existing entries
 						 language == * cannot override existing entries */
-						if ($item->language != '*' || !isset(self::$lookup[$language][$view][$item->query['id']]))
+						if ($item->language !== '*' || !isset(self::$lookup[$language][$view][$item->query['id']]))
 						{
 							self::$lookup[$language][$view][$item->query['id']] = $item->id;
 						}
@@ -193,7 +193,7 @@ protected static function _findItem($needles = null)
 		// Check if the active menuitem matches the requested language
 		$active = $menus->getActive();
 
-		if ($active && ($language == '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
+		if ($active && ($language === '*' || in_array($active->language, array('*', $language)) || !JLanguageMultilang::isEnabled()))
 		{
 			return $active->id;
 		}
diff --git a/components/com_newsfeeds/router.php b/components/com_newsfeeds/router.php
index b632e77715dc0..6826d46d739c2 100644
--- a/components/com_newsfeeds/router.php
+++ b/components/com_newsfeeds/router.php
@@ -49,7 +49,7 @@ public function build(&$query)
 		{
 			$view = $query['view'];
 
-			if (empty($query['Itemid']) || empty($menuItem) || $menuItem->component != 'com_newsfeeds')
+			if (empty($query['Itemid']) || empty($menuItem) || $menuItem->component !== 'com_newsfeeds')
 			{
 				$segments[] = $query['view'];
 			}
@@ -65,11 +65,11 @@ public function build(&$query)
 			return $segments;
 		}
 
-		if (isset($view) && ($view == 'category' || $view == 'newsfeed'))
+		if (isset($view) && ($view === 'category' || $view === 'newsfeed'))
 		{
 			if ($mView != $view || $mId != (int) $query['id'])
 			{
-				if ($view == 'newsfeed' && isset($query['catid']))
+				if ($view === 'newsfeed' && isset($query['catid']))
 				{
 					$catid = $query['catid'];
 				}
@@ -107,7 +107,7 @@ public function build(&$query)
 					$segments = array_merge($segments, array_reverse($array));
 				}
 
-				if ($view == 'newsfeed')
+				if ($view === 'newsfeed')
 				{
 					if ($advanced)
 					{
@@ -136,7 +136,7 @@ public function build(&$query)
 			}
 			else
 			{
-				if ($query['layout'] == 'default')
+				if ($query['layout'] === 'default')
 				{
 					unset($query['layout']);
 				}
diff --git a/components/com_newsfeeds/views/category/tmpl/default_items.php b/components/com_newsfeeds/views/category/tmpl/default_items.php
index 0c2dc5af749cf..33d096ce8f8db 100644
--- a/components/com_newsfeeds/views/category/tmpl/default_items.php
+++ b/components/com_newsfeeds/views/category/tmpl/default_items.php
@@ -20,9 +20,9 @@
 <?php else : ?>
 
 <form action="<?php echo htmlspecialchars(JUri::getInstance()->toString(), ENT_COMPAT, 'UTF-8'); ?>" method="post" name="adminForm" id="adminForm">
-	<?php if ((($this->params->get('filter_field') != 'hide') || ($this->params->get('filter_field') != '0')) || $this->params->get('show_pagination_limit')) :?>
+	<?php if ((($this->params->get('filter_field') !== 'hide') || ($this->params->get('filter_field') != '0')) || $this->params->get('show_pagination_limit')) :?>
 	<fieldset class="filters btn-toolbar">
-		<?php if (($this->params->get('filter_field') != 'hide') || ($this->params->get('filter_field') != '0')) :?>
+		<?php if (($this->params->get('filter_field') !== 'hide') || ($this->params->get('filter_field') != '0')) :?>
 			<div class="btn-group">
 				<label class="filter-search-lbl element-invisible" for="filter-search"><span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span><?php echo JText::_('COM_NEWSFEEDS_FILTER_LABEL') . '&#160;'; ?></label>
 				<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_NEWSFEEDS_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_NEWSFEEDS_FILTER_SEARCH_DESC'); ?>" />
diff --git a/components/com_newsfeeds/views/category/view.html.php b/components/com_newsfeeds/views/category/view.html.php
index 1fbd85f4d6771..5ef32de72d398 100644
--- a/components/com_newsfeeds/views/category/view.html.php
+++ b/components/com_newsfeeds/views/category/view.html.php
@@ -74,12 +74,12 @@ protected function prepareDocument()
 
 		$menu = $this->menu;
 
-		if ($menu && ($menu->query['option'] != 'com_newsfeeds' || $menu->query['view'] == 'newsfeed' || $id != $this->category->id))
+		if ($menu && ($menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed' || $id != $this->category->id))
 		{
 			$path = array(array('title' => $this->category->title, 'link' => ''));
 			$category = $this->category->getParent();
 
-			while (($menu->query['option'] != 'com_newsfeeds' || $menu->query['view'] == 'newsfeed' || $id != $category->id) && $category->id > 1)
+			while (($menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed' || $id != $category->id) && $category->id > 1)
 			{
 				$path[] = array('title' => $category->title, 'link' => NewsfeedsHelperRoute::getCategoryRoute($category->id));
 				$category = $category->getParent();
diff --git a/components/com_newsfeeds/views/newsfeed/view.html.php b/components/com_newsfeeds/views/newsfeed/view.html.php
index 12992e7ba8790..3700a803e1a2a 100644
--- a/components/com_newsfeeds/views/newsfeed/view.html.php
+++ b/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -177,7 +177,7 @@ public function display($tpl = null)
 
 		$feed_display_order = $params->get('feed_display_order', 'des');
 
-		if ($feed_display_order == 'asc')
+		if ($feed_display_order === 'asc')
 		{
 			$this->rssDoc->reverseItems();
 		}
@@ -242,7 +242,7 @@ protected function _prepareDocument()
 		$id = (int) @$menu->query['id'];
 
 		// If the menu item does not concern this newsfeed
-		if ($menu && ($menu->query['option'] != 'com_newsfeeds' || $menu->query['view'] != 'newsfeed' || $id != $this->item->id))
+		if ($menu && ($menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] !== 'newsfeed' || $id != $this->item->id))
 		{
 			// If this is not a single newsfeed menu item, set the page title to the newsfeed title
 			if ($this->item->name)
@@ -253,7 +253,7 @@ protected function _prepareDocument()
 			$path = array(array('title' => $this->item->name, 'link' => ''));
 			$category = JCategories::getInstance('Newsfeeds')->get($this->item->catid);
 
-			while (($menu->query['option'] != 'com_newsfeeds' || $menu->query['view'] == 'newsfeed' || $id != $category->id) && $category->id > 1)
+			while (($menu->query['option'] !== 'com_newsfeeds' || $menu->query['view'] === 'newsfeed' || $id != $category->id) && $category->id > 1)
 			{
 				$path[] = array('title' => $category->title, 'link' => NewsfeedsHelperRoute::getCategoryRoute($category->id));
 				$category = $category->getParent();
diff --git a/components/com_search/controller.php b/components/com_search/controller.php
index 3dbef4959b111..c5fec47e1b5ee 100644
--- a/components/com_search/controller.php
+++ b/components/com_search/controller.php
@@ -48,7 +48,7 @@ public function search()
 		$searchword = trim(str_replace($badchars, '', $this->input->getString('searchword', null, 'post')));
 
 		// If searchword enclosed in double quotes, strip quotes and do exact match
-		if (substr($searchword, 0, 1) == '"' && substr($searchword, -1) == '"')
+		if (substr($searchword, 0, 1) === '"' && substr($searchword, -1) === '"')
 		{
 			$post['searchword'] = substr($searchword, 1, -1);
 			$this->input->set('searchphrase', 'exact');
@@ -86,7 +86,7 @@ public function search()
 		$item = $menu->getItem($post['Itemid']);
 
 		// The requested Item is not a search page so we need to find one
-		if ($item->component != 'com_search' || $item->query['view'] != 'search')
+		if ($item->component !== 'com_search' || $item->query['view'] !== 'search')
 		{
 			// Get item based on component, not link. link is not reliable.
 			$item = $menu->getItems('component', 'com_search', true);
diff --git a/components/com_search/views/search/view.html.php b/components/com_search/views/search/view.html.php
index 8f75ab095c84d..655d7a4267620 100644
--- a/components/com_search/views/search/view.html.php
+++ b/components/com_search/views/search/view.html.php
@@ -146,7 +146,7 @@ public function display($tpl = null)
 			{
 				$row = & $results[$i]->text;
 
-				if ($state->get('match') == 'exact')
+				if ($state->get('match') === 'exact')
 				{
 					$searchwords = array($searchword);
 					$needle      = $searchword;
diff --git a/components/com_tags/controller.php b/components/com_tags/controller.php
index 4aaed0864c0aa..b6f7396353fc0 100644
--- a/components/com_tags/controller.php
+++ b/components/com_tags/controller.php
@@ -34,7 +34,7 @@ public function display($cachable = false, $urlparams = false)
 		$vName = $this->input->get('view', 'tags');
 		$this->input->set('view', $vName);
 
-		if ($user->get('id') || ($this->input->getMethod() == 'POST' && $vName == 'tags'))
+		if ($user->get('id') || ($this->input->getMethod() === 'POST' && $vName === 'tags'))
 		{
 			$cachable = false;
 		}
diff --git a/components/com_tags/helpers/route.php b/components/com_tags/helpers/route.php
index 9a1b4ecadf4d4..922fd2c55c61a 100644
--- a/components/com_tags/helpers/route.php
+++ b/components/com_tags/helpers/route.php
@@ -46,7 +46,7 @@ public static function getItemRoute($contentItemId, $contentItemAlias, $contentC
 
 			if (class_exists($routerClass) && method_exists($routerClass, $routerMethod))
 			{
-				if ($routerMethod == 'getCategoryRoute')
+				if ($routerMethod === 'getCategoryRoute')
 				{
 					$link = $routerClass::$routerMethod($contentItemId, $language);
 				}
diff --git a/components/com_tags/models/tag.php b/components/com_tags/models/tag.php
index 0aace06090231..0d5b749673fb9 100644
--- a/components/com_tags/models/tag.php
+++ b/components/com_tags/models/tag.php
@@ -204,7 +204,7 @@ protected function populateState($ordering = 'c.core_title', $direction = 'ASC')
 		// List state information
 		$format = $app->input->getWord('format');
 
-		if ($format == 'feed')
+		if ($format === 'feed')
 		{
 			$limit = $app->get('feed_limit');
 		}
diff --git a/components/com_tags/models/tags.php b/components/com_tags/models/tags.php
index e10c7953d8c57..50c4ce668b08b 100644
--- a/components/com_tags/models/tags.php
+++ b/components/com_tags/models/tags.php
@@ -143,9 +143,9 @@ protected function getListQuery()
 			$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 = JHelperContent::getCurrentLanguage();
 			}
@@ -156,7 +156,7 @@ protected function getListQuery()
 		// List state information
 		$format = $app->input->getWord('format');
 
-		if ($format == 'feed')
+		if ($format === 'feed')
 		{
 			$limit = $app->get('feed_limit');
 		}
diff --git a/components/com_tags/router.php b/components/com_tags/router.php
index 995c0f4d579f8..643b9e8362370 100644
--- a/components/com_tags/router.php
+++ b/components/com_tags/router.php
@@ -74,7 +74,7 @@ public function build(&$query)
 			return $segments;
 		}
 
-		if ($view == 'tag')
+		if ($view === 'tag')
 		{
 			$notActiveTag = is_array($mId) ? (count($mId) > 1 || $mId[0] != (int) $query['id']) : ($mId != (int) $query['id']);
 
@@ -92,7 +92,7 @@ public function build(&$query)
 		{
 			if ((!empty($query['Itemid']) && isset($menuItem->query['layout'])
 				&& $query['layout'] == $menuItem->query['layout'])
-				|| $query['layout'] == 'default')
+				|| $query['layout'] === 'default')
 			{
 				unset($query['layout']);
 			}
diff --git a/components/com_tags/views/tag/tmpl/default_items.php b/components/com_tags/views/tag/tmpl/default_items.php
index 13cf7bfbd99a1..bdeb7570f1e9a 100644
--- a/components/com_tags/views/tag/tmpl/default_items.php
+++ b/components/com_tags/views/tag/tmpl/default_items.php
@@ -74,7 +74,7 @@
 				<li class="system-unpublished cat-list-row<?php echo $i % 2; ?>">
 			<?php else: ?>
 				<li class="cat-list-row<?php echo $i % 2; ?> clearfix" >
-				<?php if (($item->type_alias == 'com_users.category') || ($item->type_alias == 'com_banners.category')) : ?>
+				<?php if (($item->type_alias === 'com_users.category') || ($item->type_alias === 'com_banners.category')) : ?>
 					<h3>
 						<?php echo $this->escape($item->core_title); ?>
 					</h3>
diff --git a/components/com_tags/views/tag/tmpl/list_items.php b/components/com_tags/views/tag/tmpl/list_items.php
index 5214e99cc715b..ec43f77d1d5dc 100644
--- a/components/com_tags/views/tag/tmpl/list_items.php
+++ b/components/com_tags/views/tag/tmpl/list_items.php
@@ -68,11 +68,11 @@
 					</th>
 					<?php if ($date = $this->params->get('tag_list_show_date')) : ?>
 						<th id="categorylist_header_date">
-							<?php if ($date == 'created') : ?>
+							<?php if ($date === 'created') : ?>
 								<?php echo JHtml::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_created_time', $listDirn, $listOrder); ?>
-							<?php elseif ($date == 'modified') : ?>
+							<?php elseif ($date === 'modified') : ?>
 								<?php echo JHtml::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_modified_time', $listDirn, $listOrder); ?>
-							<?php elseif ($date == 'published') : ?>
+							<?php elseif ($date === 'published') : ?>
 								<?php echo JHtml::_('grid.sort', 'COM_TAGS_' . $date . '_DATE', 'c.core_publish_up', $listDirn, $listOrder); ?>
 							<?php endif; ?>
 						</th>
diff --git a/components/com_tags/views/tag/view.feed.php b/components/com_tags/views/tag/view.feed.php
index e3199b329cc02..a59559405e39a 100644
--- a/components/com_tags/views/tag/view.feed.php
+++ b/components/com_tags/views/tag/view.feed.php
@@ -35,7 +35,7 @@ public function display($tpl = null)
 		$feedEmail        = $app->get('feed_email', 'none');
 		$document->editor = $fromName;
 
-		if ($feedEmail != 'none')
+		if ($feedEmail !== 'none')
 		{
 			$document->editorEmail = $siteEmail;
 		}
@@ -69,7 +69,7 @@ public function display($tpl = null)
 				$feeditem->category    = $title;
 				$feeditem->author      = $author;
 
-				if ($feedEmail == 'site')
+				if ($feedEmail === 'site')
 				{
 					$item->authorEmail = $siteEmail;
 				}
diff --git a/components/com_tags/views/tag/view.html.php b/components/com_tags/views/tag/view.html.php
index 4cb25a0b06d98..727305553ab9e 100644
--- a/components/com_tags/views/tag/view.html.php
+++ b/components/com_tags/views/tag/view.html.php
@@ -211,7 +211,7 @@ protected function _prepareDocument()
 			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
 			$title = $this->params->get('page_title', $menu->title);
 
-			if ($menu->query['option'] != 'com_tags')
+			if ($menu->query['option'] !== 'com_tags')
 			{
 				$this->params->set('page_subheading', $menu->title);
 			}
diff --git a/components/com_tags/views/tags/view.feed.php b/components/com_tags/views/tags/view.feed.php
index 2242b4a115913..c15f9b4ab69e1 100644
--- a/components/com_tags/views/tags/view.feed.php
+++ b/components/com_tags/views/tags/view.feed.php
@@ -35,7 +35,7 @@ public function display($tpl = null)
 		$feedEmail        = $app->get('feed_email', 'none');
 		$document->editor = $fromName;
 
-		if ($feedEmail != 'none')
+		if ($feedEmail !== 'none')
 		{
 			$document->editorEmail = $siteEmail;
 		}
@@ -63,7 +63,7 @@ public function display($tpl = null)
 			$feeditem->category    = 'All Tags';
 			$feeditem->author      = $author;
 
-			if ($feedEmail == 'site')
+			if ($feedEmail === 'site')
 			{
 				$item->authorEmail = $siteEmail;
 			}
diff --git a/components/com_tags/views/tags/view.html.php b/components/com_tags/views/tags/view.html.php
index 082465869c962..f7f8222bfe563 100644
--- a/components/com_tags/views/tags/view.html.php
+++ b/components/com_tags/views/tags/view.html.php
@@ -166,7 +166,7 @@ protected function _prepareDocument()
 			$this->params->def('page_heading', JText::_('COM_TAGS_DEFAULT_PAGE_TITLE'));
 		}
 
-		if ($menu && ($menu->query['option'] != 'com_tags'))
+		if ($menu && ($menu->query['option'] !== 'com_tags'))
 		{
 			$this->params->set('page_subheading', $menu->title);
 		}
diff --git a/components/com_users/models/profile.php b/components/com_users/models/profile.php
index 56ba57c7633d0..2e50ba9335881 100644
--- a/components/com_users/models/profile.php
+++ b/components/com_users/models/profile.php
@@ -341,7 +341,7 @@ public function save($data)
 			// Get the current One Time Password (two factor auth) configuration
 			$otpConfig = $model->getOtpConfig($userId);
 
-			if ($twoFactorMethod != 'none')
+			if ($twoFactorMethod !== 'none')
 			{
 				// Run the plugins
 				FOFPlatform::getInstance()->importPlugin('twofactorauth');
diff --git a/components/com_users/router.php b/components/com_users/router.php
index 082b73e90532a..a6f96592e1b6a 100644
--- a/components/com_users/router.php
+++ b/components/com_users/router.php
@@ -49,37 +49,37 @@ public function build(&$query)
 			for ($i = 0, $n = count($items); $i < $n; $i++)
 			{
 				// Check to see if we have found the resend menu item.
-				if (empty($resend) && !empty($items[$i]->query['view']) && ($items[$i]->query['view'] == 'resend'))
+				if (empty($resend) && !empty($items[$i]->query['view']) && ($items[$i]->query['view'] === 'resend'))
 				{
 					$resend = $items[$i]->id;
 				}
 
 				// Check to see if we have found the reset menu item.
-				if (empty($reset) && !empty($items[$i]->query['view']) && ($items[$i]->query['view'] == 'reset'))
+				if (empty($reset) && !empty($items[$i]->query['view']) && ($items[$i]->query['view'] === 'reset'))
 				{
 					$reset = $items[$i]->id;
 				}
 
 				// Check to see if we have found the remind menu item.
-				if (empty($remind) && !empty($items[$i]->query['view']) && ($items[$i]->query['view'] == 'remind'))
+				if (empty($remind) && !empty($items[$i]->query['view']) && ($items[$i]->query['view'] === 'remind'))
 				{
 					$remind = $items[$i]->id;
 				}
 
 				// Check to see if we have found the login menu item.
-				if (empty($login) && !empty($items[$i]->query['view']) && ($items[$i]->query['view'] == 'login'))
+				if (empty($login) && !empty($items[$i]->query['view']) && ($items[$i]->query['view'] === 'login'))
 				{
 					$login = $items[$i]->id;
 				}
 
 				// Check to see if we have found the registration menu item.
-				if (empty($registration) && !empty($items[$i]->query['view']) && ($items[$i]->query['view'] == 'registration'))
+				if (empty($registration) && !empty($items[$i]->query['view']) && ($items[$i]->query['view'] === 'registration'))
 				{
 					$registration = $items[$i]->id;
 				}
 
 				// Check to see if we have found the profile menu item.
-				if (empty($profile) && !empty($items[$i]->query['view']) && ($items[$i]->query['view'] == 'profile'))
+				if (empty($profile) && !empty($items[$i]->query['view']) && ($items[$i]->query['view'] === 'profile'))
 				{
 					$profile = $items[$i]->id;
 				}
diff --git a/components/com_users/views/profile/tmpl/edit.php b/components/com_users/views/profile/tmpl/edit.php
index 668cbda9072c8..9bceae7c6904a 100644
--- a/components/com_users/views/profile/tmpl/edit.php
+++ b/components/com_users/views/profile/tmpl/edit.php
@@ -64,12 +64,12 @@
 					<div class="control-group">
 						<div class="control-label">
 							<?php echo $field->label; ?>
-							<?php if (!$field->required && $field->type != 'Spacer') : ?>
+							<?php if (!$field->required && $field->type !== 'Spacer') : ?>
 								<span class="optional"><?php echo JText::_('COM_USERS_OPTIONAL'); ?></span>
 							<?php endif; ?>
 						</div>
 						<div class="controls">
-							<?php if ($field->fieldname == 'password1') : ?>
+							<?php if ($field->fieldname === 'password1') : ?>
 								<?php // Disables autocomplete ?> <input type="password" style="display:none">
 							<?php endif; ?>
 							<?php echo $field->input; ?>
diff --git a/components/com_users/views/registration/tmpl/default.php b/components/com_users/views/registration/tmpl/default.php
index 900e8bd8831ff..81a94195f4233 100644
--- a/components/com_users/views/registration/tmpl/default.php
+++ b/components/com_users/views/registration/tmpl/default.php
@@ -38,7 +38,7 @@
 						<div class="control-group">
 							<div class="control-label">
 							<?php echo $field->label; ?>
-							<?php if (!$field->required && $field->type != 'Spacer') : ?>
+							<?php if (!$field->required && $field->type !== 'Spacer') : ?>
 								<span class="optional"><?php echo JText::_('COM_USERS_OPTIONAL');?></span>
 							<?php endif; ?>
 							</div>
diff --git a/components/com_users/views/reset/view.html.php b/components/com_users/views/reset/view.html.php
index 84874760cb611..1cccfb2036c5f 100644
--- a/components/com_users/views/reset/view.html.php
+++ b/components/com_users/views/reset/view.html.php
@@ -42,7 +42,7 @@ public function display($tpl = null)
 			$name = 'default';
 		}
 
-		if ('default' == $name)
+		if ('default' === $name)
 		{
 			$formname = 'Form';
 		}

From e11305b2ad65c67e0c141afdb4118f25d7765471 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 20:14:13 +0300
Subject: [PATCH 18/19] More type safe comparisons

---
 components/com_banners/models/banners.php                   | 6 +++---
 components/com_contact/router.php                           | 4 ++--
 .../com_contact/views/category/tmpl/default_children.php    | 2 +-
 components/com_content/router.php                           | 6 +++---
 components/com_content/views/category/tmpl/blog.php         | 2 +-
 components/com_content/views/featured/tmpl/default.php      | 2 +-
 components/com_newsfeeds/router.php                         | 4 ++--
 components/com_tags/helpers/route.php                       | 2 +-
 components/com_tags/views/tag/tmpl/default.php              | 4 ++--
 components/com_tags/views/tag/tmpl/default_items.php        | 2 +-
 components/com_tags/views/tag/tmpl/list.php                 | 2 +-
 components/com_tags/views/tag/tmpl/list_items.php           | 2 +-
 components/com_tags/views/tags/tmpl/default_items.php       | 6 +++---
 components/com_users/models/profile.php                     | 2 +-
 14 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php
index d6321cf9f4e79..39891b5d5028a 100644
--- a/components/com_banners/models/banners.php
+++ b/components/com_banners/models/banners.php
@@ -134,7 +134,7 @@ protected function getListQuery()
 
 		if ($tagSearch)
 		{
-			if (count($keywords) == 0)
+			if (count($keywords) === 0)
 			{
 				$query->where('0');
 			}
@@ -154,7 +154,7 @@ protected function getListQuery()
 					$keyword = trim($keyword);
 
 					$quotedKeyword = $db->quote($keyword);
-					$prefixCondition = ($prefix == substr($keyword, 0, strlen($prefix)) ? '1' : '0');
+					$prefixCondition = ($prefix === substr($keyword, 0, strlen($prefix)) ? '1' : '0');
 
 					$condition1 = /** @lang SQL */
 						<<<SQL
@@ -300,7 +300,7 @@ public function impress()
 					JError::raiseError(500, $e->getMessage());
 				}
 
-				if ($db->getAffectedRows() == 0)
+				if ($db->getAffectedRows() === 0)
 				{
 					// Insert new count
 					$query->clear();
diff --git a/components/com_contact/router.php b/components/com_contact/router.php
index 665047cc8532f..fa36616019695 100644
--- a/components/com_contact/router.php
+++ b/components/com_contact/router.php
@@ -90,7 +90,7 @@ public function build(&$query)
 
 					foreach ($path as $id)
 					{
-						if ((int) $id == (int) $menuCatid)
+						if ((int) $id === (int) $menuCatid)
 						{
 							break;
 						}
@@ -215,7 +215,7 @@ public function parse(&$segments)
 				}
 			}
 
-			if ($found == 0)
+			if ($found === 0)
 			{
 				if ($advanced)
 				{
diff --git a/components/com_contact/views/category/tmpl/default_children.php b/components/com_contact/views/category/tmpl/default_children.php
index 11e0fed99afaf..b7bba546b9222 100644
--- a/components/com_contact/views/category/tmpl/default_children.php
+++ b/components/com_contact/views/category/tmpl/default_children.php
@@ -9,7 +9,7 @@
 
 defined('_JEXEC') or die;
 $class = ' class="first"';
-if (count($this->children[$this->category->id]) > 0 && $this->maxLevel != 0) :
+if ($this->maxLevel != 0 && count($this->children[$this->category->id]) > 0) :
 ?>
 <ul class="list-striped list-condensed">
 <?php foreach ($this->children[$this->category->id] as $id => $child) : ?>
diff --git a/components/com_content/router.php b/components/com_content/router.php
index 1dc9e49baab52..c803e122081a8 100644
--- a/components/com_content/router.php
+++ b/components/com_content/router.php
@@ -162,7 +162,7 @@ public function build(&$query)
 
 			foreach ($path as $id)
 			{
-				if ((int) $id == (int) $mCatid)
+				if ((int) $id === (int) $mCatid)
 				{
 					break;
 				}
@@ -323,7 +323,7 @@ public function parse(&$segments)
 		 * We test it first to see if it is a category.  If the id and alias match a category,
 		 * then we assume it is a category.  If they don't we assume it is an article
 		 */
-		if ($count == 1)
+		if ($count === 1)
 		{
 			// We check to see if an alias is given.  If not, we assume it is an article
 			if (strpos($segments[0], ':') === false)
@@ -428,7 +428,7 @@ public function parse(&$segments)
 				}
 			}
 
-			if ($found == 0)
+			if ($found === 0)
 			{
 				if ($advanced)
 				{
diff --git a/components/com_content/views/category/tmpl/blog.php b/components/com_content/views/category/tmpl/blog.php
index 33107f9a0fc46..1703ef765a744 100644
--- a/components/com_content/views/category/tmpl/blog.php
+++ b/components/com_content/views/category/tmpl/blog.php
@@ -74,7 +74,7 @@
 	<?php if (!empty($this->intro_items)) : ?>
 		<?php foreach ($this->intro_items as $key => &$item) : ?>
 			<?php $rowcount = ((int) $key % (int) $this->columns) + 1; ?>
-			<?php if ($rowcount == 1) : ?>
+			<?php if ($rowcount === 1) : ?>
 				<?php $row = $counter / $this->columns; ?>
 				<div class="items-row cols-<?php echo (int) $this->columns; ?> <?php echo 'row-' . $row; ?> row-fluid clearfix">
 			<?php endif; ?>
diff --git a/components/com_content/views/featured/tmpl/default.php b/components/com_content/views/featured/tmpl/default.php
index 3567d746d2843..bc777fc5b33f4 100644
--- a/components/com_content/views/featured/tmpl/default.php
+++ b/components/com_content/views/featured/tmpl/default.php
@@ -54,7 +54,7 @@
 		$rowcount = (((int) $key - 1) % (int) $this->columns) + 1;
 		$row = $counter / $this->columns;
 
-		if ($rowcount == 1) : ?>
+		if ($rowcount === 1) : ?>
 
 		<div class="items-row cols-<?php echo (int) $this->columns;?> <?php echo 'row-' . $row; ?> row-fluid">
 		<?php endif; ?>
diff --git a/components/com_newsfeeds/router.php b/components/com_newsfeeds/router.php
index 6826d46d739c2..263805be66f62 100644
--- a/components/com_newsfeeds/router.php
+++ b/components/com_newsfeeds/router.php
@@ -91,7 +91,7 @@ public function build(&$query)
 
 					foreach ($path as $id)
 					{
-						if ((int) $id == (int) $menuCatid)
+						if ((int) $id === (int) $menuCatid)
 						{
 							break;
 						}
@@ -214,7 +214,7 @@ public function parse(&$segments)
 				}
 			}
 
-			if ($found == 0)
+			if ($found === 0)
 			{
 				if ($advanced)
 				{
diff --git a/components/com_tags/helpers/route.php b/components/com_tags/helpers/route.php
index 922fd2c55c61a..29347f74b6d3a 100644
--- a/components/com_tags/helpers/route.php
+++ b/components/com_tags/helpers/route.php
@@ -57,7 +57,7 @@ public static function getItemRoute($contentItemId, $contentItemAlias, $contentC
 			}
 		}
 
-		if ($link == '')
+		if ($link === '')
 		{
 			// Create a fallback link in case we can't find the component router
 			$router = new JHelperRoute;
diff --git a/components/com_tags/views/tag/tmpl/default.php b/components/com_tags/views/tag/tmpl/default.php
index b89e700c0ba83..4e3966f33762f 100644
--- a/components/com_tags/views/tag/tmpl/default.php
+++ b/components/com_tags/views/tag/tmpl/default.php
@@ -11,7 +11,7 @@
 
 // Note that there are certain parts of this layout used only when there is exactly one tag.
 JHtml::addIncludePath(JPATH_COMPONENT . '/helpers');
-$isSingleTag = (count($this->item) == 1);
+$isSingleTag = (count($this->item) === 1);
 ?>
 <div class="tag-category<?php echo $this->pageclass_sfx; ?>">
 	<?php if ($this->params->get('show_page_heading')) : ?>
@@ -25,7 +25,7 @@
 		</h2>
 	<?php endif; ?>
 	<?php // We only show a tag description if there is a single tag. ?>
-	<?php if (count($this->item) == 1 && ($this->params->get('tag_list_show_tag_image', 1) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
+	<?php if (count($this->item) === 1 && ($this->params->get('tag_list_show_tag_image', 1) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
 		<div class="category-desc">
 			<?php $images = json_decode($this->item[0]->images); ?>
 			<?php if ($this->params->get('tag_list_show_tag_image', 1) == 1 && !empty($images->image_fulltext)) : ?>
diff --git a/components/com_tags/views/tag/tmpl/default_items.php b/components/com_tags/views/tag/tmpl/default_items.php
index bdeb7570f1e9a..5eb69624dcae5 100644
--- a/components/com_tags/views/tag/tmpl/default_items.php
+++ b/components/com_tags/views/tag/tmpl/default_items.php
@@ -64,7 +64,7 @@
 	</fieldset>
 	<?php endif; ?>
 
-	<?php if ($this->items == false || $n == 0) : ?>
+	<?php if ($this->items == false || $n === 0) : ?>
 		<p> <?php echo JText::_('COM_TAGS_NO_ITEMS'); ?></p>
 	<?php else : ?>
 
diff --git a/components/com_tags/views/tag/tmpl/list.php b/components/com_tags/views/tag/tmpl/list.php
index 0355bab4d50e5..bad8f2c749883 100644
--- a/components/com_tags/views/tag/tmpl/list.php
+++ b/components/com_tags/views/tag/tmpl/list.php
@@ -26,7 +26,7 @@
 		</h2>
 	<?php endif; ?>
 	<?php // We only show a tag description if there is a single tag. ?>
-	<?php if (count($this->item) == 1 && ($this->params->get('tag_list_show_tag_image', 1) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
+	<?php if (count($this->item) === 1 && ($this->params->get('tag_list_show_tag_image', 1) || $this->params->get('tag_list_show_tag_description', 1))) : ?>
 		<div class="category-desc">
 			<?php $images = json_decode($this->item[0]->images); ?>
 			<?php if ($this->params->get('tag_list_show_tag_image', 1) == 1 && !empty($images->image_fulltext)) : ?>
diff --git a/components/com_tags/views/tag/tmpl/list_items.php b/components/com_tags/views/tag/tmpl/list_items.php
index ec43f77d1d5dc..ff336b19e027b 100644
--- a/components/com_tags/views/tag/tmpl/list_items.php
+++ b/components/com_tags/views/tag/tmpl/list_items.php
@@ -56,7 +56,7 @@
 	</fieldset>
 	<?php endif; ?>
 
-	<?php if ($this->items == false || $n == 0) : ?>
+	<?php if ($this->items == false || $n === 0) : ?>
 		<p> <?php echo JText::_('COM_TAGS_NO_ITEMS'); ?></p>
 	<?php else : ?>
 		<table class="category table table-striped table-bordered table-hover">
diff --git a/components/com_tags/views/tags/tmpl/default_items.php b/components/com_tags/views/tags/tmpl/default_items.php
index db2fdbc8e7320..0311e58d4923c 100644
--- a/components/com_tags/views/tags/tmpl/default_items.php
+++ b/components/com_tags/views/tags/tmpl/default_items.php
@@ -80,11 +80,11 @@
 		</fieldset>
 	<?php endif; ?>
 
-	<?php if ($this->items == false || $n == 0) : ?>
+	<?php if ($this->items == false || $n === 0) : ?>
 		<p><?php echo JText::_('COM_TAGS_NO_TAGS'); ?></p>
 	<?php else : ?>
 		<?php foreach ($this->items as $i => $item) : ?>
-			<?php if ($n == 1 || $i == 0 || $bscolumns == 1 || $i % $bscolumns == 0) : ?>
+			<?php if ($n === 1 || $i === 0 || $bscolumns === 1 || $i % $bscolumns === 0) : ?>
 				<ul class="thumbnails">
 			<?php endif; ?>
 			<?php if ((!empty($item->access)) && in_array($item->access, $this->user->getAuthorisedViewLevels())) : ?>
@@ -124,7 +124,7 @@
 			</div>
 			</li>
 
-			<?php if (($i == 0 && $n == 1) || $i == $n - 1 || $bscolumns == 1 || (($i + 1) % $bscolumns == 0)) : ?>
+			<?php if (($i === 0 && $n === 1) || $i === $n - 1 || $bscolumns === 1 || (($i + 1) % $bscolumns === 0)) : ?>
 				</ul>
 			<?php endif; ?>
 
diff --git a/components/com_users/models/profile.php b/components/com_users/models/profile.php
index 2e50ba9335881..dd5eb508c826c 100644
--- a/components/com_users/models/profile.php
+++ b/components/com_users/models/profile.php
@@ -198,7 +198,7 @@ public function getForm($data = array(), $loadData = true)
 		{
 			$username = $this->loadFormData()->username;
 			$isUsernameCompliant  = !(preg_match('#[<>"\'%;()&\\\\]|\\.\\./#', $username) || strlen(utf8_decode($username)) < 2
-				|| trim($username) != $username);
+				|| trim($username) !== $username);
 		}
 
 		$this->setState('user.username.compliant', $isUsernameCompliant);

From 0d5b62cfa249205eecc4258252317abaf08e9ed2 Mon Sep 17 00:00:00 2001
From: Frank Mayer <frank@frankmayer.net>
Date: Sun, 2 Oct 2016 20:34:23 +0300
Subject: [PATCH 19/19] Codesniffer...

---
 components/com_banners/models/banners.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php
index 39891b5d5028a..d5997298c221d 100644
--- a/components/com_banners/models/banners.php
+++ b/components/com_banners/models/banners.php
@@ -168,9 +168,10 @@ protected function getListQuery()
 AND $prefixCondition
 SQL;
 
-					// Todo: Check with other Joomla members if the above change makes enough sense if the above is not a complete
-					//       Statement and there are other conditions following.
-					//       The other question is of course, if such queries will in future all be done with the query builder
+					/* Todo: Check with other Joomla members if the above change makes enough sense if the above is not a complete
+					         Statement and there are other conditions following.
+					         The other question is of course, if such queries will in future all be done with the query builder
+					*/
 
 					$escapedKeyword = $db->escape($keyword);
 					$condition2 = "a.metakey REGEXP '[[:<:]]" . $escapedKeyword . "[[:>:]]'";