Skip to content

Commit 43bf470

Browse files
committed
Extend matrix to test with Symfony 5.x and Twig 3.x
1 parent 278a8af commit 43bf470

2 files changed

Lines changed: 15 additions & 13 deletions

File tree

.github/workflows/tests.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@ env:
1313
jobs:
1414
PHPUnit:
1515

16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-18.04
1717
strategy:
1818
fail-fast: false
1919
matrix:
2020
include:
2121
- { symfony-locked-version: none, dependency-version: prefer-lowest }
22+
- { symfony-locked-version: none, dependency-version: prefer-stable }
2223
- { symfony-locked-version: 3.4.*, dependency-version: prefer-stable }
2324
- { symfony-locked-version: 4.4.*, dependency-version: prefer-stable }
2425
name: PHPUnit (Symfony Version Lock ${{ matrix.symfony-locked-version }}, ${{ matrix.dependency-version }})
@@ -31,13 +32,13 @@ jobs:
3132
- uses: actions/cache@v2
3233
with:
3334
path: vendor
34-
key: composer-${{ runner.os }}-${{ env.PHP_VERSION }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-${{ hashFiles('composer.json', 'composer.lock') }}
35+
key: composer-${{ runner.os }}-${{ env.PHP_VERSION }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-${{ hashFiles('composer.json') }}
3536
restore-keys: |
3637
composer-${{ runner.os }}-${{ env.PHP_VERSION }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-
37-
composer-${{ runner.os }}-${{ env.PHP_VERSION }}-
38-
composer-${{ runner.os }}-
3938
- run: VERSION=${{ matrix.symfony-locked-version }} .github/workflows/lock-symfony-version.sh
4039
if: matrix.symfony-locked-version != 'none'
4140
- run: composer update --${{ matrix.dependency-version }} --no-interaction --no-scripts --no-progress --prefer-dist
4241
- run: composer show
4342
- run: vendor/bin/phpunit
43+
- uses: lhotari/action-upterm@v1
44+
if: failure()

composer.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,21 @@
66
"require": {
77
"php": ">=7.2",
88
"psr/log": "^1.0.2",
9-
"symfony/dependency-injection": "^3.4.11|^4.0",
10-
"symfony/http-kernel": "^3.4.11|^4.0",
11-
"symfony/twig-bundle": "^3.4.11|^4.0",
9+
"symfony/dependency-injection": "^3.4.11|^4.0|5.3.*",
10+
"symfony/http-kernel": "^3.4.11|^4.0|5.3.*",
11+
"symfony/twig-bundle": "^3.4.11|^4.0|5.3.*",
1212
"thunderer/shortcode": "^0.6.5|^0.7",
13-
"twig/twig": "^1.34|^2.0"
13+
"twig/twig": "^1.34|^2.0|^3.0"
1414
},
1515

1616
"require-dev": {
17-
"phpunit/phpunit": "^7.0|^8.0",
18-
"symfony/expression-language": "^3.4.11|^4.0",
19-
"symfony/framework-bundle": "^3.4.11|^4.0",
17+
"phpunit/phpunit": "^7.0|^8.0|^9.0",
18+
"symfony/expression-language": "^3.4.11|^4.0|5.3.*",
19+
"symfony/framework-bundle": "^3.4.11|^4.0|5.3.*",
2020
"symfony/phpunit-bridge": "*",
21-
"symfony/templating": "^3.4.11|^4.0",
22-
"symfony/yaml": "^3.4.11|^4.0"
21+
"symfony/routing": "^3.4.11|^4.0|5.3.*",
22+
"symfony/templating": "^3.4.11|^4.0|5.3.*",
23+
"symfony/yaml": "^3.4.11|^4.0|5.3.*"
2324
},
2425

2526
"autoload": {

0 commit comments

Comments
 (0)