diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index 410430db..88f25a9b 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -38,14 +38,19 @@ jobs: enable_yamllinter: true unit-tests-linux: - name: "Unit tests, PHP ${{ matrix.php-versions }}, ${{ matrix.operating-system }}" + name: "Unit tests, PHP ${{ matrix.php-versions }}, symfony ${{ matrix.symfony }}, ${{ matrix.operating-system }}" runs-on: ${{ matrix.operating-system }} needs: [phplinter, linter] strategy: fail-fast: false matrix: operating-system: [ubuntu-latest] - php-versions: ['8.1', '8.2', '8.3', '8.4'] + php-versions: ['8.2', '8.3', '8.4'] + symfony: ['~6.4.0', '~7.1.0', '~7.2.0', '^7.3'] + include: + - operating-system: 'ubuntu-latest' + php-versions: '8.1' + symfony: '~6.4.0' steps: - name: Setup PHP, with composer and extensions @@ -71,6 +76,9 @@ jobs: - uses: actions/checkout@v4 + - name: "Require symfony/finder:${{ matrix.symfony }}" + run: composer require --no-update symfony/finder:${{ matrix.symfony }} + - name: Get composer cache directory run: echo COMPOSER_CACHE="$(composer config cache-files-dir)" >> "$GITHUB_ENV" @@ -85,15 +93,15 @@ jobs: run: composer install --no-progress --prefer-dist --optimize-autoloader - name: Run unit tests with coverage - if: ${{ matrix.php-versions == '8.4' }} + if: ${{ matrix.php-versions == '8.4' && matrix.symfony == '' }} run: vendor/bin/phpunit - name: Run unit tests (no coverage) - if: ${{ matrix.php-versions != '8.4' }} + if: ${{ matrix.php-versions != '8.4' || matrix.symfony != '' }} run: vendor/bin/phpunit --no-coverage - name: Save coverage data - if: ${{ matrix.php-versions == '8.4' }} + if: ${{ matrix.php-versions == '8.4' && matrix.symfony == '' }} uses: actions/upload-artifact@v4 with: name: coverage-data diff --git a/composer.json b/composer.json index 64549e07..5d33df46 100644 --- a/composer.json +++ b/composer.json @@ -44,7 +44,7 @@ "simplesamlphp/assert": "~1.8.1", "simplesamlphp/composer-xmlprovider-installer": "~1.0.2", - "symfony/finder": "~6.4.0" + "symfony/finder": "~6.4.0|^7.1" }, "require-dev": { "simplesamlphp/simplesamlphp-test-framework": "~1.9.2"