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

0 commit comments

Comments
 (0)