Skip to content

Commit

Permalink
Add Symfony 6 support (#699)
Browse files Browse the repository at this point in the history
* Add workflow for Symfony 6

* Add Symfony 6 support

* Use chrome instead of firefox

* try different

* Update tests/Functional/EmbeddedMappingTest.php
  • Loading branch information
jordisala1991 committed Nov 26, 2021
1 parent 008ffe6 commit 071a218
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 12 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/test.yaml
Expand Up @@ -59,6 +59,11 @@ jobs:
allowed-to-fail: false
symfony-require: 5.4.*
variant: symfony/symfony:"5.4.*"
- php-version: '8.0'
dependencies: highest
allowed-to-fail: false
symfony-require: 6.0.*
variant: symfony/symfony:"6.0.*"

steps:
- name: Checkout
Expand Down Expand Up @@ -88,7 +93,7 @@ jobs:

- name: Remove dev dependencies not compatible with Symfony 6
if: matrix.symfony-require == '6.0.*'
run: composer remove psalm/plugin-symfony symfony/maker-bundle symfony/panther --dev --no-update --no-interaction
run: composer remove psalm/plugin-symfony --dev --no-update --no-interaction

- name: Install Composer dependencies (${{ matrix.dependencies }})
uses: ramsey/composer-install@v1
Expand Down
20 changes: 10 additions & 10 deletions composer.json
Expand Up @@ -33,12 +33,12 @@
"doctrine/persistence": "^2.0",
"sonata-project/admin-bundle": "^4.0",
"sonata-project/form-extensions": "^1.7.1",
"symfony/config": "^4.4 || ^5.3",
"symfony/dependency-injection": "^4.4 || ^5.3",
"symfony/doctrine-bridge": "^4.4 || ^5.3",
"symfony/form": "^4.4 || ^5.3",
"symfony/http-kernel": "^4.4 || ^5.3",
"symfony/property-access": "^4.4 || ^5.3",
"symfony/config": "^4.4 || ^5.3 || ^6.0",
"symfony/dependency-injection": "^4.4 || ^5.3 || ^6.0",
"symfony/doctrine-bridge": "^4.4 || ^5.3 || ^6.0",
"symfony/form": "^4.4 || ^5.3 || ^6.0",
"symfony/http-kernel": "^4.4 || ^5.3 || ^6.0",
"symfony/property-access": "^4.4 || ^5.3 || ^6.0",
"twig/twig": "^2.6 || ^3.0"
},
"conflict": {
Expand All @@ -58,10 +58,10 @@
"psalm/plugin-phpunit": "^0.16",
"psalm/plugin-symfony": "^3.0",
"sonata-project/block-bundle": "^4.2",
"symfony/browser-kit": "^4.4 || ^5.3",
"symfony/css-selector": "^4.4 || ^5.3",
"symfony/panther": "^1.0",
"symfony/phpunit-bridge": "^5.3",
"symfony/browser-kit": "^4.4 || ^5.3 || ^6.0",
"symfony/css-selector": "^4.4 || ^5.3 || ^6.0",
"symfony/panther": "^1.0 || ^2.0",
"symfony/phpunit-bridge": "^5.3 || ^6.0",
"vimeo/psalm": "^4.1.1"
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion tests/Functional/BasePantherTestCase.php
Expand Up @@ -27,7 +27,7 @@ abstract class BasePantherTestCase extends PantherTestCase
protected function setUp(): void
{
$this->client = static::createPantherClient([
'browser' => PantherTestCase::FIREFOX,
'browser' => PantherTestCase::CHROME,
'connection_timeout_in_ms' => 5000,
'request_timeout_in_ms' => 60000,
]);
Expand Down

0 comments on commit 071a218

Please sign in to comment.