Skip to content

Commit 318a82e

Browse files
authored
Merge pull request #4057 from oleibman/unitstan
Phpunit 10 and Phpstan 1.11
2 parents 101f903 + 192d4a3 commit 318a82e

File tree

21 files changed

+331
-419
lines changed

21 files changed

+331
-419
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
- name: "Run PHPUnit tests (Experimental: ${{ matrix.experimental }})"
6262
env:
6363
FAILURE_ACTION: "${{ matrix.experimental == true }}"
64-
run: vendor/bin/phpunit --verbose || $FAILURE_ACTION
64+
run: vendor/bin/phpunit --display-incomplete --display-skipped --display-deprecations --display-errors --display-notices --display-warnings || $FAILURE_ACTION
6565

6666
phpdoc-types:
6767
runs-on: ubuntu-latest

.php-cs-fixer.dist.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
$config
1111
->setRiskyAllowed(true)
1212
->setFinder($finder)
13+
->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
1314
->setCacheFile(sys_get_temp_dir() . '/php-cs-fixer' . preg_replace('~\W~', '-', __DIR__))
1415
->setRules([
1516
'align_multiline_comment' => true,

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
"phpcompatibility/php-compatibility": "^9.3",
9696
"phpstan/phpstan": "^1.1",
9797
"phpstan/phpstan-phpunit": "^1.0",
98-
"phpunit/phpunit": "^9.6",
98+
"phpunit/phpunit": "^9.6 || ^10.5",
9999
"squizlabs/php_codesniffer": "^3.7",
100100
"tecnickcom/tcpdf": "^6.5"
101101
},

0 commit comments

Comments
 (0)