Skip to content

Performance optimizations #1 #12171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 48 commits into from
Jun 15, 2017
Merged

Performance optimizations #1 #12171

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
033aa88
Fixed callable call in loop termination condition
frankmayer Sep 25, 2016
a650515
Fixed non-optimal regular expression
frankmayer Sep 25, 2016
a33ad89
Shortened syntax for applied operations
frankmayer Sep 25, 2016
4173a7f
Don't use strlen() to check if string is empty.
frankmayer Sep 25, 2016
186f975
Reverted preg changes. Look into those later again.
frankmayer Sep 25, 2016
19eb362
Replaced call_user_func_array() with call_user_func()
frankmayer Sep 25, 2016
f9cb3fe
Merge unset() calls
frankmayer Sep 25, 2016
d30d1d7
Replaced old intval() call with modern typecasting
frankmayer Sep 25, 2016
0d1f128
Optimize away substr() as index-based access
frankmayer Sep 25, 2016
321c813
Merge branch 'Performance_2' into Performance_1
frankmayer Sep 25, 2016
d30fe28
Replace some cases of substr() with strpos()
frankmayer Sep 25, 2016
5dfd4e9
Replace some stristr() with stripos()
frankmayer Sep 25, 2016
4c1cfdd
Replace is_null() with null === ...
frankmayer Sep 25, 2016
271d02a
Removed unnecessary ternary operators
frankmayer Sep 25, 2016
c500e83
Fix for Juri...
frankmayer Sep 25, 2016
44d234d
Revert some changes for ... PHP5.3 compatibility
frankmayer Sep 25, 2016
6fb499b
Make travis happy ....
frankmayer Sep 25, 2016
5ada9b9
Make codesniffer happy...
frankmayer Sep 25, 2016
c2fd895
DYC!
frankmayer Sep 25, 2016
de1a93e
Optimize non-optimal if conditions.
frankmayer Sep 25, 2016
2aa353b
codsniffer...
frankmayer Sep 25, 2016
307cd94
Inline one-time use variables
frankmayer Sep 25, 2016
062ef22
Codesniffer...
frankmayer Sep 25, 2016
1bc9d8f
Flipped comparisons
frankmayer Sep 28, 2016
7d287f0
Flipped comparisons
frankmayer Sep 28, 2016
53d4854
Fix removal of ternary operator. Forgot inversion.
frankmayer Sep 28, 2016
5f6d634
More flipping of comparisons ;)
frankmayer Sep 28, 2016
2e2df19
Removed another unnecessary set of ternary operators.
frankmayer Sep 28, 2016
6b3e0fb
Codesniffer...
frankmayer Sep 28, 2016
171f66b
Type-safe comparisons on strings
frankmayer Oct 4, 2016
a730ca0
More type-safe comparisons
frankmayer Oct 4, 2016
1ff621a
Changes that occurred during PR discussion
frankmayer Oct 4, 2016
ba6ac8a
Merge branch 'staging' into Performance_1
frankmayer Dec 12, 2016
c67b374
Remove some unnecessary parentheses
frankmayer Dec 12, 2016
7e02da0
Removed empty if-group and reversed condition
frankmayer Dec 12, 2016
a924e5c
Merge branch 'staging' into Performance_1
frankmayer Dec 15, 2016
e0b11c7
Merge branch 'staging' into Performance_1
frankmayer May 29, 2017
22fc1c4
Merge branch 'staging' into Performance_1
frankmayer Jun 13, 2017
4b30c17
Corrections on errors during merge (Conflict resolving)
frankmayer Jun 13, 2017
e3f8617
Missed one.
frankmayer Jun 13, 2017
7d7b3cd
Remove a parenthesis
frankmayer Jun 13, 2017
42a6146
Changes according to reviewer's comment
frankmayer Jun 13, 2017
cb5ee93
Revert change because of failure
frankmayer Jun 13, 2017
bb10022
Changes according to reviewer's comment
frankmayer Jun 13, 2017
c4157d9
reversed change, though according to the method's doc that value shou…
frankmayer Jun 13, 2017
ec2c21a
Hopefully fixed...
frankmayer Jun 13, 2017
c0d3b44
Hopefully fixed...
frankmayer Jun 13, 2017
3619945
Re-apply some changes
frankmayer Jun 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libraries/cms/application/cms.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public function checkSession()
public function enqueueMessage($msg, $type = 'message')
{
// Don't add empty messages.
if (!strlen(trim($msg)))
if (trim($msg) === '')
{
return;
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/form/field/captcha.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null)

if (strpos($this->class, 'required') === false)
{
$this->class = $this->class . ' required';
$this->class .= ' required';
}
}

Expand Down
4 changes: 2 additions & 2 deletions libraries/cms/helper/media.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public function canUpload($file, $component = 'com_media')
$finfo = finfo_open(FILEINFO_MIME);
$type = finfo_file($finfo, $file['tmp_name']);

