Skip to content

Commit 495fc4d

Browse files
f3l1xf3l1x
committed
Maintenance: editorconfig, makefile, phpstan, codesniffer
1 parent 58814b8 commit 495fc4d

7 files changed

Lines changed: 60 additions & 45 deletions

File tree

‎.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,yaml,yml,md}]
1515
indent_style = space
1616
indent_size = 2

‎.gitattributes‎

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

‎.gitignore‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,9 @@
66
/composer.lock
77

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

‎LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2017 Contributte
3+
Copyright (c) 2016 Contributte
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎Makefile‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,34 @@
1-
.PHONY: install qa cs csf phpstan tests coverage-clover coverage-html
2-
1+
.PHONY: install
32
install:
43
composer update
54

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

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

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

20+
.PHONY: phpstan
1421
phpstan:
15-
vendor/bin/phpstan analyse -c phpstan.neon src
22+
vendor/bin/phpstan analyse -c phpstan.neon
1623

24+
.PHONY: tests
1725
tests:
18-
vendor/bin/tester -s -p php --colors 1 -C tests/cases
19-
20-
coverage-clover:
21-
vendor/bin/tester -s -p phpdbg --colors 1 -C --coverage ./coverage.xml --coverage-src ./src tests/cases
22-
23-
coverage-html:
24-
vendor/bin/tester -s -p phpdbg --colors 1 -C --coverage ./coverage.html --coverage-src ./src tests/cases
26+
vendor/bin/tester -s -p php --colors 1 -C tests/Cases
27+
28+
.PHONY: coverage
29+
coverage:
30+
ifdef GITHUB_ACTION
31+
vendor/bin/tester -s -p phpdbg --colors 1 -C --coverage coverage.xml --coverage-src src tests/Cases
32+
else
33+
vendor/bin/tester -s -p phpdbg --colors 1 -C --coverage coverage.html --coverage-src src tests/Cases
34+
endif

‎phpstan.neon‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
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:
8-
level: 8
9-
ignoreErrors:
10-
# phpstan error
11-
#- '#^Strict comparison using === between string and false will always evaluate to false.#'
12-
- '#^Binary operation "." between non-empty-string and array\|bool\|float\|int\|string\|null results in an error#'
5+
level: 9
6+
phpVersion: 80100
7+
8+
scanDirectories:
9+
- src
1310

14-
# too lazy to solve
15-
- '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
16-
- '#^Only booleans are allowed in a negated boolean.*#'
11+
fileExtensions:
12+
- php
1713

18-
# Should not happen - value is checked in code above
19-
- '#^Parameter .+ of function sprintf expects bool\|float\|int\|string\|null, bool\|float\|int\|Nette\\Neon\\Entity\|string\|null given\.$#'
14+
paths:
15+
- src
16+
- .docs
17+
18+
ignoreErrors:

‎ruleset.xml‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
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>
9-
<property name="rootNamespaces" type="array" value="
10-
src=>Contributte\Neonizer,
11-
tests/cases=>Tests\Cases\Contributte\Neonizer
12-
"/>
13-
<property name="extensions" type="array" value="php,phpt" />
9+
<property name="rootNamespaces" type="array">
10+
<element key="src" value="Contributte\Neonizer"/>
11+
<element key="tests" value="Tests"/>
12+
</property>
13+
<property name="extensions" type="array">
14+
<element key="php" value="php"/>
15+
<element key="phpt" value="phpt"/>
16+
</property>
1417
</properties>
1518
</rule>
1619

17-
<!--Exclude folders -->
20+
<!-- Excludes -->
1821
<exclude-pattern>/tests/tmp</exclude-pattern>
1922
</ruleset>

0 commit comments

Comments
 (0)