From 6f945ff91aa255c726818cf58e2c7bc1f3c5aad2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 30 Mar 2022 01:11:07 +0000 Subject: [PATCH 1/2] Bump guzzlehttp/psr7 from 1.6.1 to 1.8.5 Bumps [guzzlehttp/psr7](https://github.com/guzzle/psr7) from 1.6.1 to 1.8.5. - [Release notes](https://github.com/guzzle/psr7/releases) - [Changelog](https://github.com/guzzle/psr7/blob/1.8.5/CHANGELOG.md) - [Commits](https://github.com/guzzle/psr7/compare/1.6.1...1.8.5) --- updated-dependencies: - dependency-name: guzzlehttp/psr7 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- composer.lock | 63 +++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 14 deletions(-) diff --git a/composer.lock b/composer.lock index af64d82..c5e39b3 100644 --- a/composer.lock +++ b/composer.lock @@ -923,16 +923,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.6.1", + "version": "1.8.5", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a" + "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", - "reference": "239400de7a173fe9901b9ac7c06497751f00727a", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268", + "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268", "shasum": "" }, "require": { @@ -945,37 +945,58 @@ }, "require-dev": { "ext-zlib": "*", - "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.8" + "phpunit/phpunit": "~4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.8 || ^9.3.10" }, "suggest": { - "zendframework/zend-httphandlerrunner": "Emit PSR-7 responses" + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.7-dev" } }, "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" } ], @@ -992,9 +1013,23 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.6.1" + "source": "https://github.com/guzzle/psr7/tree/1.8.5" }, - "time": "2019-07-01T23:21:34+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2022-03-20T21:51:18+00:00" }, { "name": "hanneskod/classtools", @@ -6994,5 +7029,5 @@ "php": "^7.2.5" }, "platform-dev": [], - "plugin-api-version": "2.0.0" + "plugin-api-version": "2.2.0" } From 77cb55ac667618eb5e6d63df3be3eb8f660fc83a Mon Sep 17 00:00:00 2001 From: John Wyles Date: Wed, 30 Mar 2022 02:11:20 +0100 Subject: [PATCH 2/2] Apply fixes from StyleCI (#155) --- .../Controllers/Admin/Dashboard/AdminDashboardController.php | 1 - app/Http/Controllers/Profiles/MentorProfileController.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) 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; diff --git a/app/Http/Controllers/Profiles/MentorProfileController.php b/app/Http/Controllers/Profiles/MentorProfileController.php index ce6687d..96dbc5f 100644 --- a/app/Http/Controllers/Profiles/MentorProfileController.php +++ b/app/Http/Controllers/Profiles/MentorProfileController.php @@ -35,7 +35,7 @@ public function create() /** * Store a newly created resource in storage. * - * @param \App\Http\Requests\MentorProfileRequest $request + * @param \App\Http\Requests\MentorProfileRequest $request * @return \Illuminate\Http\Response */ public function store(MentorProfileRequest $request)