Skip to content

Commit 8db956f

Browse files
committed
Use the latest PHPUnit wherever possible
1 parent 592d3d1 commit 8db956f

File tree

6 files changed

+801
-503
lines changed

6 files changed

+801
-503
lines changed

.github/workflows/build.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ jobs:
140140
- name: "Install dependencies"
141141
run: "composer install --no-interaction --no-progress --no-suggest"
142142

143-
- name: "Update PHPUnit"
144-
if: matrix.php-version == '7.4' || matrix.php-version == '8.0'
145-
run: "composer remove --dev brianium/paratest && composer require phpdocumentor/reflection-docblock:'5.2.0' && composer require --dev phpspec/prophecy:'^1.11.1' && composer require --dev phpunit/phpunit:'^9.3' --update-with-dependencies"
143+
- name: "Downgrade PHPUnit"
144+
if: matrix.php-version == '7.1' || matrix.php-version == '7.2'
145+
run: "composer require --dev brianium/paratest:^4.0 phpunit/phpunit:^7.5.20 --update-with-dependencies"
146146

147147
- name: "Transform source code"
148148
if: matrix.php-version != '7.4' && matrix.php-version != '8.0'
@@ -217,9 +217,9 @@ jobs:
217217
- name: "Install dependencies"
218218
run: "composer install --no-interaction --no-progress --no-suggest"
219219

220-
- name: "Update PHPUnit"
221-
if: matrix.php-version == '7.4' || matrix.php-version == '8.0'
222-
run: "composer remove --dev brianium/paratest && composer require phpdocumentor/reflection-docblock:'5.2.0' && composer require --dev phpspec/prophecy:'^1.11.1' && composer require --dev phpunit/phpunit:'^9.3' --update-with-dependencies"
220+
- name: "Downgrade PHPUnit"
221+
if: matrix.php-version == '7.1' || matrix.php-version == '7.2'
222+
run: "composer require --dev brianium/paratest:^4.0 phpunit/phpunit:^7.5.20 --update-with-dependencies"
223223

224224
- name: "Transform source code"
225225
if: matrix.php-version != '7.4' && matrix.php-version != '8.0'

build.xml

+3
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@
191191
<arg path="${phpunit.executable}"/>
192192
<arg value="-c"/>
193193
<arg value="tests/phpunit.xml"/>
194+
<arg value="--no-coverage"/>
194195
<arg path="tests/PHPStan"/>
195196
</exec>
196197
</target>
@@ -209,6 +210,7 @@
209210
<arg value="tests/phpunit.xml"/>
210211
<arg value="--exclude-group"/>
211212
<arg value="exec"/>
213+
<arg value="--no-coverage"/>
212214
<arg path="tests/PHPStan"/>
213215
</exec>
214216
</target>
@@ -229,6 +231,7 @@
229231
<arg value="exec"/>
230232
<arg value="--bootstrap"/>
231233
<arg path="tests/bootstrap-static-reflection.php"/>
234+
<arg value="--no-coverage"/>
232235
<arg path="tests/PHPStan"/>
233236
</exec>
234237
</target>

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
"phpstan/phpstan": "self.version"
4141
},
4242
"require-dev": {
43-
"brianium/paratest": "^4.0",
43+
"brianium/paratest": "^6.2.0",
4444
"nategood/httpful": "^0.2.20",
4545
"phing/phing": "^2.16.0",
4646
"php-parallel-lint/php-parallel-lint": "^1.2.0",
4747
"phpstan/phpstan-deprecation-rules": "^0.12.3",
4848
"phpstan/phpstan-php-parser": "^0.12",
4949
"phpstan/phpstan-phpunit": "^0.12",
5050
"phpstan/phpstan-strict-rules": "^0.12",
51-
"phpunit/phpunit": "^7.5.18"
51+
"phpunit/phpunit": "^9.5.4"
5252
},
5353
"config": {
5454
"platform": {

0 commit comments

Comments
 (0)