Skip to content

Commit 3e832d8

Browse files
committed
Merge branch '2.x' into 3.x
# By Hugo Alliaume (3) and others # Via Hugo Alliaume (3) and others * 2.x: Update versions to 2.30.0 Fix changelogs [LiveComponent] Refactor and fix (again) the new URL (with path and query LiveProps) generation Remove some indirect deprecations [LiveComponent] Fix BC Break [Docs][LiveComponent] Clean oldies version added # Conflicts: # src/LazyImage/CHANGELOG.md # src/LazyImage/assets/package.json # src/LazyImage/tests/Kernel/TwigAppKernel.php # src/Map/CHANGELOG.md # src/Swup/CHANGELOG.md # src/Swup/assets/package.json # src/TogglePassword/CHANGELOG.md # src/TogglePassword/assets/package.json # src/TogglePassword/tests/Kernel/TwigAppKernel.php # src/Typed/CHANGELOG.md # src/Typed/assets/package.json
2 parents c0340cd + e0976b1 commit 3e832d8

File tree

62 files changed

+392
-514
lines changed

Some content is hidden

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

62 files changed

+392
-514
lines changed

src/Autocomplete/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
## 2.30
99

10-
- Ensure compatibility with PHP 8.5
10+
- Ensure compatibility with PHP 8.5
1111

1212
## 2.29.0
1313

src/Autocomplete/assets/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@symfony/ux-autocomplete",
33
"description": "JavaScript Autocomplete functionality for Symfony",
44
"license": "MIT",
5-
"version": "2.29.2",
5+
"version": "2.30.0",
66
"keywords": [
77
"symfony-ux"
88
],

src/Chartjs/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
## 2.30
99

10-
- Ensure compatibility with PHP 8.5
10+
- Ensure compatibility with PHP 8.5
1111

1212
## 2.29.0
1313

src/Chartjs/assets/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@symfony/ux-chartjs",
33
"description": "Chart.js integration for Symfony",
44
"license": "MIT",
5-
"version": "2.29.2",
5+
"version": "2.30.0",
66
"keywords": [
77
"symfony-ux"
88
],

src/Chartjs/tests/Kernel/TwigAppKernel.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,17 @@ public function registerBundles(): iterable
3434
public function registerContainerConfiguration(LoaderInterface $loader): void
3535
{
3636
$loader->load(function (ContainerBuilder $container) {
37-
$container->loadFromExtension('framework', ['secret' => '$ecret', 'test' => true, 'http_method_override' => false]);
37+
$container->loadFromExtension('framework', [
38+
'secret' => '$ecret',
39+
'test' => true,
40+
'http_method_override' => false,
41+
'php_errors' => [
42+
'log' => true,
43+
],
44+
...(self::VERSION_ID >= 60200 ? [
45+
'handle_all_throwables' => true,
46+
] : []),
47+
]);
3848
$container->loadFromExtension('twig', ['default_path' => __DIR__.'/templates', 'strict_variables' => true, 'exception_controller' => null]);
3949

4050
$container->setAlias('test.chartjs.builder', 'chartjs.builder')->setPublic(true);

src/Cropperjs/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
## 2.30
99

10-
- Ensure compatibility with PHP 8.5
10+
- Ensure compatibility with PHP 8.5
1111

1212
## 2.29.0
1313

src/Cropperjs/assets/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@symfony/ux-cropperjs",
33
"description": "Cropper.js integration for Symfony",
44
"license": "MIT",
5-
"version": "2.29.2",
5+
"version": "2.30.0",
66
"keywords": [
77
"symfony-ux"
88
],

src/Cropperjs/tests/Kernel/FrameworkAppKernel.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,11 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
4242
'validation' => [
4343
'email_validation_mode' => 'html5',
4444
],
45+
...(self::VERSION_ID >= 60200 ? [
46+
'handle_all_throwables' => true,
47+
] : []),
4548
];
4649

47-
if (self::VERSION_ID >= 60200) {
48-
$frameworkConfig['handle_all_throwables'] = true;
49-
}
50-
5150
$container->loadFromExtension('framework', $frameworkConfig);
5251
});
5352
}

src/Cropperjs/tests/Kernel/TwigAppKernel.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,11 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
4545
'validation' => [
4646
'email_validation_mode' => 'html5',
4747
],
48+
...(self::VERSION_ID >= 60200 ? [
49+
'handle_all_throwables' => true,
50+
] : []),
4851
];
4952

50-
if (self::VERSION_ID >= 60200) {
51-
$frameworkConfig['handle_all_throwables'] = true;
52-
}
53-
5453
$container->loadFromExtension('framework', $frameworkConfig);
5554
$container->loadFromExtension('twig', ['default_path' => __DIR__.'/templates', 'strict_variables' => true, 'exception_controller' => null]);
5655

src/Dropzone/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
## 2.30
99

10-
- Ensure compatibility with PHP 8.5
10+
- Ensure compatibility with PHP 8.5
1111

1212
## 2.29.0
1313

0 commit comments

Comments
 (0)