Skip to content

Commit 0bf04a9

Browse files
jmschemaxhelias
jmsche
authored and
maxhelias
committed
Allow Symfony 7 & simplify testing workflow
1 parent a2cd947 commit 0bf04a9

File tree

2 files changed

+43
-118
lines changed

2 files changed

+43
-118
lines changed

‎.github/workflows/test.yaml‎

Lines changed: 31 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -22,121 +22,45 @@ jobs:
2222
wget https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v3.13.2/php-cs-fixer.phar -q
2323
php php-cs-fixer.phar fix --dry-run --diff
2424
25-
tests-php-8-0-symfony-5-4:
25+
phpunit:
26+
name: PHPUnit (PHP ${{ matrix.php-version }} - Symfony ${{ matrix.symfony-version }})
2627
runs-on: ubuntu-latest
2728
env:
28-
SYMFONY_VERSION: 5.4.*
29-
steps:
30-
- uses: actions/checkout@v3
31-
- uses: shivammathur/setup-php@v2
32-
with:
33-
php-version: '8.0'
34-
coverage: none
35-
- name: PHPUnit
36-
run: |
37-
composer require --no-update symfony/config=$SYMFONY_VERSION symfony/http-kernel=$SYMFONY_VERSION symfony/dependency-injection=$SYMFONY_VERSION symfony/options-resolver=$SYMFONY_VERSION
38-
composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
39-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
40-
php vendor/bin/simple-phpunit
29+
SYMFONY_REQUIRE: ${{ matrix.symfony-version }}
4130

42-
tests-php-8-0-symfony-6-0:
43-
runs-on: ubuntu-latest
44-
env:
45-
SYMFONY_VERSION: 6.0.*
46-
steps:
47-
- uses: actions/checkout@v3
48-
- uses: shivammathur/setup-php@v2
49-
with:
50-
php-version: '8.0'
51-
coverage: none
52-
- name: PHPUnit
53-
run: |
54-
composer require --no-update symfony/config=$SYMFONY_VERSION symfony/http-kernel=$SYMFONY_VERSION symfony/dependency-injection=$SYMFONY_VERSION symfony/options-resolver=$SYMFONY_VERSION
55-
composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
56-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
57-
php vendor/bin/simple-phpunit
31+
strategy:
32+
matrix:
33+
php-version:
34+
- '8.1'
35+
- '8.2'
36+
symfony-version:
37+
- '5.4.*'
38+
- '6.3.*'
39+
include:
40+
- php-version: '8.0'
41+
symfony-version: '5.4.*'
42+
- php-version: '8.2'
43+
symfony-version: '6.4.*'
44+
- php-version: '8.2'
45+
symfony-version: '7.0.*'
5846

59-
tests-php-8-1-symfony-6-1:
60-
runs-on: ubuntu-latest
61-
env:
62-
SYMFONY_VERSION: 6.1.*
6347
steps:
64-
- uses: actions/checkout@v3
65-
- uses: shivammathur/setup-php@v2
66-
with:
67-
php-version: '8.1'
68-
coverage: none
69-
- name: PHPUnit
70-
run: |
71-
composer require --no-update symfony/config=$SYMFONY_VERSION symfony/http-kernel=$SYMFONY_VERSION symfony/dependency-injection=$SYMFONY_VERSION symfony/options-resolver=$SYMFONY_VERSION
72-
composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
73-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
74-
php vendor/bin/simple-phpunit
48+
- name: Checkout code
49+
uses: actions/checkout@v4
7550

76-
tests-php-8-1-symfony-6-2:
77-
runs-on: ubuntu-latest
78-
env:
79-
SYMFONY_VERSION: 6.2.*
80-
steps:
81-
- uses: actions/checkout@v3
82-
- uses: shivammathur/setup-php@v2
51+
- name: Install PHP with pcov
52+
uses: shivammathur/setup-php@v2
8353
with:
84-
php-version: '8.1'
85-
coverage: none
86-
- name: PHPUnit
87-
run: |
88-
composer require --no-update symfony/config=$SYMFONY_VERSION symfony/http-kernel=$SYMFONY_VERSION symfony/dependency-injection=$SYMFONY_VERSION symfony/options-resolver=$SYMFONY_VERSION
89-
composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
90-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
91-
php vendor/bin/simple-phpunit
54+
coverage: none
55+
php-version: ${{ matrix.php-version }}
9256

