From 686ba076d23fa02f9b7aef4818a561eb685b7f2f Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 1 Apr 2020 10:44:29 +0000 Subject: [PATCH 1/2] Bump es5-shim from 4.5.13 to 4.5.14 Bumps [es5-shim](https://github.com/es-shims/es5-shim) from 4.5.13 to 4.5.14. - [Release notes](https://github.com/es-shims/es5-shim/releases) - [Changelog](https://github.com/es-shims/es5-shim/blob/master/CHANGELOG.md) - [Commits](https://github.com/es-shims/es5-shim/compare/v4.5.13...v4.5.14) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 7ccb350f59d1..0f5dc2015c77 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "bootstrap-sass": "^3.4.1", "chart.js": "^2.8.0", "cross-env": "^5.1", - "es5-shim": "^4.5.9", + "es5-shim": "^4.5.14", "flatpickr": "^4.5.7", "github-markdown-css": "^2.3.0", "ionicons": "~2.0", diff --git a/yarn.lock b/yarn.lock index b3b1b3811eac..26dcc0be6e91 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2161,10 +2161,10 @@ es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: es6-symbol "~3.1.1" next-tick "^1.0.0" -es5-shim@^4.5.9: - version "4.5.13" - resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.13.tgz#5d88062de049f8969f83783f4a4884395f21d28b" - integrity sha512-xi6hh6gsvDE0MaW4Vp1lgNEBpVcCXRWfPXj5egDvtgLz4L9MEvNwYEMdJH+JJinWkwa8c3c3o5HduV7dB/e1Hw== +es5-shim@^4.5.14: + version "4.5.14" + resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.5.14.tgz#90009e1019d0ea327447cb523deaff8fe45697ef" + integrity sha512-7SwlpL+2JpymWTt8sNLuC2zdhhc+wrfe5cMPI2j0o6WsPdfAiPwmFy2f0AocPB4RQVBOZ9kNTgi5YF7TdhkvEg== es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.3: version "2.0.3" @@ -4525,6 +4525,11 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +opencollective-postinstall@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" + integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== + opn@^5.1.0: version "5.5.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc" From 03092466f59c67d4208a37ef24c75bf9cdf287b0 Mon Sep 17 00:00:00 2001 From: Cachet Bot Date: Wed, 1 Apr 2020 10:44:53 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- app/Http/Controllers/StatusPageController.php | 4 ++-- app/Http/Controllers/SubscribeController.php | 8 ++++++-- .../Component/ComponentStatusWasChangedEventTest.php | 1 + tests/Functional/Notifications/MailTest.php | 9 ++++++--- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/StatusPageController.php b/app/Http/Controllers/StatusPageController.php index 712fd9c14c7e..9ae37c8b8d70 100644 --- a/app/Http/Controllers/StatusPageController.php +++ b/app/Http/Controllers/StatusPageController.php @@ -101,8 +101,8 @@ public function showIndex() $endDate->format('Y-m-d').' 00:00:00', $startDate->format('Y-m-d').' 23:59:59', ])->orderBy('occurred_at', 'desc')->get()->groupBy(function (Incident $incident) { - return app(DateFactory::class)->make($incident->occurred_at)->toDateString(); - }); + return app(DateFactory::class)->make($incident->occurred_at)->toDateString(); + }); if (!$onlyDisruptedDays) { $incidentDays = array_pad([], $appIncidentDays, null); diff --git a/app/Http/Controllers/SubscribeController.php b/app/Http/Controllers/SubscribeController.php index 8527217be176..afa866a9610e 100644 --- a/app/Http/Controllers/SubscribeController.php +++ b/app/Http/Controllers/SubscribeController.php @@ -94,8 +94,12 @@ public function postSubscribe() $subscription->notify(new ManageSubscriptionNotification()); return redirect()->back()->withSuccess( - sprintf('%s %s', trans('dashboard.notifications.awesome'), - trans('cachet.subscriber.email.manage_subscription'))); + sprintf( + '%s %s', + trans('dashboard.notifications.awesome'), + trans('cachet.subscriber.email.manage_subscription') + ) + ); } /** diff --git a/tests/Bus/Events/Component/ComponentStatusWasChangedEventTest.php b/tests/Bus/Events/Component/ComponentStatusWasChangedEventTest.php index 03ff21ba1ef2..a6a15ddaf6dd 100644 --- a/tests/Bus/Events/Component/ComponentStatusWasChangedEventTest.php +++ b/tests/Bus/Events/Component/ComponentStatusWasChangedEventTest.php @@ -26,6 +26,7 @@ class ComponentStatusWasChangedEventTest extends AbstractComponentEventTestCase { use DatabaseMigrations; use InteractsWithMail; + public function testComponentUpdateEmailWasSent() { $user = factory('CachetHQ\Cachet\Models\User')->create(); diff --git a/tests/Functional/Notifications/MailTest.php b/tests/Functional/Notifications/MailTest.php index 10449a85c8d0..59c5d0900896 100644 --- a/tests/Functional/Notifications/MailTest.php +++ b/tests/Functional/Notifications/MailTest.php @@ -137,7 +137,8 @@ public function testEmailNotificationSentForNewIncident() ]); Notification::assertSentTo( - [$subscriber], NewIncidentNotification::class + [$subscriber], + NewIncidentNotification::class ); } @@ -161,7 +162,8 @@ public function testEmailNotificationNotSentWhenNotifyNotCheckedForNewIncident() ]); Notification::assertNotSentTo( - [$subscriber], NewIncidentNotification::class + [$subscriber], + NewIncidentNotification::class ); } @@ -184,7 +186,8 @@ public function testEmailNotificationSentForIncidentUpdate() ]); Notification::assertSentTo( - [$subscriber], IncidentUpdatedNotification::class + [$subscriber], + IncidentUpdatedNotification::class ); } }