Skip to content

Commit 0bc6bbc

Browse files
committed
Merge branch '2.x' into 3.x
# By Hugo Alliaume (4) and others * 2.x: [React][Vue][Svelte] Add E2E tests [LiveComponent] Return empty string for `data-value=""` instead of falling back to null [Icons] fix set default viewBox when not defined in Iconify icon set Re-configure LF eof in git [Map] Leaflet bridge doc Ensure PHP 8.5 compatibility Fix highest-deps job # Conflicts: # src/Autocomplete/CHANGELOG.md # src/Chartjs/CHANGELOG.md # src/Cropperjs/CHANGELOG.md # src/Dropzone/CHANGELOG.md # src/Icons/CHANGELOG.md # src/LazyImage/CHANGELOG.md # src/LiveComponent/CHANGELOG.md # src/Map/src/Bridge/Google/CHANGELOG.md # src/Map/src/Bridge/Leaflet/CHANGELOG.md # src/Notify/CHANGELOG.md # src/React/CHANGELOG.md # src/StimulusBundle/CHANGELOG.md # src/Svelte/CHANGELOG.md # src/Swup/CHANGELOG.md # src/TogglePassword/CHANGELOG.md # src/Translator/CHANGELOG.md # src/Turbo/CHANGELOG.md # src/TwigComponent/CHANGELOG.md # src/Typed/CHANGELOG.md # src/Vue/CHANGELOG.md
2 parents 42026d7 + c6ad4f7 commit 0bc6bbc

File tree

63 files changed

+2356
-76
lines changed

Some content is hidden

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

63 files changed

+2356
-76
lines changed

.editorconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,9 @@ trim_trailing_whitespace = true
1111
[*.{php,html,twig}]
1212
indent_style = space
1313
indent_size = 4
14+
15+
[*.md]
16+
max_line_length = 80
17+
18+
[COMMIT_EDITMSG]
19+
max_line_length = 0

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

.github/workflows/code-quality.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
include:
5050
# dev packages (probably not needed to have multiple such jobs)
5151
- minimum-stability: 'dev'
52-
php-version: 8.4
52+
php-version: 8.5
5353
# lowest deps
5454
- dependency-version: 'lowest'
5555
# LTS version of Symfony

.github/workflows/functional-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
php-version: ['8.1', '8.2', '8.3', '8.4']
24+
php-version: ['8.1', '8.2', '8.3', '8.4', '8.5']
2525
dependency-version: ['']
2626
symfony-version: ['']
2727
minimum-stability: ['stable']
2828
os: ['']
2929
include:
3030
# dev packages (probably not needed to have multiple such jobs)
3131
- minimum-stability: 'dev'
32-
php-version: '8.4'
32+
php-version: '8.5'
3333
# lowest deps
3434
- php-version: '8.1'
3535
dependency-version: 'lowest'

.github/workflows/unit-tests.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
php-version: ['8.1', '8.2', '8.3', '8.4']
31+
php-version: ['8.1', '8.2', '8.3', '8.4', '8.5']
3232
dependency-version: ['']
3333
symfony-version: ['']
3434
minimum-stability: ['stable']
3535
os: ['']
3636
include:
3737
# dev packages (probably not needed to have multiple such jobs)
3838
- minimum-stability: 'dev'
39-
php-version: '8.4'
39+
php-version: '8.5'
4040
# lowest deps
4141
- php-version: '8.1'
4242
dependency-version: 'lowest'
@@ -50,8 +50,8 @@ jobs:
5050
- php-version: '8.1'
5151
symfony-version: '6.4.*'
5252
- php-version: '8.2'
53-
symfony-version: '7.3.*' # TODO: change to '7.4' when Symfony 7.4 is released
54-
- php-version: '8.4'
53+
symfony-version: '7.4.x-dev' # TODO: change to '7.4' when Symfony 7.4 is released
54+
- php-version: '8.5'
5555
symfony-version: '8.0.x-dev' # TODO: change to '8.0' when Symfony 8.0 is released
5656
minimum-stability: 'dev' # TODO: remove when Symfony 8.0 is released
5757

apps/e2e/assets/react/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node_modules
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import React from 'react';
2+
export default function (props) {
3+
return /*#__PURE__*/React.createElement("div", null, "Hello ", props.name, " from React");
4+
}

0 commit comments

Comments
 (0)