93-
tests-php-8-2-symfony-6-1:
94-
runs-on: ubuntu-latest
95-
env:
96-
SYMFONY_VERSION: 6.1.*
97-
steps:
98-
- uses: actions/checkout@v3
99-
- uses: shivammathur/setup-php@v2
100-
with:
101-
php-version: '8.2'
102-
coverage: none
103-
- name: PHPUnit
57+
- name: Install Symfony Flex
10458
run: |
105-
composer require --no-update symfony/config=$SYMFONY_VERSION symfony/http-kernel=$SYMFONY_VERSION symfony/dependency-injection=$SYMFONY_VERSION symfony/options-resolver=$SYMFONY_VERSION
106-
composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
107-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
108-
php vendor/bin/simple-phpunit
59+
composer config --global --no-plugins allow-plugins.symfony/flex true
60+
composer global require --no-progress --no-scripts --no-plugins symfony/flex
10961
110-
tests-php-8-2-symfony-6-2:
111-
runs-on: ubuntu-latest
112-
env:
113-
SYMFONY_VERSION: 6.2.*
114-
steps:
115-
- uses: actions/checkout@v3
116-
- uses: shivammathur/setup-php@v2
117-
with:
118-
php-version: '8.2'
119-
coverage: none
120-
- name: PHPUnit
121-
run: |
122-
composer require --no-update symfony/config=$SYMFONY_VERSION symfony/http-kernel=$SYMFONY_VERSION symfony/dependency-injection=$SYMFONY_VERSION symfony/options-resolver=$SYMFONY_VERSION
123-
composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
124-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
125-
php vendor/bin/simple-phpunit
62+
- name: Install Composer dependencies
63+
uses: ramsey/composer-install@v2
12664

127-
tests-php-8-2-symfony-6-3:
128-
runs-on: ubuntu-latest
129-
env:
130-
SYMFONY_VERSION: 6.3.*
131-
steps:
132-
- uses: actions/checkout@v3
133-
- uses: shivammathur/setup-php@v2
134-
with:
135-
php-version: '8.2'
136-
coverage: none
137-
- name: PHPUnit
138-
run: |
139-
composer require --no-update symfony/config=$SYMFONY_VERSION symfony/http-kernel=$SYMFONY_VERSION symfony/dependency-injection=$SYMFONY_VERSION symfony/options-resolver=$SYMFONY_VERSION
140-
composer require --no-update --dev symfony/framework-bundle=$SYMFONY_VERSION symfony/yaml=$SYMFONY_VERSION
141-
composer update --prefer-dist --no-interaction --no-ansi --no-progress
142-
php vendor/bin/simple-phpunit
65+
- name: Run PHPUnit
66+
run: vendor/bin/simple-phpunit

‎composer.json‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
"require": {
2323
"php": ">=8.0",
2424
"league/flysystem": "^3.0",
25-
"symfony/config": "^5.4|^6.0",
26-
"symfony/deprecation-contracts": "^2.1|^3",
27-
"symfony/http-kernel": "^5.4|^6.0",
28-
"symfony/dependency-injection": "^5.4|^6.0",
29-
"symfony/options-resolver": "^5.4|^6.0"
25+
"symfony/config": "^5.4 || ^6.0 || ^7.0",
26+
"symfony/deprecation-contracts": "^2.1 || ^3",
27+
"symfony/http-kernel": "^5.4 || ^6.0 || ^7.0",
28+
"symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0",
29+
"symfony/options-resolver": "^5.4 || ^6.0 || ^7.0"
3030
},
3131
"require-dev": {
3232
"league/flysystem-async-aws-s3": "^3.1",
@@ -37,16 +37,17 @@
3737
"league/flysystem-memory": "^3.1",
3838
"league/flysystem-read-only": "^3.15",
3939
"league/flysystem-sftp-v3": "^3.1",
40-
"symfony/dotenv": "^5.4|^6.0",
41-
"symfony/framework-bundle": "^5.4|^6.0",
42-
"symfony/phpunit-bridge": "^5.4|^6.0",
43-
"symfony/var-dumper": "^5.4|^6.0",
44-
"symfony/yaml": "^5.4|^6.0"
40+
"symfony/dotenv": "^5.4 || ^6.0 || ^7.0",
41+
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
42+
"symfony/phpunit-bridge": "^5.4 || ^6.0 || ^7.0",
43+
"symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
44+
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
4545
},
4646
"config": {
4747
"preferred-install": {
4848
"*": "dist"
4949
},
5050
"sort-packages": true
51-
}
51+
},
52+
"minimum-stability": "beta"
5253
}

0 commit comments

Comments
 (0)