Type safe comparison in libraries/cms - second iteration (#13276)

frankmayer · rdeutz · commit 128e1757a77a · 2017-06-13T15:19:43.000+02:00
* ### Summary of Changes
Type safe comparison in libraries/cms - second iteration
- some bool
- some int

* Changes according to reviewer's comments + more type safety + some code style
diff --git a/libraries/cms/form/rule/password.php b/libraries/cms/form/rule/password.php
@@ -92,7 +92,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry
 		// Set a variable to check if any errors are made in password
 		$validPassword = true;
 
-		if (strlen($valueTrim) != $valueLength)
+		if (strlen($valueTrim) !== $valueLength)
 		{
 			JFactory::getApplication()->enqueueMessage(
 				JText::_('COM_USERS_MSG_SPACES_IN_PASSWORD'),
diff --git a/libraries/cms/html/html.php b/libraries/cms/html/html.php
@@ -68,9 +68,9 @@ protected static function extract($key)
 		// Check to see whether we need to load a helper file
 		$parts = explode('.', $key);
 
-		$prefix = (count($parts) == 3 ? array_shift($parts) : 'JHtml');
-		$file = (count($parts) == 2 ? array_shift($parts) : '');
-		$func = array_shift($parts);
+		$prefix = count($parts) === 3 ? array_shift($parts) : 'JHtml';
+		$file   = count($parts) === 2 ? array_shift($parts) : '';
+		$func   = array_shift($parts);
 
 		return array(strtolower($prefix . '.' . $file . '.' . $func), $prefix, $file, $func);
 	}
@@ -97,7 +97,7 @@ public static function _($key)
 		if (array_key_exists($key, static::$registry))
 		{
 			$function = static::$registry[$key];
-			$args = func_get_args();
+			$args     = func_get_args();
 
 			// Remove function name from arguments
 			array_shift($args);
diff --git a/libraries/cms/html/select.php b/libraries/cms/html/select.php
@@ -95,7 +95,7 @@ public static function genericlist($data, $name, $attribs = null, $optKey = 'val
 		// Set default options
 		$options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'id' => false));
 
-		if (is_array($attribs) && func_num_args() == 3)
+		if (is_array($attribs) && func_num_args() === 3)
 		{
 			// Assume we have an options array
 			$options = array_merge($options, $attribs);
@@ -354,7 +354,7 @@ public static function integerlist($start, $end, $inc, $name, $attribs = null, $
 		// Set default options
 		$options = array_merge(JHtml::$formatOptions, array('format.depth' => 0, 'option.format' => '', 'id' => null));
 
-		if (is_array($attribs) && func_num_args() == 5)
+		if (is_array($attribs) && func_num_args() === 5)
 		{
 			// Assume we have an options array
 			$options = array_merge($options, $attribs);
diff --git a/libraries/cms/html/string.php b/libraries/cms/html/string.php
@@ -36,7 +36,7 @@ abstract class JHtmlString
 	public static function truncate($text, $length = 0, $noSplit = true, $allowHtml = true)
 	{
 		// Assume a lone open tag is invalid HTML.
-		if ($length == 1 && substr($text, 0, 1) == '<')
+		if ($length === 1 && substr($text, 0, 1) === '<')
 		{
 			return '...';
 		}
@@ -105,7 +105,7 @@ public static function truncate($text, $length = 0, $noSplit = true, $allowHtml
 				$numOpened = count($openedTags);
 
 				// Not all tags are closed so trim the text and finish.
-				if (count($closedTags) != $numOpened)
+				if (count($closedTags) !== $numOpened)
 				{
 					// Closing tags need to be in the reverse order of opening tags.
 					$openedTags = array_reverse($openedTags);
@@ -170,7 +170,7 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
 		$baseLength = strlen($html);
 
 		// If the original HTML string is shorter than the $maxLength do nothing and return that.
-		if ($baseLength <= $maxLength || $maxLength == 0)
+		if ($baseLength <= $maxLength || $maxLength === 0)
 		{
 			return $html;
 		}
@@ -182,7 +182,7 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
 		}
 
 		// Deal with maximum length of 1 where the string starts with a tag.
-		if ($maxLength == 1 && substr($html, 0, 1) == '<')
+		if ($maxLength === 1 && substr($html, 0, 1) === '<')
 		{
 			$endTagPos = strlen(strstr($html, '>', true));
 			$tag = substr($html, 1, $endTagPos);
@@ -204,7 +204,7 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
 		$ptString = JHtml::_('string.truncate', $html, $maxLength, $noSplit, $allowHtml = false);
 
 		// It's all HTML, just return it.
-		if (strlen($ptString) == 0)
+		if (strlen($ptString) === 0)
 		{
 				return $html;
 		}
diff --git a/libraries/cms/installer/helper.php b/libraries/cms/installer/helper.php
@@ -173,7 +173,7 @@ public static function unpack($p_filename, $alwaysReturnArray = false)
 		 */
 		$dirList = array_merge((array) JFolder::files($extractdir, ''), (array) JFolder::folders($extractdir, ''));
 
-		if (count($dirList) == 1)
+		if (count($dirList) === 1)
 		{
 			if (JFolder::exists($extractdir . '/' . $dirList[0]))
 			{
diff --git a/libraries/cms/installer/installer.php b/libraries/cms/installer/installer.php
@@ -892,7 +892,7 @@ public function parseQueries(SimpleXMLElement $element)
 		// Get the array of query nodes to process
 		$queries = $element->children();
 
-		if (count($queries) == 0)
+		if (count($queries) === 0)
 		{
 			// No queries to process
 			return 0;
@@ -987,7 +987,7 @@ public function parseSQLFiles($element)
 				// Create an array of queries from the sql file
 				$queries = JDatabaseDriver::splitSql($buffer);
 
-				if (count($queries) == 0)
+				if (count($queries) === 0)
 				{
 					// No queries to process
 					return 0;
@@ -1177,7 +1177,7 @@ public function parseSchemaUpdates(SimpleXMLElement $schema, $eid)
 							// Create an array of queries from the sql file
 							$queries = JDatabaseDriver::splitSql($buffer);
 
-							if (count($queries) == 0)
+							if (count($queries) === 0)
 							{
 								// No queries to process
 								continue;
@@ -1757,7 +1757,7 @@ public function removeFiles($element, $cid = 0)
 		// Get the array of file nodes to process
 		$files = $element->children();
 
-		if (count($files) == 0)
+		if (count($files) === 0)
 		{
 			// No files to process
 			return true;
diff --git a/libraries/cms/language/associations.php b/libraries/cms/language/associations.php
@@ -110,7 +110,7 @@ public static function getAssociations($extension, $tablename, $context, $id, $p
 				foreach ($items as $tag => $item)
 				{
 					// Do not return itself as result
-					if ((int) $item->{$pk} != $id)
+					if ((int) $item->{$pk} !== $id)
 					{
 						$multilanguageAssociations[$queryKey][$tag] = $item;
 					}
diff --git a/libraries/cms/module/helper.php b/libraries/cms/module/helper.php
@@ -93,7 +93,7 @@ public static function &getModules($position)
 			}
 		}
 
-		if (count($result) == 0)
+		if (count($result) === 0)
 		{
 			if ($input->getBool('tp') && JComponentHelper::getParams('com_templates')->get('template_positions_display'))
 			{
diff --git a/libraries/cms/plugin/helper.php b/libraries/cms/plugin/helper.php
@@ -150,7 +150,7 @@ public static function importPlugin($type, $plugin = null, $autocreate = true, J
 		// Check for the default args, if so we can optimise cheaply
 		$defaults = false;
 
-		if (is_null($plugin) && $autocreate == true && is_null($dispatcher))
+		if (is_null($plugin) && $autocreate === true && is_null($dispatcher))
 		{
 			$defaults = true;
 		}
diff --git a/libraries/cms/router/site.php b/libraries/cms/router/site.php
@@ -227,7 +227,7 @@ protected function parseRawRoute(&$uri)
 		$this->setVar('Itemid', $this->app->input->getInt('Itemid', null));
 
 		// Only an Itemid  OR if filter language plugin set? Get the full information from the itemid
-		if (count($this->getVars()) == 1 || ($this->app->getLanguageFilter() && count($this->getVars()) == 2))
+		if (count($this->getVars()) === 1 || ($this->app->getLanguageFilter() && count($this->getVars()) === 2))
 		{
 			$item = $this->menu->getItem($this->getVar('Itemid'));
 
@@ -620,7 +620,7 @@ protected function processBuildRules(&$uri, $stage = self::PROCESS_DURING)
 			$query = $uri->getQuery(true);
 			if ($this->_mode != 1
 				&& isset($query['Itemid'])
-				&& (count($query) == 2 || (count($query) == 3 && isset($query['lang']))))
+				&& (count($query) === 2 || (count($query) === 3 && isset($query['lang']))))
 			{
 				// Get the active menu item
 				$itemid = $uri->getVar('Itemid');
diff --git a/libraries/cms/table/contenthistory.php b/libraries/cms/table/contenthistory.php
@@ -201,7 +201,7 @@ public function deleteOldVersions($maxVersions)
 		$idsToSave = $db->loadColumn(0);
 
 		// Don't process delete query unless we have at least the maximum allowed versions
-		if (count($idsToSave) == (int) $maxVersions)
+		if (count($idsToSave) === (int) $maxVersions)
 		{
 			// Delete any rows not in our list and and not flagged to keep forever.
 			$query = $db->getQuery(true);
diff --git a/libraries/cms/table/corecontent.php b/libraries/cms/table/corecontent.php
@@ -89,21 +89,21 @@ public function bind($array, $ignore = '')
 	 */
 	public function check()
 	{
-		if (trim($this->core_title) == '')
+		if (trim($this->core_title) === '')
 		{
 			$this->setError(JText::_('JLIB_CMS_WARNING_PROVIDE_VALID_NAME'));
 
 			return false;
 		}
 
-		if (trim($this->core_alias) == '')
+		if (trim($this->core_alias) === '')
 		{
 			$this->core_alias = $this->core_title;
 		}
 
 		$this->core_alias = JApplicationHelper::stringURLSafe($this->core_alias);
 
-		if (trim(str_replace('-', '', $this->core_alias)) == '')
+		if (trim(str_replace('-', '', $this->core_alias)) === '')
 		{
 			$this->core_alias = JFactory::getDate()->format('Y-m-d-H-i-s');
 		}
@@ -278,8 +278,8 @@ public function store($updateNulls = false)
 	protected function storeUcmBase($updateNulls = false, $isNew = false)
 	{
 		// Store the ucm_base row
-		$db = $this->getDbo();
-		$query = $db->getQuery(true);
+		$db         = $this->getDbo();
+		$query      = $db->getQuery(true);
 		$languageId = JHelperContent::getLanguageId($this->core_language);
 
 		// Selecting "all languages" doesn't give a language id - we can't store a blank string in non mysql databases, so save 0 (the default value)
@@ -331,9 +331,9 @@ public function publish($pks = null, $state = 1, $userId = 0)
 		$k = $this->_tbl_key;
 
 		// Sanitize input.
-		$pks = ArrayHelper::toInteger($pks);
+		$pks    = ArrayHelper::toInteger($pks);
 		$userId = (int) $userId;
-		$state = (int) $state;
+		$state  = (int) $state;
 
 		// If there are no primary keys set check to see if the instance key is set.
 		if (empty($pks))
@@ -388,7 +388,7 @@ public function publish($pks = null, $state = 1, $userId = 0)
 		}
 
 		// If checkin is supported and all rows were adjusted, check them in.
-		if ($checkin && (count($pks) == $this->_db->getAffectedRows()))
+		if ($checkin && count($pks) === $this->_db->getAffectedRows())
 		{
 			// Checkin the rows.
 			foreach ($pks as $pk)
diff --git a/libraries/cms/toolbar/button/popup.php b/libraries/cms/toolbar/button/popup.php
@@ -46,7 +46,7 @@ public function fetchButton($type = 'Modal', $name = '', $text = '', $url = '',
 		$onClose = '', $title = '', $footer = null)
 	{
 		// If no $title is set, use the $text element
-		if (strlen($title) == 0)
+		if (strlen($title) === 0)
 		{
 			$title = $text;
 		}

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function test(SimpleXMLElement $element, $value, $group = null, Registry`
`92`	`92`	`// Set a variable to check if any errors are made in password`
`93`	`93`	`$validPassword = true;`
`94`	`94`
`95`		`- if (strlen($valueTrim) != $valueLength)`
	`95`	`+ if (strlen($valueTrim) !== $valueLength)`
`96`	`96`	`{`
`97`	`97`	`JFactory::getApplication()->enqueueMessage(`
`98`	`98`	`JText::_('COM_USERS_MSG_SPACES_IN_PASSWORD'),`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ abstract class JHtmlString`
`36`	`36`	`public static function truncate($text, $length = 0, $noSplit = true, $allowHtml = true)`
`37`	`37`	`{`
`38`	`38`	`// Assume a lone open tag is invalid HTML.`
`39`		`- if ($length == 1 && substr($text, 0, 1) == '<')`
	`39`	`+ if ($length === 1 && substr($text, 0, 1) === '<')`
`40`	`40`	`{`
`41`	`41`	`return '...';`
`42`	`42`	`}`
`@@ -105,7 +105,7 @@ public static function truncate($text, $length = 0, $noSplit = true, $allowHtml`
`105`	`105`	`$numOpened = count($openedTags);`
`106`	`106`
`107`	`107`	`// Not all tags are closed so trim the text and finish.`
`108`		`- if (count($closedTags) != $numOpened)`
	`108`	`+ if (count($closedTags) !== $numOpened)`
`109`	`109`	`{`
`110`	`110`	`// Closing tags need to be in the reverse order of opening tags.`
`111`	`111`	`$openedTags = array_reverse($openedTags);`
`@@ -170,7 +170,7 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)`
`170`	`170`	`$baseLength = strlen($html);`
`171`	`171`
`172`	`172`	`// If the original HTML string is shorter than the $maxLength do nothing and return that.`
`173`		`- if ($baseLength <= $maxLength \|\| $maxLength == 0)`
	`173`	`+ if ($baseLength <= $maxLength \|\| $maxLength === 0)`
`174`	`174`	`{`
`175`	`175`	`return $html;`
`176`	`176`	`}`
`@@ -182,7 +182,7 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`// Deal with maximum length of 1 where the string starts with a tag.`
`185`		`- if ($maxLength == 1 && substr($html, 0, 1) == '<')`
	`185`	`+ if ($maxLength === 1 && substr($html, 0, 1) === '<')`
`186`	`186`	`{`
`187`	`187`	`$endTagPos = strlen(strstr($html, '>', true));`
`188`	`188`	`$tag = substr($html, 1, $endTagPos);`
`@@ -204,7 +204,7 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)`
`204`	`204`	`$ptString = JHtml::_('string.truncate', $html, $maxLength, $noSplit, $allowHtml = false);`
`205`	`205`
`206`	`206`	`// It's all HTML, just return it.`
`207`		`- if (strlen($ptString) == 0)`
	`207`	`+ if (strlen($ptString) === 0)`
`208`	`208`	`{`
`209`	`209`	`return $html;`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public static function unpack($p_filename, $alwaysReturnArray = false)`
`173`	`173`	`*/`
`174`	`174`	`$dirList = array_merge((array) JFolder::files($extractdir, ''), (array) JFolder::folders($extractdir, ''));`
`175`	`175`
`176`		`- if (count($dirList) == 1)`
	`176`	`+ if (count($dirList) === 1)`
`177`	`177`	`{`
`178`	`178`	`if (JFolder::exists($extractdir . '/' . $dirList[0]))`
`179`	`179`	`{`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ public static function getAssociations($extension, $tablename, $context, $id, $p`
`110`	`110`	`foreach ($items as $tag => $item)`
`111`	`111`	`{`
`112`	`112`	`// Do not return itself as result`
`113`		`- if ((int) $item->{$pk} != $id)`
	`113`	`+ if ((int) $item->{$pk} !== $id)`
`114`	`114`	`{`
`115`	`115`	`$multilanguageAssociations[$queryKey][$tag] = $item;`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public static function &getModules($position)`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`- if (count($result) == 0)`
	`96`	`+ if (count($result) === 0)`
`97`	`97`	`{`
`98`	`98`	`if ($input->getBool('tp') && JComponentHelper::getParams('com_templates')->get('template_positions_display'))`
`99`	`99`	`{`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ public static function importPlugin($type, $plugin = null, $autocreate = true, J`
`150`	`150`	`// Check for the default args, if so we can optimise cheaply`
`151`	`151`	`$defaults = false;`
`152`	`152`
`153`		`- if (is_null($plugin) && $autocreate == true && is_null($dispatcher))`
	`153`	`+ if (is_null($plugin) && $autocreate === true && is_null($dispatcher))`
`154`	`154`	`{`
`155`	`155`	`$defaults = true;`
`156`	`156`	`}`