Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow Symfony 7.0 #291

Merged
merged 4 commits into from
Dec 18, 2023
Merged

Allow Symfony 7.0 #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
819e0b0
Allow Symfony 7.0
simoheinonen Dec 13, 2023
30a5626
Sf7 requires 8.2
simoheinonen Dec 13, 2023
877fb78
Add ignore for PHPStan
bytehead Dec 18, 2023
6e6c9d4
Fix test on PHP 8.2/SF 5.4
bytehead Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,12 @@ jobs:
fail-fast: false
matrix:
php: [8.0, 8.1, 8.2]
symfony: [4.4, 5.4, 6.0]
symfony: [4.4, 5.4, 6.0, 7.0]
exclude:
- symfony: 7.0
php: 8.0
- symfony: 7.0
php: 8.1
steps:
- name: Setup PHP
uses: shivammathur/[email protected]
Expand All @@ -51,7 +56,7 @@ jobs:

- name: Install the dependencies
run: |
composer require symfony/framework-bundle:^${{ matrix.symfony }}
composer require symfony/framework-bundle:^${{ matrix.symfony }} symfony/translation:^${{ matrix.symfony }} symfony/console:^${{ matrix.symfony }} -W
composer install --no-interaction --no-suggest
- name: Run the unit tests
run: vendor/bin/phpunit --colors=always
Expand Down
16 changes: 8 additions & 8 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
"phpstan/phpstan": "^1.4",
"phpunit/phpunit": "^9.5",
"royvoetman/flysystem-gitlab-storage": "^2.0 || ^3.0",
"symfony/asset": "^4.4 || ^5.3 || ^6.0",
"symfony/browser-kit": "^4.4 || ^5.3 || ^6.0",
"symfony/finder": "^4.4 || ^5.3 || ^6.0",
"symfony/framework-bundle": "^4.4 || ^5.3 || ^6.0",
"symfony/phpunit-bridge": "^6.0",
"symfony/templating": "^4.4 || ^5.3 || ^6.0",
"symfony/translation": "^4.4 || ^5.3 || ^6.0",
"symfony/yaml": "^4.4 || ^5.3 || ^6.0"
"symfony/asset": "^4.4 || ^5.3 || ^6.0 || ^7.0",
"symfony/browser-kit": "^4.4 || ^5.3 || ^6.0 || ^7.0",
"symfony/finder": "^4.4 || ^5.3 || ^6.0 || ^7.0",
"symfony/framework-bundle": "^4.4 || ^5.3 || ^6.0 || ^7.0",
"symfony/phpunit-bridge": "^6.0 || ^7.0",
"symfony/templating": "^4.4 || ^5.3 || ^6.0 || ^7.0",
"symfony/translation": "^4.4 || ^5.3 || ^6.0 || ^7.0",
"symfony/yaml": "^4.4 || ^5.3 || ^6. || ^7.00"
},
"suggest": {
"ext-fileinfo": "Required for MimeType",
Expand Down
5 changes: 3 additions & 2 deletions tests/Model/ContainerAwareTestCase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

use Symfony\Bundle\FrameworkBundle\KernelBrowser;
use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\DependencyInjection\Container;

class ContainerAwareTestCase extends WebTestCase
{
Expand All @@ -31,9 +31,10 @@ protected function tearDown(): void
/**
* BC layer: to be removed once sf <5.3 will not be supported anymore.
bytehead marked this conversation as resolved.
Show resolved Hide resolved
*/
protected static function getContainer(): ContainerInterface
protected static function getContainer(): Container
{
if (\is_callable('parent::getContainer')) {
/* @phpstan-ignore-next-line */
return parent::getContainer();
}

Expand Down
Loading