[dev/core#3029] Avoid risking a TypeError when evaluating tokens for non-existent custom fields #22537
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
Fix for core/dev#3029
Before
Evaluating tokens for non-existent custom fields fails with a 500
TypeError
.After
No error.
Technical Details
Due to type hinting in
CRM_Core_EntityTokens::getCustomFieldName()
aTypeError
was being issued when the custom field in question did not exist. Instead, an exception is now being thrown, which is being caught in the currently only calling methodCRM_Core_EntityTokens::getCustomFieldValue()
which returnsNULL
instead of a formatted custom field value.Comments
Maybe simply returning
NULL
(with PHP 7.1 supporting nullable return types) is easier? @eileenmcnaughton