Skip to content

Commit 19ff4b2

Browse files
pl-githubpl-github
authored
Merge pull request #3 from brainbits/attributes
Add support for phpunit 10 attributes
2 parents 25cc800 + f554bd1 commit 19ff4b2

26 files changed

+619
-362
lines changed

‎.github/workflows/code_coverage.yaml

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,30 @@ jobs:
1111

1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v2
15-
- uses: shivammathur/setup-php@master
16-
with:
17-
php-version: 8.1
18-
coverage: xdebug
19-
- name: Load dependencies from cache
20-
id: composer-cache
21-
run: |
22-
echo "::set-output name=dir::$(composer config cache-files-dir)"
23-
- uses: actions/cache@v1
24-
with:
25-
path: ${{ steps.composer-cache.outputs.dir }}
26-
key: ${{ runner.os }}-php8.1-composer-${{ hashFiles('**/composer.json') }}
27-
restore-keys: |
28-
${{ runner.os }}-php8.1-composer-
14+
- uses: actions/checkout@v3
15+
- uses: shivammathur/setup-php@master
16+
with:
17+
php-version: 8.3
18+
coverage: xdebug
19+
- name: Load dependencies from cache
20+
id: composer-cache
21+
run: |
22+
echo "::set-output name=dir::$(composer config cache-files-dir)"
23+
- uses: actions/cache@v1
24+
with:
25+
path: ${{ steps.composer-cache.outputs.dir }}
26+
key: ${{ runner.os }}-php8.3-composer-${{ hashFiles('**/composer.json') }}
27+
restore-keys: |
28+
${{ runner.os }}-php8.3-composer-
2929
30-
- run: composer install --prefer-dist --no-progress --no-suggest
31-
- run: php vendor/bin/phpunit --coverage-clover build/logs/clover.xml
32-
- run: php vendor/bin/php-coveralls --verbose
33-
env:
34-
COVERALLS_RUN_LOCALLY: 1
35-
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
30+
- run: composer install --prefer-dist --no-progress --no-suggest
31+
- run: php vendor/bin/phpunit --coverage-clover build/logs/clover.xml
32+
33+
- uses: codecov/codecov-action@v3
34+
with:
35+
token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos
36+
files: build/logs/clover.xml # optional
37+
flags: unittests # optional
38+
name: codecov-umbrella # optional
39+
fail_ci_if_error: true # optional (default = false)
40+
verbose: true # optional (default = false)

‎.github/workflows/coding_standards.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v2
1414
- uses: shivammathur/setup-php@master
1515
with:
16-
php-version: 8.1
16+
php-version: 8.3
1717
coverage: none
1818
- name: Load dependencies from cache
1919
id: composer-cache
@@ -22,9 +22,9 @@ jobs:
2222
- uses: actions/cache@v1
2323
with:
2424
path: ${{ steps.composer-cache.outputs.dir }}
25-
key: ${{ runner.os }}-php8.1-composer-${{ hashFiles('**/composer.json') }}
25+
key: ${{ runner.os }}-php8.3-composer-${{ hashFiles('**/composer.json') }}
2626
restore-keys: |
27-
${{ runner.os }}-php8.1-composer-
27+
${{ runner.os }}-php8.3-composer-
2828
2929
- run: composer validate --strict
3030
- run: composer install --prefer-dist --no-progress --no-suggest

‎.github/workflows/phpstan.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: actions/checkout@v2
1414
- uses: shivammathur/setup-php@master
1515
with:
16-
php-version: 8.1
16+
php-version: 8.3
1717
coverage: none
1818
- name: Load dependencies from cache
1919
id: composer-cache
@@ -22,9 +22,9 @@ jobs:
2222
- uses: actions/cache@v1
2323
with:
2424
path: ${{ steps.composer-cache.outputs.dir }}
25-
key: ${{ runner.os }}-php8.1-composer-${{ hashFiles('**/composer.json') }}
25+
key: ${{ runner.os }}-php8.3-composer-${{ hashFiles('**/composer.json') }}
2626
restore-keys: |
27-
${{ runner.os }}-php8.1-composer-
27+
${{ runner.os }}-php8.3-composer-
2828
2929
- run: composer install --prefer-dist --no-progress --no-suggest
3030
- run: composer run-script phpstan

