Merge remote-tracking branch 'origin/7.5' into 1.3

ezsystems · Jul 21, 2021 · 4f1d28e · 4f1d28e
2 parents 7d7315e + ce61bd9
commit 4f1d28e
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 1 deletion.
diff --git a/eZ/Publish/Core/FieldType/Selection/Type.php b/eZ/Publish/Core/FieldType/Selection/Type.php
@@ -244,7 +244,7 @@ public function validate(FieldDefinition $fieldDefinition, SPIValue $fieldValue)
                 return array_keys($languageOptionIndexes);
             }, $fieldSettings['multilingualOptions']);
 
-            $possibleOptionIndexes = call_user_func_array('array_merge', $possibleOptionIndexesByLanguage);
+            $possibleOptionIndexes = array_merge(...array_values($possibleOptionIndexesByLanguage));
 
             foreach ($fieldValue->selection as $optionIndex) {
                 if (!in_array($optionIndex, $possibleOptionIndexes)) {

diff --git a/eZ/Publish/Core/FieldType/Tests/SelectionTest.php b/eZ/Publish/Core/FieldType/Tests/SelectionTest.php
@@ -480,6 +480,32 @@ public function provideValidDataForValidate()
                 ],
                 new SelectionValue(),
             ],
+            [
+                [
+                    'fieldSettings' => [
+                        'isMultiple' => false,
+                        'options' => [0 => 1, 1 => 2],
+                        'multilingualOptions' => [
+                            'en_GB' => [0 => 1, 1 => 2],
+                            'de_DE' => [0 => 1, 1 => 2],
+                        ],
+                    ],
+                ],
+                new SelectionValue([1]),
+            ],
+            [
+                [
+                    'fieldSettings' => [
+                        'isMultiple' => false,
+                        'options' => [0 => 1, 1 => 2],
+                        'multilingualOptions' => [
+                            'en_GB' => [0 => 1, 1 => 2],
+                            'de_DE' => [0 => 1],
+                        ],
+                    ],
+                ],
+                new SelectionValue([1]),
+            ],
         ];
     }
 
@@ -586,6 +612,29 @@ public function provideInvalidDataForValidate()
                     ),
                 ],
             ],
+            [
+                [
+                    'fieldSettings' => [
+                        'isMultiple' => false,
+                        'options' => [0 => 1, 1 => 2],
+                        'multilingualOptions' => [
+                            'en_GB' => [0 => 1, 1 => 2],
+                            'de_DE' => [0 => 1],
+                        ],
+                    ],
+                ],
+                new SelectionValue([3]),
+                [
+                    new ValidationError(
+                        'Option with index %index% does not exist in the field definition.',
+                        null,
+                        [
+                            '%index%' => 3,
+                        ],
+                        'selection'
+                    ),
+                ],
+            ],
         ];
     }
 }