Compare commits

..

1 Commits

Author SHA1 Message Date
1e9e140725 Revert version to 2.0.3-dev
All checks were successful
Create Docker Image / Test Application (x86_64) (push) Successful in 31s
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 1m29s
Create Docker Image / Build Docker Image (arm64) (push) Successful in 4m42s
Create Docker Image / Final Docker Image Manifest (push) Successful in 8s
2025-03-18 23:40:38 +11:00
2 changed files with 9 additions and 5 deletions

View File

@ -557,13 +557,10 @@ final class AttributeType extends Base {
->unique(); ->unique();
$validation = collect(Arr::get(config('ldap.validation'),$this->name_lc,[])); $validation = collect(Arr::get(config('ldap.validation'),$this->name_lc,[]));
// Add in schema required by conditions
if (($heirachy->intersect($this->required_by_object_classes->keys())->count() > 0) if (($heirachy->intersect($this->required_by_object_classes->keys())->count() > 0)
&& (! collect($validation->get($this->name_lc))->contains('required'))) { && (! collect($validation->get($this->name_lc))->contains('required'))) {
$validation $validation->put($this->name_lc,array_merge(['required','min:1'],$validation->get($this->name_lc,[])))
->prepend(array_merge(['required','min:1'],$validation->get($this->name_lc.'.0',[])),$this->name_lc.'.0') ->put($this->name_lc.'.*',array_merge(['required','min:1'],$validation->get($this->name_lc.'.*',[])));
->prepend(array_merge(['required','array','min:1'],$validation->get($this->name_lc,[])),$this->name_lc);
} }
return $validation->toArray(); return $validation->toArray();

View File

@ -123,12 +123,16 @@ return [
'validation' => [ 'validation' => [
'objectclass' => [ 'objectclass' => [
'objectclass'=>[ 'objectclass'=>[
'required',
'array',
'min:1',
new HasStructuralObjectClass, new HasStructuralObjectClass,
] ]
], ],
'gidnumber' => [ 'gidnumber' => [
'gidnumber'=> [ 'gidnumber'=> [
'sometimes', 'sometimes',
'array',
'max:1' 'max:1'
], ],
'gidnumber.*' => [ 'gidnumber.*' => [
@ -140,6 +144,7 @@ return [
'mail' => [ 'mail' => [
'mail'=>[ 'mail'=>[
'sometimes', 'sometimes',
'array',
'min:1' 'min:1'
], ],
'mail.*' => [ 'mail.*' => [
@ -150,6 +155,7 @@ return [
'userpassword' => [ 'userpassword' => [
'userpassword' => [ 'userpassword' => [
'sometimes', 'sometimes',
'array',
'min:1' 'min:1'
], ],
'userpassword.*' => [ 'userpassword.*' => [
@ -160,6 +166,7 @@ return [
'uidnumber' => [ 'uidnumber' => [
'uidnumber' => [ 'uidnumber' => [
'sometimes', 'sometimes',
'array',
'max:1' 'max:1'
], ],
'uidnumber.*' => [ 'uidnumber.*' => [