From 8c7ccd3fe82b3723880e5f70d8aa02e30ac03f82 Mon Sep 17 00:00:00 2001 From: Jonny Nott Date: Fri, 26 Feb 2021 17:17:30 +0000 Subject: [PATCH 1/4] target 1.16.15 of facade/ignition for Laravel 6.x (#5544) fixes CVE-2021-3129 vulnerability (Laravel 6) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bc57c5ba..e011ec1d 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "laravel/tinker": "^2.5" }, "require-dev": { - "facade/ignition": "^1.16.4", + "facade/ignition": "^1.16.15", "fakerphp/faker": "^1.9.1", "mockery/mockery": "^1.0", "nunomaduro/collision": "^3.0", From 5c137aae41315fea6b9201d23ddfef2502d3feda Mon Sep 17 00:00:00 2001 From: netpok Date: Thu, 29 Apr 2021 14:55:56 +0200 Subject: [PATCH 2/4] Bump framework version (#5602) to include SQL server security fix for GHSA-4mg9-vhxq-vm7j --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e011ec1d..65cd1084 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "require": { "php": "^7.2.5|^8.0", "fideloper/proxy": "^4.4", - "laravel/framework": "^6.20", + "laravel/framework": "^6.20.26", "laravel/tinker": "^2.5" }, "require-dev": { From ecf460a874e5943c1063ef9585bc7491ead15b0a Mon Sep 17 00:00:00 2001 From: Dries Vints Date: Tue, 11 May 2021 22:47:22 +0200 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 870b7b4a..7b415b90 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v6.20.0...6.x) +## [Unreleased](https://github.com/laravel/laravel/compare/v6.20.1...6.x) + + +## [v6.20.1 (2021-05-11)](https://github.com/laravel/laravel/compare/v6.20.0...v6.20.1) + +### Security +- Target 1.16.15 of facade/ignition ([#5544](https://github.com/laravel/laravel/pull/5544)) +- Bump framework version to include SQL server security fix ([#5602](https://github.com/laravel/laravel/pull/5602)) ## [v6.20.0 (2020-10-30)](https://github.com/laravel/laravel/compare/v6.19.0...v6.20.0) From e5962266d79ab4aa3b7e49d1d5cddb7f85c057e6 Mon Sep 17 00:00:00 2001 From: Cristiano Fromagio <16294559+cristianofromagio@users.noreply.github.com> Date: Thu, 5 Aug 2021 10:45:48 -0300 Subject: [PATCH 4/4] [8.x] Add accepted_if validation rule (#5658) * Add accepted_if validation rule * Update validation.php Co-authored-by: Taylor Otwell --- resources/lang/en/validation.php | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 6100f808..6ee8d8d7 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -14,6 +14,7 @@ */ 'accepted' => 'The :attribute must be accepted.', + 'accepted_if' => 'The :attribute must be accepted when :other is :value.', 'active_url' => 'The :attribute is not a valid URL.', 'after' => 'The :attribute must be a date after :date.', 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',