Skip to content

Commit

Permalink
Allow Symfony 6 (#1211)
Browse files Browse the repository at this point in the history
  • Loading branch information
derrabus committed Nov 11, 2021
1 parent 36205d5 commit b4654e4
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/continuous-integration.yml
Expand Up @@ -23,9 +23,6 @@ jobs:
name: "PHPUnit"
runs-on: "ubuntu-20.04"

env:
COLUMNS: 120

strategy:
matrix:
dbal-version:
Expand Down Expand Up @@ -84,6 +81,12 @@ jobs:
name: "phpunit-${{ matrix.deps }}-${{ matrix.php-version }}.coverage"
path: "coverage.xml"

phpunit-with-symfony-6:
name: "PHPUnit with Symfony 6.0.x-dev"
uses: "doctrine/.github/.github/workflows/continuous-integration-symfony-unstable.yml@1.4.0"
with:
symfony-version-constraint: "6.0.*"

upload_coverage:
name: "Upload coverage to Codecov"
runs-on: "ubuntu-20.04"
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Expand Up @@ -31,8 +31,8 @@
"doctrine/event-manager": "^1.0",
"friendsofphp/proxy-manager-lts": "^1.0",
"psr/log": "^1.1.3 || ^2 || ^3",
"symfony/console": "^3.4 || ^4.4.16 || ^5.0",
"symfony/stopwatch": "^3.4 || ^4.0 || ^5.0"
"symfony/console": "^3.4 || ^4.4.16 || ^5.0 || ^6.0",
"symfony/stopwatch": "^3.4 || ^4.0 || ^5.0 || ^6.0"
},
"require-dev": {
"ext-pdo_sqlite": "*",
Expand All @@ -47,9 +47,9 @@
"phpstan/phpstan-strict-rules": "^0.12",
"phpstan/phpstan-symfony": "^0.12",
"phpunit/phpunit": "^8.5 || ^9.4",
"symfony/cache": "^3.4.26 || ~4.1.12 || ^4.2.7 || ^5.0",
"symfony/process": "^3.4 || ^4.0 || ^5.0",
"symfony/yaml": "^3.4 || ^4.0 || ^5.0"
"symfony/cache": "^3.4.26 || ~4.1.12 || ^4.2.7 || ^5.0 || ^6.0",
"symfony/process": "^3.4 || ^4.0 || ^5.0 || ^6.0",
"symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0"
},
"suggest": {
"doctrine/sql-formatter": "Allows to generate formatted SQL with the diff command.",
Expand Down
4 changes: 4 additions & 0 deletions phpunit.xml.dist
Expand Up @@ -6,6 +6,10 @@
verbose="true"
beStrictAboutOutputDuringTests="true"
>
<php>
<env name="COLUMNS" value="120" />
</php>

<testsuites>
<testsuite name="Doctrine2 Database Migrations Test Suite">
<directory>./tests/Doctrine/</directory>
Expand Down

0 comments on commit b4654e4

Please sign in to comment.