Compare commits
No commits in common. "1f9b2a639d765256a2ea5a70132456c1bab6f4d3" and "87bae89ea340c6954df7e680eb071e2bb036d433" have entirely different histories.
1f9b2a639d
...
87bae89ea3
@ -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();
|
||||||
|
@ -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.*' => [
|
||||||
|
@ -1 +1 @@
|
|||||||
v2.0.3-rel
|
v2.0.2-rel
|
||||||
|
Loading…
x
Reference in New Issue
Block a user