Type safe comparison of strings only, in libraries/cms #13275

frankmayer · 2016-12-19T00:37:52Z

Summary of Changes

Type safe string comparison of strings only, in libraries/cms

This PR is part of a set to try to separate some of the changes done in one of my previous batch PR's for the libraries/cms directory, which is still on hold (#12171).
Once the new set is merged completely, it will hopefully reduce the changes in that PR, so it can be reviewed easier and finally be merged.

The changes in this PR should be very easy to review, as they are only string and string type comparisons. In hope that this will get merged quickly. ;)

Note: Don't bother if some possible changes are missing or could be differently written. They are probably in the batch PR , that this one references. As soon as this set of sub PR's is merged, the batch PR will have its conflicts resolved and should be a lot easier to review and finally get merged.

Testing Instructions

None, should not change behavior

Documentation Changes Required

None.

# Conflicts: # libraries/cms/installer/installer.php # libraries/cms/schema/changeitem.php # libraries/cms/schema/changeset.php

frankmayer · 2017-01-12T17:19:58Z

Conflicts resolved...

# Conflicts: # libraries/cms/component/router/rules/standard.php

frankmayer · 2017-04-26T10:42:53Z

Conflicts resolved. Pls check and merge.

Quy · 2017-05-28T21:44:24Z

libraries/cms/application/cms.php


 		// If gzip compression is enabled in configuration and the server is compliant, compress the output.
-		if ($this->get('gzip') && !ini_get('zlib.output_compression') && (ini_get('output_handler') != 'ob_gzhandler'))
+		if ($this->get('gzip') && !ini_get('zlib.output_compression') && (ini_get('output_handler') !== 'ob_gzhandler'))


Remove parentheses

Quy · 2017-05-28T21:45:47Z

libraries/cms/application/site.php

 				$file     = $this->input->get('tmpl', 'index');

-				if (!$this->get('offline') && ($file == 'offline'))
+				if (!$this->get('offline') && ($file === 'offline'))


Remove parentheses

Quy · 2017-05-28T21:46:35Z

libraries/cms/form/field/limitbox.php


 			// Add an option to show all?
-			$showAll = isset($this->element['showall']) ? ($this->element['showall'] == 'true') : true;
+			$showAll = isset($this->element['showall']) ? ($this->element['showall'] === 'true') : true;


Remove parentheses

Quy · 2017-05-28T21:46:51Z

