diff --git a/app/Bus/Commands/Subscriber/SubscribeSubscriberCommand.php b/app/Bus/Commands/Subscriber/SubscribeSubscriberCommand.php index a9e7b55f..9b94b247 100644 --- a/app/Bus/Commands/Subscriber/SubscribeSubscriberCommand.php +++ b/app/Bus/Commands/Subscriber/SubscribeSubscriberCommand.php @@ -44,8 +44,8 @@ final class SubscribeSubscriberCommand /** * Create a new subscribe subscriber command instance. * - * @param string $email - * @param bool $verified + * @param string $email + * @param bool $verified * * @return void */ diff --git a/app/Bus/Handlers/Events/Component/SendComponentUpdateEmailNotificationHandler.php b/app/Bus/Handlers/Events/Component/SendComponentUpdateEmailNotificationHandler.php index 960e32db..868ec8af 100644 --- a/app/Bus/Handlers/Events/Component/SendComponentUpdateEmailNotificationHandler.php +++ b/app/Bus/Handlers/Events/Component/SendComponentUpdateEmailNotificationHandler.php @@ -12,8 +12,8 @@ namespace CachetHQ\Cachet\Bus\Handlers\Events\Component; use CachetHQ\Cachet\Bus\Events\Component\ComponentWasUpdatedEvent; -use CachetHQ\Cachet\Models\Subscriber; use CachetHQ\Cachet\Models\Component; +use CachetHQ\Cachet\Models\Subscriber; use Illuminate\Contracts\Mail\MailQueue; use Illuminate\Mail\Message; use McCool\LaravelAutoPresenter\Facades\AutoPresenter; @@ -37,7 +37,7 @@ class SendComponentUpdateEmailNotificationHandler /** * Create a new send incident email notification handler. * - * @param \Illuminate\Contracts\Mail\Mailer $mailer + * @param \Illuminate\Contracts\Mail\Mailer $mailer * @param \CachetHQ\Cachet\Models\Subscriber $subscriber * * @return void diff --git a/app/Http/Controllers/Dashboard/IncidentController.php b/app/Http/Controllers/Dashboard/IncidentController.php index 3acb41c5..9a6097ed 100644 --- a/app/Http/Controllers/Dashboard/IncidentController.php +++ b/app/Http/Controllers/Dashboard/IncidentController.php @@ -121,6 +121,7 @@ class IncidentController extends Controller )); } catch (ValidationException $e) { dd($e->getMessageBag()); + return Redirect::route('dashboard.incidents.add') ->withInput(Binput::all()) ->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('dashboard.incidents.add.failure'))) diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php index 451928db..6467dde4 100644 --- a/app/Http/Controllers/SubscribeController.php +++ b/app/Http/Controllers/SubscribeController.php @@ -17,7 +17,6 @@ use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriberCommand; use CachetHQ\Cachet\Bus\Commands\Subscriber\UnsubscribeSubscriptionCommand; use CachetHQ\Cachet\Bus\Commands\Subscriber\UpdateSubscriberSubscriptionCommand; use CachetHQ\Cachet\Bus\Commands\Subscriber\VerifySubscriberCommand; -use CachetHQ\Cachet\Bus\Exceptions\Subscriber\AlreadySubscribedException; use CachetHQ\Cachet\Models\Component; use CachetHQ\Cachet\Models\Subscriber; use CachetHQ\Cachet\Models\Subscription; @@ -182,6 +181,7 @@ class SubscribeController extends Controller dispatch(new UpdateSubscriberSubscriptionCommand($subscriber, Binput::get('subscriptions'))); } catch (ValidationException $e) { dd($e->getMessageBag()); + return Redirect::route('subscribe.manage', $subscriber->verify_code) ->withInput(Binput::all()) ->withTitle(sprintf('%s %s', trans('dashboard.notifications.whoops'), trans('cachet.subscriber.email.failure'))) diff --git a/database/migrations/2016_04_29_061916_AlterTableSubscribersAddGlobalColumn.php b/database/migrations/2016_04_29_061916_AlterTableSubscribersAddGlobalColumn.php index 0b828622..5646703a 100644 --- a/database/migrations/2016_04_29_061916_AlterTableSubscribersAddGlobalColumn.php +++ b/database/migrations/2016_04_29_061916_AlterTableSubscribersAddGlobalColumn.php @@ -1,7 +1,16 @@