Skip to content

Commit

Permalink
Merge pull request #122 from clue-labs/symfony6
Browse files Browse the repository at this point in the history
Support Symfony 6 on PHP 8.0
  • Loading branch information
clue authored Dec 28, 2021
2 parents 45d09b2 + 6feba86 commit 66ca167
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
22 changes: 12 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ on:

jobs:
PHPUnit:
runs-on: ubuntu-latest
name: PHPUnit (PHP ${{ matrix.php }})
runs-on: ubuntu-20.04
strategy:
matrix:
php:
- 8.0
- 7.4
- 7.3
- 7.2
Expand All @@ -31,6 +33,15 @@ jobs:
- run: vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy
if: ${{ matrix.php < 7.3 }}
- run: composer build
- run: composer require symfony/console:^6.0 --dry-run --working-dir=tests/install-as-dep
if: ${{ matrix.php >= 8.0 }}
- run: composer require symfony/console:^5.0 --dry-run --working-dir=tests/install-as-dep
if: ${{ matrix.php >= 7.2 }}
- run: composer require symfony/console:^4.0 --dry-run --working-dir=tests/install-as-dep
if: ${{ matrix.php >= 7.1 && matrix.php < 8.0 }}
- run: composer require symfony/console:^3.0 --dry-run --working-dir=tests/install-as-dep
if: ${{ matrix.php >= 5.5 && matrix.php < 8.0 }}
- run: composer install --dry-run --working-dir=tests/install-as-dep

PHPUnit-hhvm:
name: PHPUnit (HHVM)
Expand All @@ -42,13 +53,4 @@ jobs:
version: lts-3.30
- run: hhvm $(which composer) install
- run: hhvm vendor/bin/phpunit

Install-with-Symfony-4:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: 7.3
- run: composer install --dry-run --working-dir=tests/install-as-dep
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"require": {
"php": ">=5.3.6",
"knplabs/packagist-api": "^1.0",
"symfony/console": "^5.0 || ^4.0 || ^3.0 || ^2.5",
"symfony/finder": "^5.0 || ^4.0 || ^3.0 || ^2.5",
"symfony/process": "^5.0 || ^4.0 || ^3.0 || ^2.5"
"symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.0 || ^2.5",
"symfony/finder": "^6.0 || ^5.0 || ^4.0 || ^3.0 || ^2.5",
"symfony/process": "^6.0 || ^5.0 || ^4.0 || ^3.0 || ^2.5"
},
"require-dev": {
"phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.36"
Expand Down
2 changes: 1 addition & 1 deletion tests/install-as-dep/composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"require": {
"symfony/console": "^4.0"
"symfony/console": "*"
},
"require-dev": {
"clue/phar-composer": "*@dev"
Expand Down

0 comments on commit 66ca167

Please sign in to comment.