Skip to content

Commit 1d7c5c5

Browse files
authored
Merge pull request #3 from donquixote/fork/upgrade-symfony-finder
Support symfony/finder ^7.1 alongside ~6.4.0 (fork)
2 parents 2a584aa + 0eb055d commit 1d7c5c5

File tree

2 files changed

+15
-7
lines changed

2 files changed

+15
-7
lines changed

.github/workflows/php.yml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,19 @@ jobs:
3838
enable_yamllinter: true
3939

4040
unit-tests-linux:
41-
name: "Unit tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}"
41+
name: "Tests, PHP ${{ matrix.php-versions }}, symfony ${{ matrix.symfony }}, ${{ matrix.operating-system }}"
4242
runs-on: ${{ matrix.operating-system }}
4343
needs: [phplinter, linter]
4444
strategy:
4545
fail-fast: false
4646
matrix:
4747
operating-system: [ubuntu-latest]
48-
php-versions: ['8.1', '8.2', '8.3', '8.4']
48+
php-versions: ['8.2', '8.3', '8.4']
49+
symfony: ['~6.4.0', '~7.1.0', '^7.3']
50+
include:
51+
- operating-system: 'ubuntu-latest'
52+
php-versions: '8.1'
53+
symfony: '~6.4.0'
4954

5055
steps:
5156
- name: Setup PHP, with composer and extensions
@@ -71,6 +76,9 @@ jobs:
7176
7277
- uses: actions/checkout@v4
7378

79+
- name: "Require symfony/finder:${{ matrix.symfony }}"
80+
run: composer require --no-update symfony/finder:${{ matrix.symfony }}
81+
7482
- name: Get composer cache directory
7583
run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV"
7684

@@ -85,22 +93,22 @@ jobs:
8593
run: composer install --no-progress --prefer-dist --optimize-autoloader
8694

8795
- name: Run unit tests with coverage
88-
if: ${{ matrix.php-versions == '8.4' }}
96+
if: ${{ matrix.php-versions == '8.4' && matrix.symfony == '^7.3' }}
8997
run: vendor/bin/phpunit
9098

9199
- name: Run unit tests (no coverage)
92-
if: ${{ matrix.php-versions != '8.4' }}
100+
if: ${{ matrix.php-versions != '8.4' || matrix.symfony != '^7.3' }}
93101
run: vendor/bin/phpunit --no-coverage
94102

95103
- name: Save coverage data
96-
if: ${{ matrix.php-versions == '8.4' }}
104+
if: ${{ matrix.php-versions == '8.4' && matrix.symfony == '^7.3' }}
97105
uses: actions/upload-artifact@v4
98106
with:
99107
name: coverage-data
100108
path: ${{ github.workspace }}/build
101109

102110
unit-tests-windows:
103-
name: "Unit tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}"
111+
name: "Tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}"
104112
runs-on: ${{ matrix.operating-system }}
105113
needs: [phplinter, linter]
106114
strategy:

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444

4545
"simplesamlphp/assert": "~1.8.1",
4646
"simplesamlphp/composer-xmlprovider-installer": "~1.0.2",
47-
"symfony/finder": "~6.4.0"
47+
"symfony/finder": "~6.4.0 || ^7.1"
4848
},
4949
"require-dev": {
5050
"simplesamlphp/simplesamlphp-test-framework": "~1.9.2"

0 commit comments

Comments
 (0)