Skip to content

Commit 2d90917

Browse files
committed
Use PHPUnit 11 when possible
1 parent 17059e5 commit 2d90917

File tree

2 files changed

+35
-5
lines changed

2 files changed

+35
-5
lines changed

.github/workflows/continuous-integration.yml

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,24 @@ jobs:
9595
ENABLE_SECOND_LEVEL_CACHE: 0
9696
ENABLE_NATIVE_LAZY_OBJECTS: ${{ matrix.native_lazy }}
9797

98-
- name: "Run PHPUnit with Second Level Cache"
99-
run: "vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml --exclude-group performance,non-cacheable,locking_functional --coverage-clover=coverage-cache.xml"
98+
- name: "Run PHPUnit with Second Level Cache and PHPUnit 10"
99+
run: |
100+
vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml \
101+
--exclude-group=performance,non-cacheable,locking_functional \
102+
--coverage-clover=coverage-cache.xml
103+
if: "${{ matrix.php-version == '8.1' }}"
104+
env:
105+
ENABLE_SECOND_LEVEL_CACHE: 1
106+
ENABLE_NATIVE_LAZY_OBJECTS: ${{ matrix.native_lazy }}
107+
108+
- name: "Run PHPUnit with Second Level Cache and PHPUnit 11+"
109+
run: |
110+
vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml \
111+
--exclude-group=performance \
112+
--exclude-group=non-cacheable \
113+
--exclude-group=locking_functional \
114+
--coverage-clover=coverage-cache.xml
115+
if: "${{ matrix.php-version != '8.1' }}"
100116
env:
101117
ENABLE_SECOND_LEVEL_CACHE: 1
102118
ENABLE_NATIVE_LAZY_OBJECTS: ${{ matrix.native_lazy }}
@@ -319,8 +335,22 @@ jobs:
319335
env:
320336
ENABLE_SECOND_LEVEL_CACHE: 0
321337

322-
- name: "Run PHPUnit with Second Level Cache"
323-
run: "vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml --exclude-group performance,non-cacheable,locking_functional --coverage-clover=coverage-no-cache.xml"
338+
- name: "Run PHPUnit with Second Level Cache and PHPUnit 10"
339+
run: |
340+
vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml \
341+
--exclude-group=performance,non-cacheable,locking_functional \
342+
--coverage-clover=coverage-no-cache.xml"
343+
if: "${{ matrix.php-version == '8.1' }}"
344+
env:
345+
ENABLE_SECOND_LEVEL_CACHE: 1
346+
- name: "Run PHPUnit with Second Level Cache and PHPUnit 11+"
347+
run: |
348+
vendor/bin/phpunit -c ci/github/phpunit/${{ matrix.extension }}.xml \
349+
--exclude-group=performance \
350+
--exclude-group=non-cacheable \
351+
--exclude-group=locking_functional \
352+
--coverage-clover=coverage-no-cache.xml
353+
if: "${{ matrix.php-version != '8.1' }}"
324354
env:
325355
ENABLE_SECOND_LEVEL_CACHE: 1
326356

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"phpstan/extension-installer": "^1.4",
4444
"phpstan/phpstan": "2.1.22",
4545
"phpstan/phpstan-deprecation-rules": "^2",
46-
"phpunit/phpunit": "^10.4.0",
46+
"phpunit/phpunit": "^10.4.0 || ^11.5",
4747
"psr/log": "^1 || ^2 || ^3",
4848
"squizlabs/php_codesniffer": "3.13.2",
4949
"symfony/cache": "^5.4 || ^6.2 || ^7.0"

0 commit comments

Comments
 (0)