Cleanups, fixes and a bit of optimizations for site/components batch #5#12294

Merged

rdeutz merged 8 commits intojoomla:stagingfrom

frankmayer:site-com_tags-com_users-com_wrapper

Jun 8, 2017

Contributor

frankmayer commented Oct 3, 2016 •

edited by joomla-cms-bot

Loading

com_tags
com_users
com_wrapper

Note: This is a single commit bundling all types of changes, since PR #12261 which had detailed commits, was rejected as a whole


          Cleanups, fixes and a bit of optimizations for site/components batch #5

fd62014

- com_tags
- com_users
- com_wrapper

Note: This is a single commit bundling all types of changes, since PR #12261 which had detailed commits, was rejected as a whole

joomla-cms-bot added the PR-staging label

Contributor

andrepereiradasilva commented Oct 3, 2016

I have tested this item ✅ successfully on fd62014

on code review

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

frankmayer added 2 commits

December 13, 2016 17:53


          Merge branch 'staging' into site-com_tags-com_users-com_wrapper

2303d27

# Conflicts:
#	components/com_tags/views/tags/tmpl/default_items.php
#	components/com_users/router.php
#	components/com_users/views/login/tmpl/default_login.php
#	components/com_users/views/login/tmpl/default_logout.php
#	components/com_users/views/registration/tmpl/default.php
#	components/com_wrapper/views/wrapper/view.html.php


          Some more fixes after conflict resolution

62df93f

Contributor

andrepereiradasilva commented Dec 13, 2016

I have tested this item ✅ successfully on 62df93f

code review

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

This was referenced Dec 13, 2016

Unnecessary double quotes in site components #13183

Merged

Simplify ternary with elvis in site component #13185

Merged

Merged unset() calls #13186

Merged

Removed one-time-use variables #13187

Merged

Use short syntax for applied operations #13188

Merged

Remove unnecessary parentheses in site components #13190

Merged


          Merge branch 'staging' into site-com_tags-com_users-com_wrapper

ed5d7c6

# Conflicts:
#	components/com_tags/views/tag/tmpl/default.php
#	components/com_tags/views/tag/tmpl/list.php
#	components/com_tags/views/tag/tmpl/list_items.php
#	components/com_tags/views/tag/view.feed.php
#	components/com_tags/views/tags/view.feed.php
#	components/com_users/helpers/html/users.php
#	components/com_users/models/profile.php

Contributor Author

frankmayer commented Dec 15, 2016

Fixed some conflicts that had occurred in the meantime.
Having merged the changes of above referenced PR's made this PR lighter and easier to test.
It is essentially ready to be merged, when the team finds the time and PR is OK.

andrepereiradasilva approved these changes

View reviewed changes


          Merge branch 'staging' into site-com_tags-com_users-com_wrapper

34be2f9

Quy reviewed

View reviewed changes

components/com_tags/views/tags/view.html.php Outdated

               		}
-              		if ($menu && ($menu->query['option'] != 'com_tags'))
+              		if ($menu && ($menu->query['option'] !== 'com_tags'))

Contributor

Quy May 28, 2017

Remove parentheses.

Quy reviewed

View reviewed changes

components/com_tags/views/tag/tmpl/default.php Outdated

               // 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);

Contributor

Quy May 28, 2017

Remove parentheses

Quy reviewed

View reviewed changes

components/com_users/router.php Outdated

               			{
               				// 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'))

Contributor

Quy May 28, 2017

Remove parentheses. ($items[$i]->query['view'] === 'resend')

Quy reviewed

View reviewed changes

components/com_users/router.php Outdated

               				// 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'))

Contributor

Quy May 28, 2017

Remove parentheses.

Quy reviewed

View reviewed changes

components/com_users/router.php Outdated

               				// 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'))

Contributor

Quy May 28, 2017

Remove parentheses.

Quy reviewed

View reviewed changes

components/com_users/router.php Outdated

               				// 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'))

Contributor

Quy May 28, 2017

Remove parentheses.

Quy reviewed

View reviewed changes

components/com_users/router.php Outdated

               				// 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'))

Contributor

Quy May 28, 2017

Remove parentheses.

Quy reviewed

View reviewed changes

components/com_users/router.php Outdated

               				// 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'))

Contributor

Quy May 28, 2017

Remove parentheses.

Quy reviewed

View reviewed changes

components/com_tags/views/tag/tmpl/default_items.php Outdated

               	<?php endif; ?>
-              	<?php if ($this->items == false || $n == 0) : ?>
+              	<?php if ($this->items == false || $n === 0) : ?>

Contributor

Quy May 28, 2017

Change == to ===?

Contributor Author

frankmayer May 28, 2017

Yes, indeed 👍

Quy reviewed

View reviewed changes

components/com_tags/views/tag/tmpl/list_items.php Outdated

               	<?php endif; ?>
-              	<?php if ($this->items == false || $n == 0) : ?>
+              	<?php if ($this->items == false || $n === 0) : ?>

Contributor

Quy May 28, 2017

Change == to ===?

frankmayer added 3 commits

May 29, 2017 00:59


          Merge branch 'staging' into site-com_tags-com_users-com_wrapper

041b616


          - Changed some things according to reviewer's suggestions

352d8bf

- Some more changes in updated stuff


          Merge remote-tracking branch 'origin/site-com_tags-com_users-com_wrap…

bbc3d57

…per' into site-com_tags-com_users-com_wrapper

Contributor

Quy commented May 28, 2017 •

edited

Loading

I have tested this item ✅ successfully on bbc3d57
Code review

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

Contributor

andrepereiradasilva commented Jun 1, 2017

I have tested this item ✅ successfully on bbc3d57

On code review

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

joomla-cms-bot added the RTC label

ghost commented Jun 1, 2017

RTC after two successful tests.

rdeutz added this to the Joomla 3.7.3 milestone

rdeutz merged commit 7fc2cd3 into joomla:staging

joomla-cms-bot removed the RTC label

frankmayer deleted the site-com_tags-com_users-com_wrapper branch

June 8, 2017 10:15

rdeutz added a commit that referenced this pull request


          fixed a logic change in #12294, thanks @Hoffi1

65c8159

roland-d added a commit to roland-d/joomla-cms that referenced this pull request


          Merge branch 'staging' into redo-7259-modal-for-quicker-edit

5adcaee

* staging: (274 commits)
  Add JCryptCipherSodium to support libsodium (joomla#16754)
  Performance 2 (libraries/legacy) (joomla#12220)
  Performance 6 (templates) (joomla#12233)
  Fixed typehint (joomla#16425)
  Fix for: Repeatable field is no longer rendered with Chosen layout (joomla#16471)
  Fix the path for the ajax-loader.gif (joomla#16701)
  Menu items list parent filter (joomla#17060)
  Text Filters layout (joomla#17113)
  mod_login showon option (joomla#17153)
  com_banners incorret tooltip (joomla#17157)
  fix joomla.content.options_default (joomla#17123)
  remove the never working limitstart call (joomla#17184)
  Update phpDocumentor build
  set 3.8.0 Dev State
  Prepare 3.7.4 Stable Release
  fixed a logic change in joomla#12294, thanks @Hoffi1
  Update sv-SE.ini
  Update pt-BR.ini
  Update lv-LV.ini
  Update fa-IR.ini
  ...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet