diff --git a/CHANGELOG.md b/CHANGELOG.md index 7324d376..f6a01866 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,13 @@ # Release Notes -## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.14...master) +## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.15...master) + + +## [v8.5.15 (2021-03-23)](https://github.com/laravel/laravel/compare/v8.5.14...v8.5.15) + +### Changed +- Add prohibited validation rule ([#5569](https://github.com/laravel/laravel/pull/5569)) +- Re-order composer.json ([#5570](https://github.com/laravel/laravel/pull/5570)) ## [v8.5.14 (2021-03-16)](https://github.com/laravel/laravel/compare/v8.5.13...v8.5.14) diff --git a/composer.json b/composer.json index 8f171644..54a4a0a8 100644 --- a/composer.json +++ b/composer.json @@ -2,10 +2,7 @@ "name": "laravel/laravel", "type": "project", "description": "The Laravel Framework.", - "keywords": [ - "framework", - "laravel" - ], + "keywords": ["framework", "laravel"], "license": "MIT", "require": { "php": "^7.4|^8.0", @@ -22,16 +19,6 @@ "nunomaduro/collision": "^5.2", "phpunit/phpunit": "^9.3.3" }, - "config": { - "optimize-autoloader": true, - "preferred-install": "dist", - "sort-packages": true - }, - "extra": { - "laravel": { - "dont-discover": [] - } - }, "autoload": { "psr-4": { "App\\": "app/", @@ -44,8 +31,6 @@ "Tests\\": "tests/" } }, - "minimum-stability": "dev", - "prefer-stable": true, "scripts": { "post-autoload-dump": [ "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", @@ -57,5 +42,17 @@ "post-create-project-cmd": [ "@php artisan key:generate --ansi" ] - } + }, + "extra": { + "laravel": { + "dont-discover": [] + } + }, + "config": { + "optimize-autoloader": true, + "preferred-install": "dist", + "sort-packages": true + }, + "minimum-stability": "dev", + "prefer-stable": true } diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index 0f861e32..49e3388b 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -104,6 +104,7 @@ return [ 'required_with_all' => 'The :attribute field is required when :values are present.', 'required_without' => 'The :attribute field is required when :values is not present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.', + 'prohibited' => 'The :attribute field is prohibited.', 'prohibited_if' => 'The :attribute field is prohibited when :other is :value.', 'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.', 'same' => 'The :attribute and :other must match.',