Skip to content

Commit b3df6a8

Browse files
felixuref3l1x
authored andcommitted
Config: use PHP 8.2 base, update dependencies
1 parent 9cbd630 commit b3df6a8

File tree

7 files changed

+27
-14
lines changed

7 files changed

+27
-14
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ indent_style = tab
1111
indent_size = tab
1212
tab_width = 4
1313

14-
[{*.json,*.yml,*.yaml,*.md}]
14+
[*.{json,yaml,yml,md}]
1515
indent_style = space
1616
indent_size = 2

.gitattributes

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
# Not archived
2-
tests export-ignore
1+
.docs export-ignore
32
.editorconfig export-ignore
43
.gitattributes export-ignore
54
.gitignore export-ignore
65
.travis.yml export-ignore
7-
phpstan.neon export-ignore
6+
Makefile export-ignore
87
README.md export-ignore
8+
phpstan.neon export-ignore
99
ruleset.xml export-ignore
10+
tests export-ignore

.gitignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,9 @@
66
/composer.lock
77

88
# Tests
9-
/coverage.xml
9+
/tests/tmp
10+
/coverage.*
11+
/tests/**/*.log
12+
/tests/**/*.html
13+
/tests/**/*.expected
14+
/tests/**/*.actual

Makefile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
1-
.PHONY: install qa cs csf phpstan tests coverage
2-
1+
.PHONY: install
32
install:
43
composer update
54

5+
.PHONY: qa
66
qa: phpstan cs
77

8+
.PHONY: cs
89
cs:
910
ifdef GITHUB_ACTION
10-
vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 --colors -nsp -q --report=checkstyle src tests | cs2pr
11+
vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 --extensions="php,phpt" --colors -nsp -q --report=checkstyle src tests | cs2pr
1112
else
12-
vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 --colors -nsp src tests
13+
vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 --extensions="php,phpt" --colors -nsp src tests
1314
endif
1415

16+
.PHONY: csf
1517
csf:
16-
vendor/bin/phpcbf --standard=ruleset.xml --encoding=utf-8 --colors -nsp src tests
18+
vendor/bin/phpcbf --standard=ruleset.xml --encoding=utf-8 --extensions="php,phpt" --colors -nsp src tests
1719

20+
.PHONY: phpstan
1821
phpstan:
1922
vendor/bin/phpstan analyse -c phpstan.neon
2023

24+
.PHONY: tests
2125
tests:
2226
vendor/bin/tester -s -p php --colors 1 -C tests/Cases
2327

28+
.PHONY: coverage
2429
coverage:
2530
ifdef GITHUB_ACTION
2631
vendor/bin/tester -s -p phpdbg --colors 1 -C --coverage coverage.xml --coverage-src src tests/Cases

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
"contributte/tester": "^0.4.0 || ^0.5.0"
2323
},
2424
"require-dev": {
25+
"contributte/phpstan": "^0.2.0",
2526
"contributte/qa": "^0.4.0",
26-
"contributte/phpstan": "^0.1.0",
27-
"mockery/mockery": "^1.5.1"
27+
"mockery/mockery": "^1.6.12"
2828
},
2929
"minimum-stability": "dev",
3030
"prefer-stable": true,
@@ -44,6 +44,7 @@
4444
}
4545
},
4646
"config": {
47+
"sort-packages": true,
4748
"allow-plugins": {
4849
"dealerdirect/phpcodesniffer-composer-installer": true
4950
}

phpstan.neon

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ includes:
33

44
parameters:
55
level: 9
6-
phpVersion: 80100
6+
phpVersion: 80200
77

88
scanDirectories:
99
- src
@@ -17,3 +17,4 @@ parameters:
1717
- .docs
1818

1919
ignoreErrors:
20+
- '#Call to static method PHPUnit\\Framework\\Assert::assertTrue\(\) with true will always evaluate to true#'

ruleset.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<ruleset name="Contributte" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
33
<!-- Rulesets -->
4-
<rule ref="./vendor/contributte/qa/ruleset-8.0.xml"/>
4+
<rule ref="./vendor/contributte/qa/ruleset-8.2.xml"/>
55

66
<!-- Rules -->
77
<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">

0 commit comments

Comments
 (0)