Skip to content

Commit 5be14ea

Browse files
committed
QA: update tools
1 parent 28b2f8a commit 5be14ea

File tree

6 files changed

+40
-28
lines changed

6 files changed

+40
-28
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, *.yaml, *.yml, *.md}]
14+
[{*.json,*.yml,*.yaml,*.md}]
1515
indent_style = space
1616
indent_size = 2

.gitattributes

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
# Not archived
2+
.docs export-ignore
3+
tests export-ignore
4+
.editorconfig export-ignore
15
.gitattributes export-ignore
26
.gitignore export-ignore
37
.travis.yml export-ignore
4-
composer.lock export-ignore
5-
tests/ export-ignore
6-
examples/ export-ignore
7-
*.md export-ignore
8+
Makefile export-ignore
9+
phpstan.neon export-ignore
10+
README.md export-ignore
11+
ruleset.xml export-ignore

.gitignore

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
# Folders
1+
# IDE
2+
/.idea
3+
4+
# Composer
25
/vendor
3-
.idea
4-
# Files
56
/composer.lock
6-
/tests/*.log
7-
/tests/tmp
7+
8+
# Tests
9+
/coverage.xml

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ qa: phpstan cs
77

88
cs:
99
ifdef GITHUB_ACTION
10-
vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 --colors -nsp -q --report=checkstyle src tests | cs2pr
10+
vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 --extensions="php,phpt" --colors -nsp -q --report=checkstyle src tests | cs2pr
1111
else
12-
vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 --colors -nsp src tests
12+
vendor/bin/phpcs --standard=ruleset.xml --encoding=utf-8 --extensions="php,phpt" --colors -nsp src tests
1313
endif
1414

1515
csf:

phpstan.neon

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ includes:
22
- vendor/phpstan/phpstan-deprecation-rules/rules.neon
33
- vendor/phpstan/phpstan-nette/extension.neon
44
- vendor/phpstan/phpstan-nette/rules.neon
5+
# - vendor/phpstan/phpstan-strict-rules/rules.neon
56

67
parameters:
78
level: 8
8-
phpVersion: 70200
9+
phpVersion: 80000
910

1011
scanDirectories:
1112
- src
@@ -17,5 +18,3 @@ parameters:
1718
- src
1819

1920
ignoreErrors:
20-
21-
checkGenericClassInNonGenericObjectType: false

ruleset.xml

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
1-
<?xml version="1.0"?>
2-
<ruleset name="Contributte">
3-
<!-- Contributte Coding Standard -->
4-
<rule ref="./vendor/ninjify/coding-standard/contributte.xml"/>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ruleset
3+
name="Contributte"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5+
xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd"
6+
>
7+
<!-- Rulesets -->
8+
<rule ref="./vendor/ninjify/coding-standard/contributte.xml"/>
59

6-
<!-- Specific rules -->
7-
<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
8-
<properties>
9-
<property name="rootNamespaces" type="array" value="src=>Contributte\Nextras\Orm\Generator"/>
10-
</properties>
11-
</rule>
10+
<!-- Rules -->
11+
<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
12+
<properties>
13+
<property name="rootNamespaces" type="array">
14+
<element key="src" value="Contributte\Nextras\Orm\Generator"/>
15+
<element key="tests" value="Tests"/>
16+
</property>
17+
</properties>
18+
</rule>
1219

13-
<!-- Exclude folders -->
14-
<exclude-pattern>/tests/tmp</exclude-pattern>
15-
</ruleset>
20+
<!-- Excludes -->
21+
<exclude-pattern>/tests/tmp</exclude-pattern>
22+
</ruleset>

0 commit comments

Comments
 (0)