Skip to content

Commit 5bafb88

Browse files
committed
Merge remote-tracking branch 'remotes/upstream/2.x' into live-component-force-post-requests
2 parents 7b60229 + a2418ef commit 5bafb88

File tree

103 files changed

+1177
-875
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+1177
-875
lines changed

.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
'@Symfony' => true,
2929
'@Symfony:risky' => true,
3030
'header_comment' => ['header' => $fileHeaderComment],
31+
'trailing_comma_in_multiline' => ['elements' => ['arrays', 'match', 'parameters']],
3132
])
3233
->setRiskyAllowed(true)
3334
->setFinder(

src/Autocomplete/CHANGELOG.md

Lines changed: 4 additions & 0 deletions

src/Autocomplete/assets/dist/controller.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export default class extends Controller {
1212
static values: {
1313
url: StringConstructor;
1414
optionsAsHtml: BooleanConstructor;
15+
loadingMoreText: StringConstructor;
1516
noResultsFoundText: StringConstructor;
1617
noMoreResultsText: StringConstructor;
1718
minCharacters: NumberConstructor;
@@ -20,6 +21,7 @@ export default class extends Controller {
2021
};
2122
readonly urlValue: string;
2223
readonly optionsAsHtmlValue: boolean;
24+
readonly loadingMoreTextValue: string;
2325
readonly noMoreResultsTextValue: string;
2426
readonly noResultsFoundTextValue: string;
2527
readonly minCharactersValue: number;

src/Autocomplete/assets/dist/controller.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,9 @@ _default_1_instances = new WeakSet(), _default_1_getCommonConfig = function _def
317317
item: function (item) {
318318
return `<div>${item.text}</div>`;
319319
},
320+
loading_more: () => {
321+
return `<div class="loading-more-results">${this.loadingMoreTextValue}</div>`;
322+
},
320323
no_more_results: () => {
321324
return `<div class="no-more-results">${this.noMoreResultsTextValue}</div>`;
322325
},
@@ -342,6 +345,7 @@ _default_1_instances = new WeakSet(), _default_1_getCommonConfig = function _def
342345
default_1.values = {
343346
url: String,
344347
optionsAsHtml: Boolean,
348+
loadingMoreText: String,
345349
noResultsFoundText: String,
346350
noMoreResultsText: String,
347351
minCharacters: Number,

src/Autocomplete/assets/src/controller.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export default class extends Controller {
1515
static values = {
1616
url: String,
1717
optionsAsHtml: Boolean,
18+
loadingMoreText: String,
1819
noResultsFoundText: String,
1920
noMoreResultsText: String,
2021
minCharacters: Number,
@@ -24,6 +25,7 @@ export default class extends Controller {
2425

2526
declare readonly urlValue: string;
2627
declare readonly optionsAsHtmlValue: boolean;
28+
declare readonly loadingMoreTextValue: string;
2729
declare readonly noMoreResultsTextValue: string;
2830
declare readonly noResultsFoundTextValue: string;
2931
declare readonly minCharactersValue: number;
@@ -224,6 +226,9 @@ export default class extends Controller {
224226
item: function (item: any) {
225227
return `<div>${item.text}</div>`;
226228
},
229+
loading_more: (): string => {
230+
return `<div class="loading-more-results">${this.loadingMoreTextValue}</div>`;
231+
},
227232
no_more_results: (): string => {
228233
return `<div class="no-more-results">${this.noMoreResultsTextValue}</div>`;
229234
},

src/Autocomplete/doc/index.rst

Lines changed: 4 additions & 0 deletions

src/Autocomplete/src/AutocompleterRegistry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
final class AutocompleterRegistry
2020
{
2121
public function __construct(
22-
private ServiceLocator $autocompletersLocator
22+
private ServiceLocator $autocompletersLocator,
2323
) {
2424
}
2525

src/Autocomplete/src/Doctrine/DoctrineRegistryWrapper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
class DoctrineRegistryWrapper
2424
{
2525
public function __construct(
26-
private ?ManagerRegistry $registry = null
26+
private ?ManagerRegistry $registry = null,
2727
) {
2828
}
2929

src/Autocomplete/src/Doctrine/EntityMetadata.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class EntityMetadata
2020
{
2121
public function __construct(
22-
private ClassMetadata $metadata
22+
private ClassMetadata $metadata,
2323
) {
2424
}
2525

src/Autocomplete/src/Doctrine/EntityMetadataFactory.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
class EntityMetadataFactory
2121
{
2222
public function __construct(
23-
private DoctrineRegistryWrapper $doctrine
23+
private DoctrineRegistryWrapper $doctrine,
2424
) {
2525
}
2626

src/Autocomplete/src/Form/AutocompleteChoiceTypeExtension.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ public function finishView(FormView $view, FormInterface $form, array $options):
7979
$values['min-characters'] = $options['min_characters'];
8080
}
8181

82+
$values['loading-more-text'] = $this->trans($options['loading_more_text']);
8283
$values['no-results-found-text'] = $this->trans($options['no_results_found_text']);
8384
$values['no-more-results-text'] = $this->trans($options['no_more_results_text']);
8485
$values['preload'] = $options['preload'];
@@ -99,6 +100,7 @@ public function configureOptions(OptionsResolver $resolver): void
99100
'tom_select_options' => [],
100101
'options_as_html' => false,
101102
'allow_options_create' => false,
103+
'loading_more_text' => 'Loading more results...',
102104
'no_results_found_text' => 'No results found',
103105
'no_more_results_text' => 'No more results',
104106
'min_characters' => null,

src/Autocomplete/src/Form/AutocompleteEntityTypeSubscriber.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
final class AutocompleteEntityTypeSubscriber implements EventSubscriberInterface
2929
{
3030
public function __construct(
31-
private ?string $autocompleteUrl = null
31+
private ?string $autocompleteUrl = null,
3232
) {
3333
}
3434

src/Autocomplete/src/Form/ParentEntityAutocompleteType.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
final class ParentEntityAutocompleteType extends AbstractType implements DataMapperInterface
3030
{
3131
public function __construct(
32-
private UrlGeneratorInterface $urlGenerator
32+
private UrlGeneratorInterface $urlGenerator,
3333
) {
3434
}
3535

src/Autocomplete/src/Form/WrappedEntityTypeAutocompleter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function __construct(
3939
private FormFactoryInterface $formFactory,
4040
private EntityMetadataFactory $metadataFactory,
4141
private PropertyAccessorInterface $propertyAccessor,
42-
private EntitySearchUtil $entitySearchUtil
42+
private EntitySearchUtil $entitySearchUtil,
4343
) {
4444
}
4545

src/Autocomplete/src/Maker/MakeAutocompleteField.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class MakeAutocompleteField extends AbstractMaker
3939
private string $entityClass;
4040

4141
public function __construct(
42-
private ?DoctrineHelper $doctrineHelper = null
42+
private ?DoctrineHelper $doctrineHelper = null,
4343
) {
4444
}
4545

src/Autocomplete/translations/AutocompleteBundle.ar.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'لم يتم العثور على أي نتائج',
1415
'No more results' => 'لا توجد نتائج أٌخرى',
1516
];

src/Autocomplete/translations/AutocompleteBundle.bg.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Няма намерени съвпадения',
1415
'No more results' => 'Няма повече резултати',
1516
];

src/Autocomplete/translations/AutocompleteBundle.ca.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'No s\'han trobat resultats',
1415
'No more results' => 'No hi ha més resultats',
1516
];

src/Autocomplete/translations/AutocompleteBundle.cs.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Nenalezeny žádné položky',
1415
// 'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.da.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Ingen resultater fundet',
1415
// 'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.de.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Keine Übereinstimmungen gefunden',
1415
'No more results' => 'Keine weiteren Ergebnisse',
1516
];

src/Autocomplete/translations/AutocompleteBundle.el.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Δεν βρέθηκαν αποτελέσματα',
1415
// 'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.en.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'No results found',
1415
'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.es.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'No se han encontrado resultados',
1415
'No more results' => 'No hay más resultados',
1516
];

src/Autocomplete/translations/AutocompleteBundle.eu.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Ez da bat datorrenik aurkitu',
1415
// 'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.fa.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'هیچ نتیجه‌ای یافت نشد',
1415
'No more results' => 'نتیجه دیگری وجود ندارد',
1516
];

src/Autocomplete/translations/AutocompleteBundle.fi.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Ei tuloksia',
1415
// 'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.fr.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
'Loading more results...' => 'Chargement d\'autres résultats...',
1314
'No results found' => 'Aucun résultat trouvé',
1415
'No more results' => 'Aucun autre résultat trouvé',
1516
];

src/Autocomplete/translations/AutocompleteBundle.gl.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Non se atoparon resultados',
1415
// 'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.hr.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Nema rezultata',
1415
// 'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.hu.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
'Loading more results...' => 'További találatok betöltése...',
1314
'No results found' => 'Nincs találat',
1415
'No more results' => 'Nincs több találat',
1516
];

src/Autocomplete/translations/AutocompleteBundle.id.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Tidak ada hasil yang ditemukan',
1415
'No more results' => 'Tidak ada hasil lagi',
1516
];

src/Autocomplete/translations/AutocompleteBundle.it.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Nessun risultato trovato',
1415
'No more results' => 'Non ci sono altri risultati',
1516
];

src/Autocomplete/translations/AutocompleteBundle.lb.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Keng Resultater fonnt',
1415
'No more results' => 'Keng weider Resultater',
1516
];

src/Autocomplete/translations/AutocompleteBundle.lt.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Atitikmenų nerasta',
1415
// 'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.nl.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
'Loading more results...' => 'Meer resultaten aan het laden...',
1314
'No results found' => 'Geen resultaten gevonden…',
1415
'No more results' => 'Niet meer resultaten gevonden…',
1516
];

src/Autocomplete/translations/AutocompleteBundle.pl.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Brak wyników',
1415
// 'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.pt.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Sem resultados',
1415
// 'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.pt_BR.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Nenhum resultado encontrado',
1415
// 'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.ro.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Nu au fost găsite rezultate',
1415
// 'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.ru.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Совпадений не найдено',
1415
// 'No more results' => 'No more results',
1516
];

src/Autocomplete/translations/AutocompleteBundle.sl.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111

1212
return [
13+
// 'Loading more results...' => 'Loading more results...',
1314
'No results found' => 'Ni zadetkov',
1415
// 'No more results' => 'No more results',
1516
];

0 commit comments

Comments
 (0)