amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

build(deps-dev): bump vimeo/psalm from 2.0.10 to 2.0.11 (#1774)

Browse Source 
* build(deps-dev): bump vimeo/psalm from 2.0.10 to 2.0.11

Bumps [vimeo/psalm](https://github.com/vimeo/psalm) from 2.0.10 to 2.0.11.
- [Release notes](https://github.com/vimeo/psalm/releases)
- [Changelog](https://github.com/vimeo/psalm/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vimeo/psalm/compare/2.0.10...2.0.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>

* Initialize errorMessage variable
This commit is contained in:
dependabot[bot]
2018-09-04 21:33:28 +02:00
committed by Alexis Saettler
parent d409c95955
commit 37ee26af33
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Settings/SubscriptionsController.php
+7 -6
View File
@@ -137,6 +137,7 @@ class SubscriptionsController extends Controller
$stripeToken = $request->input('stripeToken');
$plan = InstanceHelper::getPlanInformationFromConfig($request->input('plan'));
$errorMessage = '';
try {
auth()->user()->account->newSubscription($plan['name'], $plan['id'])
@@ -149,24 +150,24 @@ class SubscriptionsController extends Controller
// Since it's a decline, \Stripe\Error\Card will be caught
$body = $e->getJsonBody();
$err = $body['error'];
$message = trans('settings.stripe_error_card', ['message' => $err['message']]);
$errorMessage = trans('settings.stripe_error_card', ['message' => $err['message']]);
} catch (\Stripe\Error\RateLimit $e) {
// Too many requests made to the API too quickly
$message = trans('settings.stripe_error_rate_limit');
$errorMessage = trans('settings.stripe_error_rate_limit');
} catch (\Stripe\Error\Authentication $e) {
// Authentication with Stripe's API failed
// (maybe you changed API keys recently)
$message = trans('settings.stripe_error_authentication');
$errorMessage = trans('settings.stripe_error_authentication');
} catch (\Stripe\Error\ApiConnection $e) {
// Network communication with Stripe failed
$message = trans('settings.stripe_error_api_connection_error');
$errorMessage = trans('settings.stripe_error_api_connection_error');
} catch (\Stripe\Error\Base $e) {
$message = $e->getMessage();
$errorMessage = $e->getMessage();
}
return back()
->withInput()
->withErrors($message);
->withErrors($errorMessage);
}
/**