Skip to content

Commit ca8943a

Browse files
committed
Cleanup
1 parent bd05de8 commit ca8943a

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.github/workflows/tests.yaml

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
name: Continuous Integration
1+
name: CI
22

33
on:
4-
pull_request: null
4+
pull_request:
55
push:
66
branches:
77
- master
8-
- develop
98
- release/**
109

1110
permissions:
@@ -85,14 +84,14 @@ jobs:
8584
- name: Setup Problem Matchers for PHPUnit
8685
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
8786

88-
- name: Update PHPUnit
89-
run: composer require --dev phpunit/phpunit ^9.5 --no-update
90-
if: matrix.php == '8.0' && matrix.dependencies == 'lowest'
91-
9287
# These dependencies are not used running the tests but can cause deprecation warnings so we remove them before running the tests
9388
- name: Remove unused dependencies
9489
run: composer remove vimeo/psalm phpstan/phpstan friendsofphp/php-cs-fixer --dev --no-interaction --no-update
9590

91+
# - name: Update PHPUnit
92+
# run: composer require --dev phpunit/phpunit ^8.5.40 --no-update
93+
# if: matrix.php == '7.2'
94+
9695
- name: Install dependencies
9796
uses: ramsey/composer-install@v3
9897
with:

composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"phpstan/phpstan": "1.12.5",
3737
"phpstan/phpstan-phpunit": "1.4.0",
3838
"phpstan/phpstan-symfony": "1.4.10",
39-
"phpunit/phpunit": "^8.5|^9.6",
39+
"phpunit/phpunit": "^8.5.40||^9.6.21",
4040
"symfony/browser-kit": "^4.4.20||^5.0.11||^6.0||^7.0",
4141
"symfony/cache": "^4.4.20||^5.0.11||^6.0||^7.0",
4242
"symfony/dom-crawler": "^4.4.20||^5.0.11||^6.0||^7.0",

0 commit comments

Comments
 (0)