libraries/cms/form/field/tag.php

 		{
 			// If mode="nested" || ( mode not set & config = nested )
-			if ((isset($this->element['mode']) && $this->element['mode'] == 'nested')
+			if ((isset($this->element['mode']) && $this->element['mode'] === 'nested')


Remove parentheses

Quy · 2017-05-28T21:47:39Z

libraries/cms/html/grid.php

 		else
 		{
-			$direction = ($direction == 'desc') ? 'asc' : 'desc';
+			$direction = ($direction === 'desc') ? 'asc' : 'desc';


Remove parentheses

Quy · 2017-05-28T21:48:19Z

libraries/cms/html/searchtools.php

 		else
 		{
-			$direction = ($direction == 'desc') ? 'asc' : 'desc';
+			$direction = ($direction === 'desc') ? 'asc' : 'desc';


Remove parentheses

Quy · 2017-05-28T21:49:41Z

libraries/cms/installer/adapter/plugin.php

 			$this->extension->state = 0;
 			$this->extension->name = $manifest_details['name'];
-			$this->extension->enabled = ('editors' == $this->extension->folder) ? 1 : 0;
+			$this->extension->enabled = ('editors' === $this->extension->folder) ? 1 : 0;


Remove parentheses

Quy · 2017-05-28T21:50:14Z

libraries/cms/installer/installer.php

 		foreach ($element->children() as $file)
 		{
-			$fCharset = (strtolower($file->attributes()->charset) == 'utf8') ? 'utf8' : '';
+			$fCharset = (strtolower($file->attributes()->charset) === 'utf8') ? 'utf8' : '';


Remove parentheses

Quy · 2017-05-28T21:50:33Z

libraries/cms/installer/installer.php


 			// Is this path a file or folder?
-			$path['type'] = ($file->getName() == 'folder') ? 'folder' : 'file';
+			$path['type'] = ($file->getName() === 'folder') ? 'folder' : 'file';


Remove parentheses

Quy · 2017-05-28T21:50:39Z

libraries/cms/installer/installer.php


 			// Is this path a file or folder?
-			$path['type'] = ($file->getName() == 'folder') ? 'folder' : 'file';
+			$path['type'] = ($file->getName() === 'folder') ? 'folder' : 'file';


Remove parentheses

Quy · 2017-05-28T21:51:09Z

libraries/cms/module/helper.php

 			// Get the template and file name from the string
 			$temp = explode(':', $layout);
-			$template = ($temp[0] == '_') ? $template : $temp[0];
+			$template = ($temp[0] === '_') ? $template : $temp[0];


Remove parentheses

Quy · 2017-05-28T21:51:17Z

libraries/cms/plugin/helper.php

 			// Get the template and file name from the string
 			$temp = explode(':', $layout);
-			$template = ($temp[0] == '_') ? $template : $temp[0];
+			$template = ($temp[0] === '_') ? $template : $temp[0];


Remove parentheses

Quy · 2017-05-28T21:51:25Z

libraries/cms/module/helper.php

-			$template = ($temp[0] == '_') ? $template : $temp[0];
+			$template = ($temp[0] === '_') ? $template : $temp[0];
 			$layout = $temp[1];
 			$defaultLayout = ($temp[1]) ? $temp[1] : 'default';


Remove parentheses

Quy · 2017-05-28T21:51:33Z

libraries/cms/plugin/helper.php

-			$template = ($temp[0] == '_') ? $template : $temp[0];
+			$template = ($temp[0] === '_') ? $template : $temp[0];
 			$layout = $temp[1];
 			$defaultLayout = ($temp[1]) ? $temp[1] : 'default';


Remove parentheses

…to type-safety-in-libraries-cms

Quy · 2017-05-28T23:49:38Z

I have tested this item ✅ successfully on bae19d7
Code review

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/13275.}

andrepereiradasilva · 2017-05-31T18:47:01Z

I have tested this item ✅ successfully on bae19d7

on code review

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/13275.}

ghost · 2017-05-31T19:03:16Z

RTC after two successful tests.

frankmayer added 2 commits December 19, 2016 01:59

Type safe comparison of strings in libraries/cms

5d4af24

Additional type safe comparison of strings in libraries/cms

283af51

joomla-cms-bot added the PR-staging label Dec 19, 2016

frankmayer added 2 commits December 19, 2016 02:53

CS Fix

d760789

Hopefully fix CS

dec8221

andrepereiradasilva approved these changes Dec 19, 2016

View reviewed changes

frankmayer changed the title ~~Type safety in libraries cms~~ Type safe comparison of strings only, in libraries/cms Dec 22, 2016

frankmayer mentioned this pull request Jan 5, 2017

Performance optimizations #1 #12171

Merged

6 tasks

Merge branch 'staging' into type-safety-in-libraries-cms

c8e1914

# Conflicts: # libraries/cms/installer/installer.php # libraries/cms/schema/changeitem.php # libraries/cms/schema/changeset.php

Merge branch 'staging' into type-safety-in-libraries-cms

0e3ab23

# Conflicts: # libraries/cms/component/router/rules/standard.php

Merge branch 'staging' into type-safety-in-libraries-cms

3cf734e

Quy reviewed May 28, 2017

View reviewed changes

frankmayer added 3 commits May 29, 2017 02:25

- Changed some things according to reviewer's suggestions

0c7d775

Merge remote-tracking branch 'origin/type-safety-in-libraries-cms' in…

c01b218

…to type-safety-in-libraries-cms

- Changed some things according to reviewer's suggestions

fd9a533

frankmayer added 3 commits May 29, 2017 02:34

Merge branch 'staging' into type-safety-in-libraries-cms

592bcc3

Merge branch 'staging' into type-safety-in-libraries-cms

6cfa988

Merge remote-tracking branch 'origin/type-safety-in-libraries-cms' in…

bae19d7

…to type-safety-in-libraries-cms

joomla-cms-bot added the RTC This Pull Request is Ready To Commit label May 31, 2017

Merge branch 'staging' into type-safety-in-libraries-cms

97d5561

rdeutz merged commit 5aa724a into joomla:staging Jun 13, 2017

joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label Jun 13, 2017

rdeutz added this to the Joomla 3.7.3 milestone Jun 13, 2017

frankmayer deleted the type-safety-in-libraries-cms branch June 13, 2017 21:57

Uh oh!

Type safe comparison of strings only, in libraries/cms #13275

Type safe comparison of strings only, in libraries/cms #13275

Uh oh!

Conversation

frankmayer commented Dec 19, 2016 • edited by joomla-cms-bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of Changes

Testing Instructions

Documentation Changes Required

Uh oh!

frankmayer commented Jan 12, 2017

Uh oh!

frankmayer commented Apr 26, 2017

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Quy commented May 28, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

andrepereiradasilva commented May 31, 2017

Uh oh!

ghost commented May 31, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

frankmayer commented Dec 19, 2016 •

edited by joomla-cms-bot

Loading

Quy commented May 28, 2017 •

edited

Loading