Skip to content

Commit

Permalink
Allow Symfony 7.x and bump dependencies (#59)
Browse files Browse the repository at this point in the history
* Bump composer dependencies

* Fixed Kernel::build method compatibility with Symfony 7

* Rewrite GitHub testing matrix for PHP>=8.2 & Symfony>=7.0

* Fixed wrong symfony/framework-bundle dependency range declaration
  • Loading branch information
yann-eugone authored Jul 9, 2024
1 parent 323c155 commit 86b7058
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 39 deletions.
32 changes: 6 additions & 26 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request: null
push:
branches:
- "4.x"
- "5.x"

jobs:
phpunit:
Expand All @@ -14,30 +14,10 @@ jobs:
strategy:
matrix:
include:
- php-version: '7.1'
symfony-version: '4.4.*'

- php-version: '7.4'
symfony-version: '4.4.*'
- php-version: '7.4'
symfony-version: '5.4.*'

- php-version: '8.0'
symfony-version: '4.4.*'
- php-version: '8.0'
symfony-version: '5.4.*'
- php-version: '8.0'
symfony-version: '6.0.*'

- php-version: '8.1'
symfony-version: '5.4.*'
- php-version: '8.1'
symfony-version: '6.3.*'

- php-version: '8.2'
symfony-version: '5.4.*'
- php-version: '8.2'
symfony-version: '6.3.*'
symfony-version: '7.0.*'
- php-version: '8.3'
symfony-version: '7.1.*'

steps:
- name: "Checkout"
Expand Down Expand Up @@ -75,7 +55,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
coverage: xdebug
php-version: '8.2'
php-version: '8.3'

- name: "Install dependencies with composer"
run: composer update --no-interaction --no-progress
Expand All @@ -101,7 +81,7 @@ jobs:
uses: shivammathur/setup-php@v2
with:
coverage: xdebug
php-version: '8.2'
php-version: '8.3'

- name: "Install dependencies with composer"
run: composer update --no-interaction --no-progress
Expand Down
25 changes: 13 additions & 12 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@
}
],
"require": {
"php": "^7.1.3|^8.0",
"symfony/framework-bundle": "^4.4|^5.0|^6.0"
"php": "^8.2",
"symfony/framework-bundle": "^7.0"
},
"require-dev": {
"doctrine/annotations": "^1.3",
"myclabs/php-enum": "^1.7",
"phpunit/phpunit": "^7.5|^8.5|^9.5",
"sensio/framework-extra-bundle": "^5.5|^6.1",
"squizlabs/php_codesniffer": "^3.5",
"symfony/form": "^4.4|^5.0|^6.0",
"symfony/translation": "^4.4|^5.0|^6.0",
"symfony/twig-bundle": "^4.4|^5.0|^6.0",
"symfony/validator": "^4.4|^5.0|^6.0",
"symfony/yaml": "^4.4|^5.0|^6.0",
"doctrine/annotations": "^1.14",
"myclabs/php-enum": "^1.8",
"phpunit/phpunit": "^9.6",
"squizlabs/php_codesniffer": "^3.10",
"symfony/form": "^7.0",
"symfony/http-kernel": "^7.0",
"symfony/translation": "^7.0",
"symfony/twig-bundle": "^7.0",
"symfony/validator": "^7.0",
"symfony/yaml": "^7.0",
"twig/twig": "^2.0|^3.0"
},
"suggest": {
Expand All @@ -46,6 +46,7 @@
"minimum-stability": "stable",
"extra": {
"branch-alias": {
"dev-5.x": "5.x-dev",
"dev-4.x": "4.x-dev",
"dev-3.x": "3.x-dev",
"dev-2.x": "2.x-dev"
Expand Down
2 changes: 1 addition & 1 deletion tests/Integration/src/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
/**
* @inheritDoc
*/
protected function build(ContainerBuilder $container)
protected function build(ContainerBuilder $container): void
{
$container->addCompilerPass(
new class implements CompilerPassInterface {
Expand Down

0 comments on commit 86b7058

Please sign in to comment.