if (strlen($type) && !in_array($type, $allowed_mime) && in_array($type, $illegal_mime))
if ($type !== '' && !in_array($type, $allowed_mime) && in_array($type, $illegal_mime))
{
$app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_MIME'), 'notice');

Expand All @@ -174,7 +174,7 @@ public function canUpload($file, $component = 'com_media')
// We have mime magic.
$type = mime_content_type($file['tmp_name']);

if (strlen($type) && !in_array($type, $allowed_mime) && in_array($type, $illegal_mime))
if ($type !== '' && !in_array($type, $allowed_mime) && in_array($type, $illegal_mime))
{
$app->enqueueMessage(JText::_('JLIB_MEDIA_ERROR_WARNINVALID_MIME'), 'notice');

Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/html/number.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public static function bytes($bytes, $unit = 'auto', $precision = 2, $iec = fals
{
$oBase = $iec && strpos($oUnit, 'i') === false ? 1000 : 1024;
$factor = pow($oBase, stripos('BKMGTPEZY', $oUnit[0]));
$oBytes = $oBytes * $factor;
$oBytes *= $factor;
}
}

Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/html/string.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public static function truncateComplex($html, $maxLength = 0, $noSplit = true)
$ptString = JHtml::_('string.truncate', $html, $maxLength, $noSplit, $allowHtml = false);

// It's all HTML, just return it.
if (strlen($ptString) == 0)
if ($ptString === '')
{
return $html;
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/installer/adapter/library.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ public function uninstall($id)
// This should give us the necessary information to proceed.
$row = JTable::getInstance('extension');

if (!$row->load((int) $id) || !strlen($row->element))
if (!$row->load((int) $id) || $row->element === '')
{
JLog::add(JText::_('ERRORUNKOWNEXTENSION'), JLog::WARNING, 'jerror');

Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/installer/adapter/module.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ public function uninstall($id)

// First order of business will be to load the module object table from the database.
// This should give us the necessary information to proceed.
if (!$this->extension->load((int) $id) || !strlen($this->extension->element))
if (!$this->extension->load((int) $id) || $this->extension->element === '')
{
JLog::add(JText::_('JLIB_INSTALLER_ERROR_MOD_UNINSTALL_ERRORUNKOWNEXTENSION'), JLog::WARNING, 'jerror');

Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/installer/adapter/template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,7 @@ public function uninstall($id)
// This should give us the necessary information to proceed.
$row = JTable::getInstance('extension');

if (!$row->load((int) $id) || !strlen($row->element))
if (!$row->load((int) $id) || $row->element === '')
{
JLog::add(JText::_('JLIB_INSTALLER_ERROR_TPL_UNINSTALL_ERRORUNKOWNEXTENSION'), JLog::WARNING, 'jerror');

Expand Down
4 changes: 2 additions & 2 deletions libraries/cms/installer/installer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ public function setSchemaVersion(SimpleXMLElement $schema, $eid)
}
}

if (strlen($schemapath))
if ($schemapath !== '')
{
$files = str_replace('.sql', '', JFolder::files($this->getPath('extension_root') . '/' . $schemapath, '\.sql$'));
usort($files, 'version_compare');
Expand Down Expand Up @@ -1102,7 +1102,7 @@ public function parseSchemaUpdates(SimpleXMLElement $schema, $eid)
}
}

if (strlen($schemapath))
if ($schemapath !== '')
{
$files = str_replace('.sql', '', JFolder::files($this->getPath('extension_root') . '/' . $schemapath, '\.sql$'));
usort($files, 'version_compare');
Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/installer/manifest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ abstract class JInstallerManifest
*/
public function __construct($xmlpath = '')
{
if (strlen($xmlpath))
if ($xmlpath !== '')
{
$this->loadManifestFromXml($xmlpath);
}
Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/router/site.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ protected function parseRawRoute(&$uri)

if ($item !== null && is_array($item->query))
{
$vars = $vars + $item->query;
$vars += $item->query;
}
}

Expand Down
2 changes: 1 addition & 1 deletion libraries/cms/schema/changeitem/postgresql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ protected function buildCheckQuery()
{
$type = '';

for ($i = 7; $i < count($wordArray); $i++)
for ($i = 7, $iMax = count($wordArray); $i < $iMax; $i++)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@frankmayer good find.

{
$type .= $wordArray[$i] . ' ';
}
Expand Down
4 changes: 2 additions & 2 deletions libraries/cms/toolbar/button/popup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function fetchButton($type = 'Modal', $name = '', $text = '', $url = '',
$onClose = '', $title = '', $footer = null)
{
// If no $title is set, use the $text element
if (strlen($title) == 0)
if ($title === '')
{
$title = $text;
}
Expand Down Expand Up @@ -83,7 +83,7 @@ public function fetchButton($type = 'Modal', $name = '', $text = '', $url = '',
$html[] = JHtml::_('bootstrap.renderModal', 'modal-' . $name, $params);

// If an $onClose event is passed, add it to the modal JS object
if (strlen($onClose) >= 1)
if ($onClose !== '')
{
$html[] = '<script>'
. 'jQuery(\'#modal-' . $name . '\').on(\'hide\', function () {' . $onClose . ';});'
Expand Down