[NFC] Minor code cleanup #16823
Merged
[NFC] Minor code cleanup #16823
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)
|
| */ | ||
| function civicrm_api3_contact_delete($params) { | ||
| $contactID = CRM_Utils_Array::value('id', $params); | ||
| $contactID = (int) $params['id']; |
There was a problem hiding this comment.
Required param so we don't need to check it - must be an int so let's cast to one before passing on
| @@ -466,15 +469,13 @@ function civicrm_api3_contact_delete($params) { | |||
| // restrict permanent delete if a contact has financial trxn associated with it | |||
| $error = NULL; | |||
| if ($skipUndelete && CRM_Financial_BAO_FinancialItem::checkContactPresent([$contactID], $error)) { | |||
| return civicrm_api3_create_error($error['_qf_default']); | |||
| throw new API_Exception($error['_qf_default']); | |||
There was a problem hiding this comment.
@eileenmcnaughton i note here your throwing an \API_Exception where your otherwise throwing a \CiviCRM_API3_Exception which one should it be?
There was a problem hiding this comment.
I was actually just noticing that - I think API_Exception is right - not for a great logical reason - just more consistent. The other is thrown by the wrapper
Fix some exception declaration, comparisons, handling for non-present param
eileenmcnaughton
force-pushed
the
cont_api
branch
from
2449677 to
17d8f8a
Compare
|
Agree with the cleanup |
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
Fix some exception declaration, comparisons, handling for non-present param
Before
Exceptions not in comment blocks, single quotes where doubles are OK, handling for param that can't be null
After
Above cleaned up
Technical Details
Comments