From b2743b28aeda806001ab0f6f18a69d648e857b72 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Jun 2021 12:05:01 +0000 Subject: [PATCH 1/2] Bump league/flysystem from 1.1.3 to 1.1.4 Bumps [league/flysystem](https://github.com/thephpleague/flysystem) from 1.1.3 to 1.1.4. - [Release notes](https://github.com/thephpleague/flysystem/releases) - [Changelog](https://github.com/thephpleague/flysystem/blob/2.x/CHANGELOG.md) - [Commits](https://github.com/thephpleague/flysystem/compare/1.1.3...1.1.4) --- updated-dependencies: - dependency-name: league/flysystem dependency-type: indirect ... Signed-off-by: dependabot[bot] --- composer.lock | 52 +++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/composer.lock b/composer.lock index af64d82..e94e23c 100644 --- a/composer.lock +++ b/composer.lock @@ -1614,16 +1614,16 @@ }, { "name": "league/flysystem", - "version": "1.1.3", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "9be3b16c877d477357c015cec057548cf9b2a14a" + "reference": "f3ad69181b8afed2c9edf7be5a2918144ff4ea32" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/9be3b16c877d477357c015cec057548cf9b2a14a", - "reference": "9be3b16c877d477357c015cec057548cf9b2a14a", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/f3ad69181b8afed2c9edf7be5a2918144ff4ea32", + "reference": "f3ad69181b8afed2c9edf7be5a2918144ff4ea32", "shasum": "" }, "require": { @@ -1639,7 +1639,6 @@ "phpunit/phpunit": "^8.5.8" }, "suggest": { - "ext-fileinfo": "Required for MimeType", "ext-ftp": "Allows you to use FTP server storage", "ext-openssl": "Allows you to use FTPS server storage", "league/flysystem-aws-s3-v2": "Allows you to use S3 storage with AWS SDK v2", @@ -1695,20 +1694,30 @@ "sftp", "storage" ], - "time": "2020-08-23T07:39:11+00:00" + "support": { + "issues": "https://github.com/thephpleague/flysystem/issues", + "source": "https://github.com/thephpleague/flysystem/tree/1.1.4" + }, + "funding": [ + { + "url": "https://offset.earth/frankdejonge", + "type": "other" + } + ], + "time": "2021-06-23T21:56:05+00:00" }, { "name": "league/mime-type-detection", - "version": "1.4.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "fda190b62b962d96a069fcc414d781db66d65b69" + "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/fda190b62b962d96a069fcc414d781db66d65b69", - "reference": "fda190b62b962d96a069fcc414d781db66d65b69", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", + "reference": "3b9dff8aaf7323590c1d2e443db701eb1f9aa0d3", "shasum": "" }, "require": { @@ -1716,8 +1725,9 @@ "php": "^7.2 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.36", - "phpunit/phpunit": "^8.5.8" + "friendsofphp/php-cs-fixer": "^2.18", + "phpstan/phpstan": "^0.12.68", + "phpunit/phpunit": "^8.5.8 || ^9.3" }, "type": "library", "autoload": { @@ -1736,7 +1746,21 @@ } ], "description": "Mime-type detection for Flysystem", - "time": "2020-08-09T10:34:01+00:00" + "support": { + "issues": "https://github.com/thephpleague/mime-type-detection/issues", + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.7.0" + }, + "funding": [ + { + "url": "https://github.com/frankdejonge", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/league/flysystem", + "type": "tidelift" + } + ], + "time": "2021-01-18T20:58:21+00:00" }, { "name": "monolog/monolog", @@ -6994,5 +7018,5 @@ "php": "^7.2.5" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.1.0" } From 22cf843ee785b21dacb99148a71bf150c1877a61 Mon Sep 17 00:00:00 2001 From: John Wyles Date: Tue, 29 Jun 2021 13:05:19 +0100 Subject: [PATCH 2/2] Apply fixes from StyleCI (#145) --- .../Controllers/Admin/Dashboard/AdminDashboardController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/Admin/Dashboard/AdminDashboardController.php b/app/Http/Controllers/Admin/Dashboard/AdminDashboardController.php index 75a5fc0..20f3b71 100644 --- a/app/Http/Controllers/Admin/Dashboard/AdminDashboardController.php +++ b/app/Http/Controllers/Admin/Dashboard/AdminDashboardController.php @@ -28,7 +28,6 @@ public function index() $mentorshipSummary = []; $menteeMentorProfiles = MenteeProfile::whereHas('mentorProfiles')->get(); foreach ($menteeMentorProfiles as $mentee) { - $summary; $menteeUser = $mentee->user; $summary['menteeFirstName'] = $menteeUser->first_name; $summary['menteeLastName'] = $menteeUser->last_name;