From 72056e2ac5420595ccba8701cc02c8b9a0c55099 Mon Sep 17 00:00:00 2001 From: James Brooks Date: Fri, 25 Nov 2016 20:34:58 +0000 Subject: [PATCH] Rename formattedMessage into snake_case for consistency --- .../Events/Incident/SendIncidentEmailNotificationHandler.php | 2 +- .../Events/Schedule/SendScheduleEmailNotificationHandler.php | 2 +- app/Presenters/IncidentPresenter.php | 4 ++-- app/Presenters/IncidentUpdatePresenter.php | 4 ++-- app/Presenters/SchedulePresenter.php | 2 +- resources/views/partials/incident.blade.php | 2 +- resources/views/partials/schedule.blade.php | 2 +- resources/views/single-incident.blade.php | 4 ++-- resources/views/single-schedule.blade.php | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php b/app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php index 13a6e68d..cef908d9 100644 --- a/app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php +++ b/app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php @@ -116,7 +116,7 @@ class SendIncidentEmailNotificationHandler 'name' => $incident->name, 'timestamp' => $incident->occurred_at_formatted, 'status' => $incident->human_status, - 'html_content' => $incident->formattedMessage, + 'html_content' => $incident->formatted_message, 'text_content' => $incident->message, 'token' => $subscriber->token, 'manage_link' => cachet_route('subscribe.manage', [$subscriber->verify_code]), diff --git a/app/Bus/Handlers/Events/Schedule/SendScheduleEmailNotificationHandler.php b/app/Bus/Handlers/Events/Schedule/SendScheduleEmailNotificationHandler.php index 6929934b..45d485f6 100644 --- a/app/Bus/Handlers/Events/Schedule/SendScheduleEmailNotificationHandler.php +++ b/app/Bus/Handlers/Events/Schedule/SendScheduleEmailNotificationHandler.php @@ -105,7 +105,7 @@ class SendScheduleEmailNotificationHandler 'name' => $incident->name, 'timestamp' => $incident->scheduled_at_formatted, 'status' => $incident->human_status, - 'html_content' => $incident->formattedMessage, + 'html_content' => $incident->formatted_message, 'text_content' => $incident->message, 'token' => $subscriber->token, 'manage_link' => cachet_route('subscribe.manage', [$subscriber->verify_code]), diff --git a/app/Presenters/IncidentPresenter.php b/app/Presenters/IncidentPresenter.php index cb790c62..5676368b 100644 --- a/app/Presenters/IncidentPresenter.php +++ b/app/Presenters/IncidentPresenter.php @@ -62,7 +62,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable * * @return string */ - public function formattedMessage() + public function formatted_message() { return Markdown::convertToHtml($this->wrappedObject->message); } @@ -74,7 +74,7 @@ class IncidentPresenter extends BasePresenter implements Arrayable */ public function raw_message() { - return strip_tags($this->formattedMessage()); + return strip_tags($this->formatted_message()); } /** diff --git a/app/Presenters/IncidentUpdatePresenter.php b/app/Presenters/IncidentUpdatePresenter.php index 2a5530e6..12537f74 100644 --- a/app/Presenters/IncidentUpdatePresenter.php +++ b/app/Presenters/IncidentUpdatePresenter.php @@ -32,7 +32,7 @@ class IncidentUpdatePresenter extends BasePresenter implements Arrayable * * @return string */ - public function formattedMessage() + public function formatted_message() { return Markdown::convertToHtml($this->wrappedObject->message); } @@ -44,7 +44,7 @@ class IncidentUpdatePresenter extends BasePresenter implements Arrayable */ public function raw_message() { - return strip_tags($this->formattedMessage()); + return strip_tags($this->formatted_message()); } /** diff --git a/app/Presenters/SchedulePresenter.php b/app/Presenters/SchedulePresenter.php index 42c13bbd..ad6a559d 100644 --- a/app/Presenters/SchedulePresenter.php +++ b/app/Presenters/SchedulePresenter.php @@ -54,7 +54,7 @@ class SchedulePresenter extends BasePresenter implements Arrayable * * @return string */ - public function formattedMessage() + public function formatted_message() { return Markdown::convertToHtml($this->wrappedObject->message); } diff --git a/resources/views/partials/incident.blade.php b/resources/views/partials/incident.blade.php index 78285253..4b11a063 100644 --- a/resources/views/partials/incident.blade.php +++ b/resources/views/partials/incident.blade.php @@ -20,7 +20,7 @@
- {!! $incident->formattedMessage !!} + {!! $incident->formatted_message !!}
@if($incident->updates->count())
diff --git a/resources/views/partials/schedule.blade.php b/resources/views/partials/schedule.blade.php index 912a58ad..f447cd15 100644 --- a/resources/views/partials/schedule.blade.php +++ b/resources/views/partials/schedule.blade.php @@ -7,7 +7,7 @@ @foreach($scheduled_maintenance as $schedule) {{ $schedule->name }} - {!! $schedule->formattedMessage !!} + {!! $schedule->formatted_message !!} @if($schedule->components->count() > 0)
@foreach($schedule->components as $affected_component) diff --git a/resources/views/single-incident.blade.php b/resources/views/single-incident.blade.php index 5fb2f94b..69654f93 100644 --- a/resources/views/single-incident.blade.php +++ b/resources/views/single-incident.blade.php @@ -12,7 +12,7 @@
- {!! $incident->formattedMessage !!} + {!! $incident->formatted_message !!}
@if($incident->updates) @@ -30,7 +30,7 @@
- {!! $update->formattedMessage !!} + {!! $update->formatted_message !!}
diff --git a/resources/views/single-schedule.blade.php b/resources/views/single-schedule.blade.php index 6758ff9e..f85095d8 100644 --- a/resources/views/single-schedule.blade.php +++ b/resources/views/single-schedule.blade.php @@ -24,7 +24,7 @@ {{ $schedule->name }}{{ trans("cachet.incidents.scheduled_at", ["timestamp" => $schedule->scheduled_at_diff]) }}
- {!! $schedule->formattedMessage !!} + {!! $schedule->formatted_message !!}