dev/core#2568 Avoid PHP warnings #20178
Closed
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)
|
| @@ -5297,8 +5297,9 @@ public static function getContributionTokenValues($id, $messageToken) { | |||
| $result = civicrm_api3('Contribution', 'get', ['id' => $id]); | |||
| // lab.c.o mail#46 - show labels, not values, for custom fields with option values. | |||
| if (!empty($messageToken)) { | |||
| $messageTokenContribution = CRM_Utils_Array::value('contribution', $messageToken); | |||
There was a problem hiding this comment.
Suggested change
| $messageTokenContribution = CRM_Utils_Array::value('contribution', $messageToken); | |
| $messageTokenContribution = CRM_Utils_Array::value('contribution', $messageToken, []); |
given we are using an array function we probably should return an array by default rather than NULL
There was a problem hiding this comment.
Thanks, that's a very good point. Seems like a was a little too quick to respond :)
There was a problem hiding this comment.
@bjendres Also we should use the coalesce operator instead of the CRM_Utils_Array::value() function.
Eg.
$messageTokenContribution = $messageToken['contribution'] ?? [];
eileenmcnaughton
added a commit
to eileenmcnaughton/civicrm-core
that referenced
this pull request
Apr 29, 2021
Same as civicrm#20178 but with a test (and a couple of changes to support that)
|
I added a test for this here #20188 - it includes a slightly different version of this fix but it might be nicer to merge this & only merge that for the test |
|
Closed in favour of (WIP) #20188 |
eileenmcnaughton
added a commit
to eileenmcnaughton/civicrm-core
that referenced
this pull request
Apr 29, 2021
Same as civicrm#20178 but with a test (and a couple of changes to support that)
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
Just trying to get rid of PHP warnings, see https://lab.civicrm.org/dev/core/-/issues/2568