From 4fb8ce31b0f3512a52af95c073fe4f821173aec1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Jul 2022 17:09:53 +0000 Subject: [PATCH 1/2] Bump jquery-ui from 1.12.1 to 1.13.2 Bumps [jquery-ui](https://github.com/jquery/jquery-ui) from 1.12.1 to 1.13.2. - [Release notes](https://github.com/jquery/jquery-ui/releases) - [Commits](https://github.com/jquery/jquery-ui/compare/1.12.1...1.13.2) --- updated-dependencies: - dependency-name: jquery-ui dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- package-lock.json | 12 +++++++----- package.json | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index ce73f4e..e187bed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5354,13 +5354,15 @@ "jquery": { "version": "3.4.1", "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz", - "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==", - "dev": true + "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==" }, "jquery-ui": { - "version": "1.12.1", - "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz", - "integrity": "sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE=" + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.13.2.tgz", + "integrity": "sha512-wBZPnqWs5GaYJmo1Jj0k/mrSkzdQzKDwhXNtHKcBdAcKVxMM3KNYFq+iJ2i1rwiG53Z8M4mTn3Qxrm17uH1D4Q==", + "requires": { + "jquery": ">=1.8.0 <4.0.0" + } }, "jquery-ui-dist": { "version": "1.12.1", diff --git a/package.json b/package.json index 9ff15f9..20a7519 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "array-unique": "^0.3.2", "flatten": "^1.0.3", "fullcalendar": "^3.10.1", - "jquery-ui": "^1.12.1", + "jquery-ui": "^1.13.2", "jquery-ui-dist": "^1.12.1", "jquery.maskedinput": "^1.4.1", "moment": "^2.24.0", From c653fd9aa84bd1aa700ac6e9694f5527240e2def Mon Sep 17 00:00:00 2001 From: StyleCI Bot Date: Mon, 18 Jul 2022 17:10:01 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- app/Http/Controllers/API/FeedController.php | 2 +- app/Track.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/API/FeedController.php b/app/Http/Controllers/API/FeedController.php index cb140de..d24d99f 100644 --- a/app/Http/Controllers/API/FeedController.php +++ b/app/Http/Controllers/API/FeedController.php @@ -36,7 +36,7 @@ public function now() /** * Computes the Digital Signage Feeds. * - * @return Array + * @return array */ public function signage() { diff --git a/app/Track.php b/app/Track.php index a898f5b..afbc5de 100644 --- a/app/Track.php +++ b/app/Track.php @@ -62,7 +62,7 @@ class Track extends Model * Generate "dummy" shows (used for calculating next shows) for active, * non-recurring tracks. * - * @return Array + * @return array */ public static function dummyShows() {