[REF] Remove duplicate checks for an array key existing #17069
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(Standard links)
|
colemanw
force-pushed
the
removeUselessChecks
branch
from
96f04a3 to
2cfe2cf
Compare
|
retest this please |
artfulrobot
reviewed
Apr 15, 2020
| $customValueCount = $form->_submitValues['hidden_custom_group_count'] ?? NULL; | ||
| if (is_array($customValueCount)) { | ||
| if (array_key_exists(0, $customValueCount)) { | ||
| unset($customValueCount[0]); |
There was a problem hiding this comment.
I don't know what the keys of customValueCount are or why we're unsetting 0? Can't we just array_shift($customValueCount)?
There was a problem hiding this comment.
I don't know what this code does either :/
But at least it's more readable now.
artfulrobot
reviewed
Apr 15, 2020
| @@ -388,17 +388,15 @@ public function alterDisplay(&$rows) { | |||
| } | |||
|
|
|||
| if (array_key_exists('civicrm_worldregion_name', $values)) { | |||
| $region = $values['civicrm_worldregion_name'] ?? NULL; | |||
| $region = ($region) ? $region : 'Unassigned'; | |||
| $region = $values['civicrm_worldregion_name'] ?: 'Unassigned'; | |||
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
artfulrobot
reviewed
Apr 15, 2020
| else { | ||
| $queue_id = $_GET['q'] ?? NULL; | ||
| } | ||
| $queue_id = $_GET['qid'] ?? $_GET['q'] ?? NULL; |
There was a problem hiding this comment.
Love that we're supporting CiviCRM <1.7!
|
@colemanw Wow what a lot of crud you cleaned up - thanks! (CiviCRM Review Template DEL-1.2)
|
|
Thanks so much for the review @artfulrobot ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Code cleanup - fixes up situations where we check if an array key exists, and then immediately check again.
Before
Double check, first in a conditional, then again with
CRM_Utils_Array::valueor coalesce.After
Removed second check. Once is enough.