dev/core#560 Replace instances of CRM_Core_Error::fatal with Exceptio… #15941
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)
|
seamuslee001
force-pushed
the
dev_core_560_sms
branch
from
67cb76e
to
c364214
Compare
CRM/SMS/Form/Provider.php
Outdated
| @@ -113,8 +113,12 @@ public function setDefaultValues() { | |||
| $name = CRM_Utils_Request::retrieve('key', 'String', $this, FALSE, NULL); | |||
| if ($name) { | |||
| $defaults['name'] = $name; | |||
| $provider = CRM_SMS_Provider::singleton(['provider' => $name]); | |||
| $defaults['api_url'] = $provider->_apiURL; | |||
| try { | |||
There was a problem hiding this comment.
So my hesitation is around this one & the next one which adds handling. The previous behaviour here was a fatal when the provider was invalid. Without the catch here the form layer would give the equivalent of that - but with the catch it seems an obscure edge case bug would be ignored
CRM/SMS/Page/Callback.php
Outdated
| try { | ||
| $provider = CRM_SMS_Provider::singleton($_REQUEST); | ||
| } | ||
| catch (CRM_Core_exception $e) { |
There was a problem hiding this comment.
Also here - we are adding handling for what appears to be an obscure edge case bug where the no-change would be to leave it uncaught
…ns or Status bounces in SMS processing and appropriately handle error after
seamuslee001
force-pushed
the
dev_core_560_sms
branch
from
c364214
to
4a0e3fe
Compare
|
ok @eileenmcnaughton i have reverted the changes in those 2 places |
|
looks good now |
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.
…ns or Status bounces in SMS processing and appropriately handle error after
Overview
This replaces instances of
CRM_Core_Error::fatalin the SMS subsystem with CRM_Core_Exceptions or CRM_Core_Error::statusBounce as appropriate and updates the relevant functions to handle the change in error handlingBefore
Legacy function used
After
Modern functions used
ping @eileenmcnaughton @mattwire