Skip to content

Commit 472dcfe

Browse files
jbrooksukjbrooksuk
authored
Merge pull request #2036 from CachetHQ/analysis-8KggM3
Applied fixes from StyleCI [ci skip] [skip ci]
2 parents 7548ae7 + 77409ab commit 472dcfe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+268
-268
lines changed

‎app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ public function notify(IncidentWasReportedEvent $event, $subscriber)
106106
$component = AutoPresenter::decorate($event->incident->component);
107107

108108
$mail = [
109-
'email' => $subscriber->email,
110-
'subject' => trans('cachet.subscriber.email.incident.subject', [
109+
'email' => $subscriber->email,
110+
'subject' => trans('cachet.subscriber.email.incident.subject', [
111111
'status' => $incident->human_status,
112112
'name' => $incident->name,
113113
]),

‎app/Bus/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ public function notify(MaintenanceWasScheduledEvent $event, $subscriber)
106106
$component = AutoPresenter::decorate($event->incident->component);
107107

108108
$mail = [
109-
'email' => $subscriber->email,
110-
'subject' => trans('cachet.subscriber.email.maintenance.subject', [
111-
'name' => $incident->name,
109+
'email' => $subscriber->email,
110+
'subject' => trans('cachet.subscriber.email.maintenance.subject', [
111+
'name' => $incident->name,
112112
]),
113113
'has_component' => ($event->incident->component) ? true : false,
114114
'component_name' => $component ? $component->name : null,

‎app/Bus/Handlers/Events/Subscriber/SendSubscriberVerificationEmailHandler.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public function __construct(MailQueue $mailer)
4646
public function handle(SubscriberHasSubscribedEvent $event)
4747
{
4848
$mail = [
49-
'email' => $event->subscriber->email,
50-
'subject' => 'Confirm your subscription.',
51-
'link' => route('subscribe.verify', ['code' => $event->subscriber->verify_code]),
49+
'email' => $event->subscriber->email,
50+
'subject' => 'Confirm your subscription.',
51+
'link' => route('subscribe.verify', ['code' => $event->subscriber->verify_code]),
5252
];
5353

5454
$this->mailer->queue([

‎app/Bus/Handlers/Events/User/SendInviteUserEmailHandler.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public function __construct(MailQueue $mailer)
4646
public function handle(UserWasInvitedEvent $event)
4747
{
4848
$mail = [
49-
'email' => $event->invite->email,
50-
'subject' => 'You have been invited.',
51-
'link' => route('signup.invite', ['code' => $event->invite->code]),
49+
'email' => $event->invite->email,
50+
'subject' => 'You have been invited.',
51+
'link' => route('signup.invite', ['code' => $event->invite->code]),
5252
];
5353

5454
$this->mailer->queue([

‎app/Http/Controllers/SetupController.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ class SetupController extends Controller
4848
* @var string[]
4949
*/
5050
protected $mailDrivers = [
51-
'smtp' => 'SMTP',
52-
'mail' => 'Mail',
53-
'sendmail' => 'Sendmail',
54-
'mailgun' => 'Mailgun',
55-
'mandrill' => 'Mandrill',
51+
'smtp' => 'SMTP',
52+
'mail' => 'Mail',
53+
'sendmail' => 'Sendmail',
54+
'mailgun' => 'Mailgun',
55+
'mandrill' => 'Mandrill',
5656
// 'ses' => 'Amazon SES', this will be available only if aws/aws-sdk-php is installed
5757
'sparkpost' => 'SparkPost',
5858
'log' => 'Log (Testing)',

‎app/Http/Routes/DashboardRoutes.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ public function map(Registrar $router)
131131
$router->delete('{incident_template}/delete', 'IncidentController@deleteTemplateAction');
132132
});
133133

134-
$router->group(['as' => 'subscribers.', 'prefix' => 'subscribers'], function (Registrar $router) {
134+
$router->group(['as' => 'subscribers.', 'prefix' => 'subscribers'], function (Registrar $router) {
135135
$router->get('/', [
136136
'as' => 'index',
137137
'uses' => 'SubscriberController@showSubscribers',
@@ -144,7 +144,7 @@ public function map(Registrar $router)
144144
$router->delete('{subscriber}/delete', 'SubscriberController@deleteSubscriberAction');
145145
});
146146

147-
$router->group(['as' => 'metrics.', 'prefix' => 'metrics'], function (Registrar $router) {
147+
$router->group(['as' => 'metrics.', 'prefix' => 'metrics'], function (Registrar $router) {
148148
$router->get('/', [
149149
'as' => 'index',
150150
'uses' => 'MetricController@showMetrics',

‎config/app.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@
233233
'Validator' => 'Illuminate\Support\Facades\Validator',
234234
'View' => 'Illuminate\Support\Facades\View',
235235

236-
'Binput' => 'GrahamCampbell\Binput\Facades\Binput',
237-
'Str' => 'Illuminate\Support\Str',
236+
'Binput' => 'GrahamCampbell\Binput\Facades\Binput',
237+
'Str' => 'Illuminate\Support\Str',
238238

239239
],
240240

‎config/database.php‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,25 +76,25 @@
7676
],
7777

7878
'pgsql' => [
79-
'driver' => 'pgsql',
80-
'host' => env('DB_HOST', null),
81-
'database' => env('DB_DATABASE', null),
82-
'username' => env('DB_USERNAME', null),
83-
'password' => env('DB_PASSWORD', null),
84-
'port' => env('DB_PORT', '5432'),
85-
'charset' => 'utf8',
86-
'prefix' => env('DB_PREFIX', null),
87-
'schema' => env('DB_SCHEMA', 'public'),
79+
'driver' => 'pgsql',
80+
'host' => env('DB_HOST', null),
81+
'database' => env('DB_DATABASE', null),
82+
'username' => env('DB_USERNAME', null),
83+
'password' => env('DB_PASSWORD', null),
84+
'port' => env('DB_PORT', '5432'),
85+
'charset' => 'utf8',
86+
'prefix' => env('DB_PREFIX', null),
87+
'schema' => env('DB_SCHEMA', 'public'),
8888
],
8989

9090
'sqlsrv' => [
91-
'driver' => 'sqlsrv',
92-
'host' => env('DB_HOST', null),
93-
'database' => env('DB_DATABASE', null),
94-
'username' => env('DB_USERNAME', null),
95-
'password' => env('DB_PASSWORD', null),
96-
'port' => env('DB_PORT', null),
97-
'prefix' => env('DB_PREFIX', null),
91+
'driver' => 'sqlsrv',
92+
'host' => env('DB_HOST', null),
93+
'database' => env('DB_DATABASE', null),
94+
'username' => env('DB_USERNAME', null),
95+
'password' => env('DB_PASSWORD', null),
96+
'port' => env('DB_PORT', null),
97+
'prefix' => env('DB_PREFIX', null),
9898
],
9999

100100
],

‎config/langs.php‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,91 +11,91 @@
1111

1212
return [
1313
// Enabled langs
14-
'af' => [
14+
'af' => [
1515
'name' => 'Afrikaans',
1616
'subset' => 'latin',
1717
],
18-
'ar' => [
18+
'ar' => [
1919
'name' => 'Arabic',
2020
'subset' => 'latin',
2121
],
22-
'ca' => [
22+
'ca' => [
2323
'name' => 'Catalan',
2424
'subset' => 'latin',
2525
],
26-
'cs' => [
26+
'cs' => [
2727
'name' => 'Czech',
2828
'subset' => 'latin,latin-ext',
2929
],
30-
'da' => [
30+
'da' => [
3131
'name' => 'Danish',
3232
'subset' => 'latin,latin-ext',
3333
],
34-
'de' => [
34+
'de' => [
3535
'name' => 'Deutsch',
3636
'subset' => 'latin,latin-ext',
3737
],
38-
'el' => [
38+
'el' => [
3939
'name' => 'Greek',
4040
'subset' => 'greek,greek-ext',
4141
],
42-
'en' => [
42+
'en' => [
4343
'name' => 'English',
4444
'subset' => 'latin',
4545
],
4646
'en-UD' => [
4747
'name' => 'CrowdIn - InContext Localization',
4848
'subset' => 'latin',
4949
],
50-
'es' => [
50+
'es' => [
5151
'name' => 'Español',
5252
'subset' => 'latin,latin-ext',
5353
],
54-
'fa' => [
54+
'fa' => [
5555
'name' => 'Persian',
5656
'subset' => 'latin',
5757
],
58-
'fi' => [
58+
'fi' => [
5959
'name' => 'Finnish',
6060
'subset' => 'latin,latin-ext',
6161
],
62-
'fr' => [
62+
'fr' => [
6363
'name' => 'Français',
6464
'subset' => 'latin,latin-ext',
6565
],
66-
'he' => [
66+
'he' => [
6767
'name' => 'Hebrew',
6868
'subset' => 'latin',
6969
],
70-
'hu' => [
70+
'hu' => [
7171
'name' => 'Hungarian',
7272
'subset' => 'latin,latin-ext',
7373
],
74-
'id' => [
74+
'id' => [
7575
'name' => 'Indonesian',
7676
'subset' => 'latin',
7777
],
78-
'it' => [
78+
'it' => [
7979
'name' => 'Italiano',
8080
'subset' => 'latin,latin-ext',
8181
],
82-
'ja' => [
82+
'ja' => [
8383
'name' => 'Japanese',
8484
'subset' => 'latin',
8585
],
86-
'ko' => [
86+
'ko' => [
8787
'name' => '한글',
8888
'subset' => 'latin',
8989
],
90-
'nl' => [
90+
'nl' => [
9191
'name' => 'Nederlands',
9292
'subset' => 'latin,latin-ext',
9393
],
94-
'no' => [
94+
'no' => [
9595
'name' => 'Norwegian',
9696
'subset' => 'latin,latin-ext',
9797
],
98-
'pl' => [
98+
'pl' => [
9999
'name' => 'Polski',
100100
'subset' => 'latin,latin-ext',
101101
],
@@ -107,35 +107,35 @@
107107
'name' => 'Portuguese, Portugal',
108108
'subset' => 'latin,latin-ext',
109109
],
110-
'ro' => [
110+
'ro' => [
111111
'name' => 'Romanian',
112112
'subset' => 'latin,latin-ext',
113113
],
114-
'ru' => [
114+
'ru' => [
115115
'name' => 'Русский',
116116
'subset' => 'latin,cyrillic',
117117
],
118-
'sq' => [
118+
'sq' => [
119119
'name' => 'Albanian',
120120
'subset' => 'latin,latin-ext',
121121
],
122-
'sr' => [
122+
'sr' => [
123123
'name' => 'Sebrian (Cyrillic)',
124124
'subset' => 'latin,cyrillic,cyrillic-ext',
125125
],
126126
'sv-SE' => [
127127
'name' => 'Swedish',
128128
'subset' => 'latin,latin-ext',
129129
],
130-
'tr' => [
130+
'tr' => [
131131
'name' => 'Turkish',
132132
'subset' => 'latin,latin-ext',
133133
],
134-
'uk' => [
134+
'uk' => [
135135
'name' => 'Ukranian',
136136
'subset' => 'latin,cyrillic-ext',
137137
],
138-
'vi' => [
138+
'vi' => [
139139
'name' => 'Vietnamese',
140140
'subset' => 'latin,vietnamese',
141141
],

‎resources/lang/af/cachet.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
'users' => [
104104
'email' => [
105105
'invite' => [
106-
'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name",
107-
'html' => '<p>You have been invited to the team :app_name status page, to sign up follow the next link.</p><p><a href=":link">:link</a></p><p>Thank you, :app_name</p>',
106+
'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name",
107+
'html' => '<p>You have been invited to the team :app_name status page, to sign up follow the next link.</p><p><a href=":link">:link</a></p><p>Thank you, :app_name</p>',
108108
],
109109
],
110110
],

0 commit comments

Comments
 (0)