diff --git a/src/Autocomplete/src/Form/AutocompleteChoiceTypeExtension.php b/src/Autocomplete/src/Form/AutocompleteChoiceTypeExtension.php index 149805e99e6..51c897e76b9 100644 --- a/src/Autocomplete/src/Form/AutocompleteChoiceTypeExtension.php +++ b/src/Autocomplete/src/Form/AutocompleteChoiceTypeExtension.php @@ -55,7 +55,7 @@ public function finishView(FormView $view, FormInterface $form, array $options): $attr = $view->vars['attr'] ?? []; $controllerName = 'symfony--ux-autocomplete--autocomplete'; - $attr['data-controller'] = trim(($attr['data-controller'] ?? '').' '.$controllerName); + $attr['data-controller'] = $controllerName.' '.trim($attr['data-controller'] ?? ''); $values = []; if ($options['autocomplete_url']) { diff --git a/src/Autocomplete/tests/Functional/AutocompleteFormRenderingTest.php b/src/Autocomplete/tests/Functional/AutocompleteFormRenderingTest.php index 92c7695c98c..c149833034a 100644 --- a/src/Autocomplete/tests/Functional/AutocompleteFormRenderingTest.php +++ b/src/Autocomplete/tests/Functional/AutocompleteFormRenderingTest.php @@ -30,7 +30,7 @@ public function testFieldsRenderWithStimulusController() $this->browser() ->throwExceptions() ->get('/test-form') - ->assertElementAttributeContains('#product_category', 'data-controller', 'custom-autocomplete symfony--ux-autocomplete--autocomplete') + ->assertElementAttributeContains('#product_category', 'data-controller', 'symfony--ux-autocomplete--autocomplete custom-autocomplete') ->assertElementAttributeContains('#product_category', 'data-symfony--ux-autocomplete--autocomplete-url-value', '/test/autocomplete/category_autocomplete_type?extra_options=') ->assertElementAttributeContains('#product_category', 'data-symfony--ux-autocomplete--autocomplete-min-characters-value', '2') ->assertElementAttributeContains('#product_category', 'data-symfony--ux-autocomplete--autocomplete-max-results-value', '25')