Skip to content

Commit 1ff2547

Browse files
committed
Update test matrix, bump minimium requirements
1 parent f582f29 commit 1ff2547

File tree

4 files changed

+29
-37
lines changed

4 files changed

+29
-37
lines changed

.github/workflows/lock-symfony-version.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/tests.yml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,31 @@ on:
66
- master
77
pull_request:
88

9-
env:
10-
SYMFONY_DEPRECATIONS_HELPER: weak
11-
129
jobs:
1310
PHPUnit:
1411
runs-on: ubuntu-22.04
1512
strategy:
1613
fail-fast: false
1714
matrix:
1815
include:
19-
- { php-version: 8.1, symfony-locked-version: none, dependency-version: prefer-lowest }
20-
- { php-version: 8.2, symfony-locked-version: 6.4.*, dependency-version: prefer-stable }
21-
- { php-version: 8.3, symfony-locked-version: none, dependency-version: prefer-stable }
22-
name: PHPUnit (PHP ${{matrix.php-version}}, Symfony Version Lock ${{ matrix.symfony-locked-version }}, ${{ matrix.dependency-version }})
16+
- { php-version: 8.3, symfony-version: 6.4.*, dependency-version: prefer-stable }
17+
- { php-version: 8.4, symfony-version: 7.*, dependency-version: prefer-stable }
18+
name: PHPUnit (PHP ${{matrix.php-version}}, Symfony version lock ${{ matrix.symfony-version || 'none' }}, ${{ matrix.dependency-version }})
2319
steps:
2420
- uses: actions/checkout@v4
2521
- uses: shivammathur/setup-php@v2
2622
with:
2723
php-version: ${{ matrix.php-version }}
2824
coverage: none
29-
tools: composer:v2
25+
tools: composer:v2, flex
3026
- uses: actions/cache@v4
3127
with:
3228
path: vendor
33-
key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-${{ hashFiles('composer.json') }}
29+
key: composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.symfony-version }}-${{ matrix.dependency-version }}-${{ hashFiles('composer.json') }}
3430
restore-keys: |
35-
composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.symfony-locked-version }}-${{ matrix.dependency-version }}-
36-
- run: VERSION=${{ matrix.symfony-locked-version }} .github/workflows/lock-symfony-version.sh
37-
if: matrix.symfony-locked-version != 'none'
31+
composer-${{ runner.os }}-${{ matrix.php-version }}-${{ matrix.symfony-version }}-${{ matrix.dependency-version }}-
3832
- run: composer update --${{ matrix.dependency-version }} --no-interaction --no-scripts --no-progress --ansi
33+
env:
34+
SYMFONY_REQUIRE: ${{ matrix.symfony-version }}
3935
- run: composer show
40-
- run: vendor/bin/phpunit
36+
- run: vendor/bin/phpunit --display-warnings --display-deprecations

composer.json

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,16 @@
1919
],
2020

2121
"require": {
22-
"php": "^8.1",
23-
"symfony/config": "^5.0 | ^6.0 | ^7.0",
24-
"symfony/dependency-injection": "^5.0 | ^6.0 | ^7.0",
25-
"symfony/deprecation-contracts": "^2.0|^3.0",
26-
"symfony/http-foundation": "^5.0 | ^6.0 | ^7.0",
27-
"symfony/http-kernel": "^6.4 | ^7.0"
22+
"php": ">= 8.1",
23+
"symfony/config": "^6.4|^7.0",
24+
"symfony/dependency-injection": "^6.4|^7.0",
25+
"symfony/deprecation-contracts": "^3.0",
26+
"symfony/http-foundation": "^6.4|^7.0",
27+
"symfony/http-kernel": "^6.4|^7.0"
2828
},
2929

3030
"require-dev": {
31-
"phpunit/phpunit": "^9.6",
32-
"symfony/phpunit-bridge": "^6.0 | ^7.0"
31+
"phpunit/phpunit": "^10.5.58"
3332
},
3433

3534
"suggest": {

phpunit.xml.dist

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpunit
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd">
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/11.5/phpunit.xsd"
5+
bootstrap="vendor/autoload.php"
6+
colors="true"
7+
displayDetailsOnTestsThatTriggerDeprecations="true"
8+
displayDetailsOnTestsThatTriggerNotices="true"
9+
displayDetailsOnTestsThatTriggerWarnings="true"
10+
>
11+
<source ignoreSuppressionOfDeprecations="true">
12+
<include>
13+
<directory>src</directory>
14+
</include>
15+
</source>
516
<testsuites>
617
<testsuite name="Library Test Suite">
718
<directory>tests</directory>
819
</testsuite>
920
</testsuites>
10-
11-
<!-- Filter for code coverage -->
12-
<filter>
13-
<whitelist processUncoveredFilesFromWhitelist="true">
14-
<directory suffix=".php">src/</directory>
15-
</whitelist>
16-
</filter>
17-
18-
<listeners>
19-
<listener class="\Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
20-
</listeners>
2121
</phpunit>

0 commit comments

Comments
 (0)