Skip to content

Commit 4a4a82c

Browse files
Merge branch '4.2'
2 parents 3349d8c + d38f4d1 commit 4a4a82c

File tree

5 files changed

+6
-15
lines changed

5 files changed

+6
-15
lines changed

.github/workflows/tests.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@ jobs:
2727
- name: Setup Problem Matchers
2828
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
2929

30-
- name: Mimic PHP 8.0
31-
run: composer config platform.php 8.0.999
32-
if: matrix.php > 8
33-
3430
- name: Install Latest Dependencies
3531
uses: nick-invision/retry@v1
3632
with:
@@ -63,10 +59,6 @@ jobs:
6359
- name: Setup Problem Matchers
6460
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
6561

66-
- name: Mimic PHP 8.0
67-
run: composer config platform.php 8.0.999
68-
if: matrix.php > 8
69-
7062
- name: Install Lowest Dependencies
7163
uses: nick-invision/retry@v1
7264
with:

composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
{
88
"name": "Graham Campbell",
99
"email": "[email protected]",
10-
"homepage": "https://gjcampbell.co.uk/"
1110
},
1211
{
1312
"name": "Vance Lucas",
14-
"email": "[email protected]",
15-
"homepage": "https://vancelucas.com/"
13+
"email": "[email protected]"
1614
}
1715
],
1816
"require": {
@@ -27,7 +25,7 @@
2725
"require-dev": {
2826
"ext-filter": "*",
2927
"bamarni/composer-bin-plugin": "^1.4.1",
30-
"phpunit/phpunit": "^7.5.20 || ^8.5.20 || ^9.5.8"
28+
"phpunit/phpunit": "^7.5.20 || ^8.5.21 || ^9.5.10"
3129
},
3230
"autoload": {
3331
"psr-4": {

phpunit.xml.dist

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
beStrictAboutOutputDuringTests="true"
66
bootstrap="vendor/autoload.php"
77
colors="true"
8+
convertDeprecationsToExceptions="true"
89
convertErrorsToExceptions="true"
910
convertNoticesToExceptions="true"
1011
convertWarningsToExceptions="true"
1112
failOnRisky="true"
12-
failOnWarning="true"
13+
failOnWarning="false"
1314
processIsolation="false"
1415
stopOnError="false"
1516
stopOnFailure="false"

vendor-bin/phpstan/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": {
33
"php": "^7.4",
4-
"phpstan/phpstan": "0.12.98",
4+
"phpstan/phpstan": "0.12.99",
55
"phpstan/extension-installer": "1.1.0",
66
"phpstan/phpstan-deprecation-rules": "0.12.6",
77
"phpstan/phpstan-phpunit": "0.12.22",

vendor-bin/psalm/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"require": {
33
"php": "^7.4",
4-
"psalm/phar": "4.9.3"
4+
"psalm/phar": "4.10.0"
55
},
66
"config": {
77
"preferred-install": "dist"

0 commit comments

Comments
 (0)