Skip to content

Commit 9302058

Browse files
authored
MultidomainType: multidomain options are correctly merged with domain options (#4033)
2 parents 66ef0d9 + 1b031cd commit 9302058

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/MultidomainType.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@ public function __construct(
2929
public function buildForm(FormBuilderInterface $builder, array $options): void
3030
{
3131
$entryOptions = $options['entry_options'];
32-
$entryOptions['required'] = ($options['required'] ?? false) && ($entryOptions['required'] ?? false);
32+
$entryOptions['required'] = ($options['required'] ?? false) || ($entryOptions['required'] ?? false);
3333
$entryOptions['constraints'] = $entryOptions['constraints'] ?? [];
3434

3535
$domainIds = $this->domainIdsProvider->getAdminEnabledDomainIds();
3636

3737
foreach ($domainIds as $domainId) {
3838
if (array_key_exists($domainId, $options['options_by_domain_id'])) {
39-
$domainOptions = array_merge($entryOptions, $options['options_by_domain_id'][$domainId]);
39+
$domainOptions = array_merge_recursive($entryOptions, $options['options_by_domain_id'][$domainId]);
4040
} else {
4141
$domainOptions = $entryOptions;
4242
}

0 commit comments

Comments
 (0)