From ee43d0bcb7137dbfed36046416e95cdd315e7e17 Mon Sep 17 00:00:00 2001 From: Dave Shoreman Date: Tue, 20 Apr 2021 01:51:52 +0100 Subject: [PATCH] Fix user issue introduced in composer update In v8.32.0, laravel/framework#36504 was merged which fixes null being treated as true by the validator, but also enforces strict checking for boolean values given to the required_unless rule. That's not necessarily a bad thing, it just means we can't be passing `1` when we want `true`. When we use `1`, user tests fail because while we pass `'user_group' => true` in the request data, the validator checks explicitly for `1` which it doesn't see, so it says "gid is required unless user group is in 1". We don't want that. --- app/Http/Requests/System/CreateUser.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Requests/System/CreateUser.php b/app/Http/Requests/System/CreateUser.php index 2dbd27296..87cfd3508 100644 --- a/app/Http/Requests/System/CreateUser.php +++ b/app/Http/Requests/System/CreateUser.php @@ -7,7 +7,7 @@ class CreateUser extends SaveUser public function rules(): array { return array_merge(parent::rules(), [ - 'gid' => 'integer|required_unless:user_group,1', + 'gid' => 'integer|required_unless:user_group,true', 'system' => 'boolean|nullable', 'create_home' => 'boolean', 'user_group' => 'boolean',