Skip to content

Commit

Permalink
Drop support for Symfony < 5.4, add Symfony 6.3 to CI, update .gitatt…
Browse files Browse the repository at this point in the history
…ributes file
  • Loading branch information
ker0x committed Sep 25, 2023
1 parent 9628346 commit 1c5a07c
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 26 deletions.
28 changes: 13 additions & 15 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
.editorconfig export-ignore
.gitattributes export-ignore
/.github/ export-ignore
.gitignore export-ignore
/.php_cs export-ignore
/.scrutinizer.yml export-ignore
/.styleci.yml export-ignore
/.travis.yml export-ignore
/behat.yml.dist export-ignore
/features/ export-ignore
/phpspec.ci.yml export-ignore
/phpspec.yml.dist export-ignore
/phpunit.xml.dist export-ignore
/spec/ export-ignore
/Tests/ export-ignore
.editorconfig export-ignore
.gitattributes export-ignore
/.github/ export-ignore
.gitignore export-ignore
/.php-cs-fixer.php export-ignore
/CHANGELOG.md export-ignore
/CODE_OF_CONDUCT.md export-ignore
/CONTRIBUTING.md export-ignore
/doc export-ignore
/phpstan.neon.dist export-ignore
/phpstan-baseline.neon export-ignore
/phpunit.xml.dist export-ignore
/tests/ export-ignore
6 changes: 4 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@ jobs:
sf_version: '6.0.*'
- php: '8.2'
sf_version: '6.2.*'
- php: '8.2'
sf_version: '6.3.*'
steps:
- name: "Setup PHP"
uses: shivammathur/setup-php@v2
Expand Down Expand Up @@ -112,8 +114,6 @@ jobs:
matrix:
php: ['7.4', '8.0', '8.1', '8.2']
include:
- php: '7.4'
sf_version: '4.4.*'
- php: '7.4'
sf_version: '5.4.*'
- php: '8.0'
Expand All @@ -126,6 +126,8 @@ jobs:
sf_version: '6.0.*'
- php: '8.2'
sf_version: '6.2.*'
- php: '8.2'
sf_version: '6.3.*'
steps:
- name: "Setup PHP"
uses: shivammathur/setup-php@v2
Expand Down
19 changes: 10 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"php": "^7.4 || ^8.0",
"geocoder-php/plugin": "^1.5",
"php-http/discovery": "^1.14",
"symfony/console": "^4.4 || ^5.0 || ^6.0",
"symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0",
"symfony/options-resolver": "^4.4 || ^5.0 || ^6.0",
"symfony/console": "^5.4 || ^6.0",
"symfony/framework-bundle": "^5.4 || ^6.0",
"symfony/options-resolver": "^5.4 || ^6.0",
"willdurand/geocoder": "^4.6"
},
"require-dev": {
Expand Down Expand Up @@ -59,11 +59,11 @@
"php-http/curl-client": "^2.2",
"php-http/message": "^1.13",
"phpstan/phpstan": "^1.9.2",
"symfony/cache": "^4.4 || ^5.0 || ^6.0",
"symfony/config": "^4.4 || ^5.0 || ^6.0",
"symfony/phpunit-bridge": "^5.2 || ^6.0",
"symfony/validator": "^4.4 || ^5.0 || ^6.0",
"symfony/yaml": "^4.4 || ^5.0 || ^6.0"
"symfony/cache": "^5.4 || ^6.0",
"symfony/config": "^5.4 || ^6.0",
"symfony/phpunit-bridge": "^5.4 || ^6.0",
"symfony/validator": "^5.4 || ^6.0",
"symfony/yaml": "^5.4 || ^6.0"
},
"conflict": {
"geocoder-php/nominatim-provider": "<5.0"
Expand All @@ -83,7 +83,8 @@
},
"config": {
"allow-plugins": {
"symfony/flex": true
"symfony/flex": true,
"php-http/discovery": true
},
"sort-packages": true
},
Expand Down

0 comments on commit 1c5a07c

Please sign in to comment.