Skip to content

Commit 756a266

Browse files
committed
Composer: replace ninjify for contributte
1 parent 5cc9226 commit 756a266

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ qa: phpstan cs
77

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

1515
csf:
16-
vendor/bin/codefixer src tests
16+
vendor/bin/phpcbf --standard=ruleset.xml --encoding=utf-8 --colors -nsp src tests
1717

1818
phpstan:
1919
vendor/bin/phpstan analyse -c phpstan.neon

composer.json

+4-7
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,10 @@
2222
"doctrine/common":"^3.4.3"
2323
},
2424
"require-dev": {
25-
"mockery/mockery": "^1.3.1",
26-
"ninjify/qa": "^0.12",
27-
"ninjify/nunjuck": "^0.4",
28-
"phpstan/phpstan": "^1.4.0",
29-
"phpstan/phpstan-deprecation-rules": "^1.0.0",
30-
"phpstan/phpstan-nette": "^1.0.0",
31-
"phpstan/phpstan-strict-rules": "^1.0.0"
25+
"contributte/qa": "^0.4",
26+
"contributte/tester": "^0.3",
27+
"contributte/phpstan": "^0.1",
28+
"mockery/mockery": "^1.3.1"
3229
},
3330
"conflict": {
3431
"nette/di": "<3.0.6",

phpstan.neon

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
includes:
2-
- vendor/phpstan/phpstan-deprecation-rules/rules.neon
3-
- vendor/phpstan/phpstan-nette/extension.neon
4-
- vendor/phpstan/phpstan-nette/rules.neon
5-
- vendor/phpstan/phpstan-strict-rules/rules.neon
2+
- vendor/contributte/phpstan/phpstan.neon
63

74
parameters:
85
level: 9
9-
phpVersion: 70400
6+
phpVersion: 80100
7+
8+
scanDirectories:
9+
- src
10+
11+
fileExtensions:
12+
- php
1013

1114
paths:
1215
- src
16+
- .docs

ruleset.xml

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<?xml version="1.0"?>
2-
<ruleset>
3-
<!-- Contributte Coding Standard -->
4-
<rule ref="./vendor/ninjify/coding-standard/contributte.xml"/>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ruleset name="Contributte" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="vendor/squizlabs/php_codesniffer/phpcs.xsd">
3+
<!-- Rulesets -->
4+
<rule ref="./vendor/contributte/qa/ruleset-8.0.xml"/>
55

6-
<!-- Specific rules -->
6+
<!-- Rules -->
77
<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
88
<properties>
99
<property name="rootNamespaces" type="array">
@@ -13,7 +13,6 @@
1313
</properties>
1414
</rule>
1515

16-
<!--Exclude folders -->
16+
<!-- Excludes -->
1717
<exclude-pattern>/tests/tmp</exclude-pattern>
1818
</ruleset>
19-

0 commit comments

Comments
 (0)