Skip to content

Commit 1c5a07c

Browse files
committed
Drop support for Symfony < 5.4, add Symfony 6.3 to CI, update .gitattributes file
1 parent 9628346 commit 1c5a07c

File tree

3 files changed

+27
-26
lines changed

3 files changed

+27
-26
lines changed

.gitattributes

+13-15
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
.editorconfig export-ignore
2-
.gitattributes export-ignore
3-
/.github/ export-ignore
4-
.gitignore export-ignore
5-
/.php_cs export-ignore
6-
/.scrutinizer.yml export-ignore
7-
/.styleci.yml export-ignore
8-
/.travis.yml export-ignore
9-
/behat.yml.dist export-ignore
10-
/features/ export-ignore
11-
/phpspec.ci.yml export-ignore
12-
/phpspec.yml.dist export-ignore
13-
/phpunit.xml.dist export-ignore
14-
/spec/ export-ignore
15-
/Tests/ export-ignore
1+
.editorconfig export-ignore
2+
.gitattributes export-ignore
3+
/.github/ export-ignore
4+
.gitignore export-ignore
5+
/.php-cs-fixer.php export-ignore
6+
/CHANGELOG.md export-ignore
7+
/CODE_OF_CONDUCT.md export-ignore
8+
/CONTRIBUTING.md export-ignore
9+
/doc export-ignore
10+
/phpstan.neon.dist export-ignore
11+
/phpstan-baseline.neon export-ignore
12+
/phpunit.xml.dist export-ignore
13+
/tests/ export-ignore

.github/workflows/ci.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ jobs:
7575
sf_version: '6.0.*'
7676
- php: '8.2'
7777
sf_version: '6.2.*'
78+
- php: '8.2'
79+
sf_version: '6.3.*'
7880
steps:
7981
- name: "Setup PHP"
8082
uses: shivammathur/setup-php@v2
@@ -112,8 +114,6 @@ jobs:
112114
matrix:
113115
php: ['7.4', '8.0', '8.1', '8.2']
114116
include:
115-
- php: '7.4'
116-
sf_version: '4.4.*'
117117
- php: '7.4'
118118
sf_version: '5.4.*'
119119
- php: '8.0'
@@ -126,6 +126,8 @@ jobs:
126126
sf_version: '6.0.*'
127127
- php: '8.2'
128128
sf_version: '6.2.*'
129+
- php: '8.2'
130+
sf_version: '6.3.*'
129131
steps:
130132
- name: "Setup PHP"
131133
uses: shivammathur/setup-php@v2

composer.json

+10-9
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"php": "^7.4 || ^8.0",
1515
"geocoder-php/plugin": "^1.5",
1616
"php-http/discovery": "^1.14",
17-
"symfony/console": "^4.4 || ^5.0 || ^6.0",
18-
"symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0",
19-
"symfony/options-resolver": "^4.4 || ^5.0 || ^6.0",
17+
"symfony/console": "^5.4 || ^6.0",
18+
"symfony/framework-bundle": "^5.4 || ^6.0",
19+
"symfony/options-resolver": "^5.4 || ^6.0",
2020
"willdurand/geocoder": "^4.6"
2121
},
2222
"require-dev": {
@@ -59,11 +59,11 @@
5959
"php-http/curl-client": "^2.2",
6060
"php-http/message": "^1.13",
6161
"phpstan/phpstan": "^1.9.2",
62-
"symfony/cache": "^4.4 || ^5.0 || ^6.0",
63-
"symfony/config": "^4.4 || ^5.0 || ^6.0",
64-
"symfony/phpunit-bridge": "^5.2 || ^6.0",
65-
"symfony/validator": "^4.4 || ^5.0 || ^6.0",
66-
"symfony/yaml": "^4.4 || ^5.0 || ^6.0"
62+
"symfony/cache": "^5.4 || ^6.0",
63+
"symfony/config": "^5.4 || ^6.0",
64+
"symfony/phpunit-bridge": "^5.4 || ^6.0",
65+
"symfony/validator": "^5.4 || ^6.0",
66+
"symfony/yaml": "^5.4 || ^6.0"
6767
},
6868
"conflict": {
6969
"geocoder-php/nominatim-provider": "<5.0"
@@ -83,7 +83,8 @@
8383
},
8484
"config": {
8585
"allow-plugins": {
86-
"symfony/flex": true
86+
"symfony/flex": true,
87+
"php-http/discovery": true
8788
},
8889
"sort-packages": true
8990
},

0 commit comments

Comments
 (0)