‎.github/workflows/release.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
2+
3+
name: "Release"
4+
5+
on:
6+
push:
7+
branches:
8+
- "master"
9+
10+
jobs:
11+
tests:
12+
name: "Create Release"
13+
14+
runs-on: "ubuntu-latest"
15+
16+
steps:
17+
- name: "Checkout"
18+
uses: "actions/checkout@v3"
19+
20+
- uses: "actions/setup-node@v3"
21+
with:
22+
node-version: 'lts/*'
23+
24+
- name: "Run semantic-release"
25+
env:
26+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27+
run: npx semantic-release

‎.github/workflows/tests.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
php-versions: ['7.4', '8.0', '8.1', '8.2']
14+
php-versions: ['8.1', '8.2', '8.3']
1515

1616
name: Tests on PHP ${{ matrix.php-versions }}
1717
steps:
@@ -41,7 +41,7 @@ jobs:
4141
- uses: actions/checkout@master
4242
- uses: shivammathur/setup-php@v2
4343
with:
44-
php-version: 7.4
44+
php-version: 8.1
4545
coverage: none
4646
- name: Load dependencies from cache
4747
id: composer-cache
@@ -50,9 +50,9 @@ jobs:
5050
- uses: actions/cache@v1
5151
with:
5252
path: ${{ steps.composer-cache.outputs.dir }}
53-
key: ${{ runner.os }}-php7.4-lowest-composer-${{ hashFiles('**/composer.json') }}
53+
key: ${{ runner.os }}-php8.1-lowest-composer-${{ hashFiles('**/composer.json') }}
5454
restore-keys: |
55-
${{ runner.os }}-php7.4-lowest-composer-
55+
${{ runner.os }}-php8.1-lowest-composer-
5656
- run: composer update --no-progress --no-suggest --prefer-lowest
5757
- run: php vendor/bin/phpunit
5858

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/.phpcs-cache
2-
/.phpunit.result.cache
2+
/.phpunit.cache
33
/build
44
/composer.lock
55
/vendor/

‎.releaserc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"plugins": [
3+
"@semantic-release/commit-analyzer",
4+
"@semantic-release/release-notes-generator",
5+
"@semantic-release/github"
6+
],
7+
"branches": [
8+
"master"
9+
],
10+
tagFormat: '${version}',
11+
}

‎composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
],
1818
"minimum-stability": "stable",
1919
"require": {
20-
"php": "^7.4|^8.0",
20+
"php": "^8.1",
2121
"nette/utils": "^3.0",
22-
"nikic/php-parser": "^4.3",
22+
"nikic/php-parser": "^4.3|^5.0",
2323
"phpstan/phpstan": "^1.0"
2424
},
2525
"require-dev": {
2626
"brainbits/phpcs-standard": "^4.0",
2727
"php-coveralls/php-coveralls": "^2.0",
2828
"phpstan/phpstan-php-parser": "^1.0",
2929
"phpstan/phpstan-phpunit": "^1.0",
30-
"phpunit/phpunit": "^8.5.2 || ^9.0.0"
30+
"phpunit/phpunit": "^10.5"
3131
},
3232
"scripts": {
3333
"check-all": [

‎phpunit.xml.dist

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0"?>
2-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="./vendor/autoload.php" colors="true" verbose="true">
3-
<coverage processUncoveredFiles="true">
4-
<include>
5-
<directory suffix=".php">src</directory>
6-
</include>
7-
</coverage>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" bootstrap="./vendor/autoload.php" colors="true" cacheDirectory=".phpunit.cache">
83
<testsuites>
94
<testsuite name="main">
105
<directory>tests</directory>
116
</testsuite>
127
</testsuites>
8+
<source>
9+
<include>
10+
<directory suffix=".php">src</directory>
11+
</include>
12+
</source>
1313
</phpunit>

‎rules.neon

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ parametersSchema:
99

1010
services:
1111
-
12-
class: BrainbitsPhpStan\CoversAnnotationRule
12+
class: BrainbitsPhpStan\CoversClassPresentRule
1313
arguments:
1414
unitTestNamespaceContainsString: %brainbits.unitTestNamespaceContainsString%
1515
tags:
1616
- phpstan.rules.rule
1717

1818

1919
-
20-
class: BrainbitsPhpStan\CoversExistsRule
20+
class: BrainbitsPhpStan\CoversClassExistsRule
2121
tags:
2222
- phpstan.rules.rule
2323

0 commit comments

Comments
 (0)