Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 73552d7

Browse files
committed
Remove PHPUnit workaround
1 parent 4a6c5e3 commit 73552d7

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Install PHP
1818
uses: shivammathur/setup-php@v2
1919
with:
20-
php-version: '7.4'
20+
php-version: '8.1'
2121
coverage: 'none'
2222
- name: Cache dependencies
2323
uses: actions/cache@v3
@@ -52,8 +52,11 @@ jobs:
5252
- ""
5353
include:
5454
- os: windows-latest
55-
php_version: 8.0
55+
php_version: 8.1
5656
dependencies_level: --prefer-lowest
57+
- os: windows-latest
58+
php_version: 8.1
59+
dependencies_level: ''
5760
runs-on: ${{ matrix.os }}
5861
steps:
5962
- name: Set git to use LF on windows
@@ -76,22 +79,14 @@ jobs:
7679
key: "cache-composer-${{ hashFiles('composer.json') }}"
7780
restore-keys: 'cache-composer-'
7881
- name: Run composer
79-
if: ${{ matrix.php_version != '8.0' && matrix.php_version != '8.1' && matrix.php_version != '8.2' && matrix.php_version != '8.3' }}
8082
run: composer update ${{ matrix.dependencies_level }} --prefer-dist --no-interaction --no-progress
81-
- name: Run composer with workaround for PHP 8 and incompatible PHPUnit
82-
if: ${{ matrix.php_version == '8.0' || matrix.php_version == '8.1' || matrix.php_version == '8.2' || matrix.php_version == '8.3' }}
83-
run: composer update ${{ matrix.dependencies_level }} --ignore-platform-reqs --prefer-dist --no-interaction --no-progress
8483
- name: Check composer.json
8584
run: composer normalize --dry-run
8685
- name: Run tests with coverage
87-
if: ${{ matrix.php_version != '8.0' && matrix.php_version != '8.1' && matrix.php_version != '8.2' && matrix.php_version != '8.3' }}
86+
if: ${{ matrix.os != 'windows-latest' && matrix.php_version == '8.1' && matrix.dependencies_level != '--prefer-lowest' }}
8887
run: php vendor/bin/phpunit --coverage-clover=coverage.xml
8988
- name: Run tests
90-
if: ${{ matrix.php_version == '8.0' }}
9189
run: vendor/bin/phpunit
92-
- name: Run tests
93-
if: ${{ matrix.php_version == '8.1' }}
94-
run: vendor/bin/phpunit --no-configuration --bootstrap=tests/bootstrap.php --dont-report-useless-tests vendor/squizlabs/php_codesniffer/tests/Standards/AllSniffs.php
9590
- name: Run integration tests
9691
run: vendor/bin/phpcs -s --standard=MO4 integrationtests/testfile.php
9792
- name: Run PHPStan

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ composer.lock
77
/build/
88
.atoum.php
99
phpunit.xml
10+
.phpunit.result.cache
1011
behat.yml
1112

1213
# OSX

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
"dealerdirect/phpcodesniffer-composer-installer": "~0.7 || ~1.0",
2828
"escapestudios/symfony2-coding-standard": "^3.10.0",
2929
"slevomat/coding-standard": "^8.14",
30-
"squizlabs/php_codesniffer": "^3.6.2"
30+
"squizlabs/php_codesniffer": "^3.8.0"
3131
},
3232
"require-dev": {
3333
"ergebnis/composer-normalize": ">=2.19 <2.30",
3434
"phan/phan": "^5.4.2",
3535
"phpstan/phpstan": "^1.0",
3636
"phpstan/phpstan-strict-rules": "^1.0",
37-
"phpunit/phpunit": "^7.0",
37+
"phpunit/phpunit": "^7.5.20 || ^8.5.36 || ^9.6.15",
3838
"psalm/plugin-phpunit": "^0.18",
3939
"vimeo/psalm": "^4.30"
4040
},

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /