Skip to content

Commit 70af92a

Browse files
f3l1xf3l1x
committed
Maintenance: editorconfig, makefile, phpstan, codesniffer
1 parent a982c99 commit 70af92a

File tree

7 files changed

+73
-63
lines changed

7 files changed

+73
-63
lines changed

‎.editorconfig

100755100644
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 & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
# Excluded from archive
21
.docs export-ignore
3-
tests export-ignore
2+
.github export-ignore
43
.editorconfig export-ignore
54
.gitattributes export-ignore
65
.gitignore export-ignore
76
Makefile export-ignore
8-
phpstan.neon export-ignore
97
README.md export-ignore
8+
phpstan.neon export-ignore
109
ruleset.xml export-ignore
11-
12-
# https://github.com/github/linguist
13-
*.php* diff=php linguist-language=PHP
10+
tests export-ignore

‎.gitignore

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
1-
## ide
2-
.idea/
1+
# IDE
2+
/.idea
33

4-
## composer
5-
composer.lock
6-
vendor/
4+
# Composer
5+
/vendor
6+
/composer.lock
7+
8+
# Tests
9+
/tests/tmp
10+
/coverage.*
11+
/tests/**/*.log
12+
/tests/**/*.html
13+
/tests/**/*.expected
14+
/tests/**/*.actual

‎Makefile

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,34 @@
1-
2-
.PHONY: install qa cs csf phpstan tests coverage-clover coverage-html
3-
1+
.PHONY: install
42
install:
53
composer update
64

5+
.PHONY: qa
76
qa: phpstan cs
87

8+
.PHONY: cs
99
cs:
10-
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
1115

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

20+
.PHONY: phpstan
1521
phpstan:
16-
vendor/bin/phpstan analyse src
22+
vendor/bin/phpstan analyse -c phpstan.neon
1723

24+
.PHONY: tests
1825
tests:
19-
vendor/bin/codecept run
20-
21-
coverage-clover:
22-
vendor/bin/codecept run --coverage --coverage-xml
23-
24-
coverage-html:
25-
vendor/bin/codecept run --coverage --coverage-html
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

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ For details on how to use this package, check out our [documentation](.docs).
3232

3333
## Versions
3434

35-
| State | Version | Branch | Standalone | Symfony | Nette | PHP |
36-
|-------------|---------------|----------|------------|---------|-------|---------|
37-
| dev | `dev-master` | `master` | ✓ | 5.2+ | 3.0+ | 7.4+ |
35+
| State | Version | Branch | Nette | PHP |
36+
|--------|----------|----------|-------|---------|
37+
| dev | `^2.1.0` | `master` | 3.2+ | `>=8.1` |
38+
| stable | `^2.0.0` | `master` | 3.2+ | `>=8.1` |
3839

3940
## Development
4041

‎phpstan.neon

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1+
includes:
2+
- vendor/contributte/phpstan/phpstan.neon
3+
14
parameters:
25
level: 9
3-
excludePaths:
4-
analyse:
5-
- src/Bridge/Nette/Macro/ImageMacro.php
6-
ignoreErrors:
7-
-
8-
message: "#^Class Contributte\\\\Imagist\\\\Bridge\\\\Nette\\\\DI\\\\GumletImageStorageExtension extends @final class Contributte\\\\Imagist\\\\Bridge\\\\Nette\\\\DI\\\\GumletImagistExtension\\.$#"
9-
count: 1
10-
path: src/Bridge/Nette/DI/GumletImageStorageExtension.php
6+
phpVersion: 80100
7+
8+
scanDirectories:
9+
- src
1110

12-
-
13-
message: "#^Class Contributte\\\\Imagist\\\\Bridge\\\\Nette\\\\DI\\\\ImageStorageConfigFiltersExtension extends @final class Contributte\\\\Imagist\\\\Bridge\\\\Nette\\\\DI\\\\ImagistNeonFiltersExtension\\.$#"
14-
count: 1
15-
path: src/Bridge/Nette/DI/ImageStorageConfigFiltersExtension.php
11+
fileExtensions:
12+
- php
1613

17-
-
18-
message: "#^Class Contributte\\\\Imagist\\\\Bridge\\\\Nette\\\\DI\\\\ImageStorageExtension extends @final class Contributte\\\\Imagist\\\\Bridge\\\\Nette\\\\DI\\\\ImagistExtension\\.$#"
19-
count: 1
20-
path: src/Bridge/Nette/DI/ImageStorageExtension.php
14+
paths:
15+
- src
16+
- .docs
17+
18+
ignoreErrors:

‎ruleset.xml

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
<?xml version="1.0"?>
2-
<ruleset>
3-
<!-- Contributte Coding Standard -->
4-
<rule ref="./vendor/ninjify/coding-standard/contributte.xml">
5-
<exclude name="Squiz.Commenting.VariableComment.Missing" />
6-
<exclude name="SlevomatCodingStandard.Variables.UnusedVariable.UnusedVariable" />
7-
<exclude name="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix" />
8-
<exclude name="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming.SuperfluousSuffix" />
9-
<exclude name="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat" />
10-
</rule>
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"/>
115

12-
<!-- Specific rules -->
6+
<!-- Rules -->
137
<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
148
<properties>
15-
<property name="rootNamespaces" type="array" value="
16-
src=>Contributte\Imagist,
17-
tests/src=>Contributte\Imagist\Testing,
18-
tests/functional=>Contributte\Imagist\Testing\Functional,
19-
tests/unit=>Contributte\Imagist\Testing\Unit,
20-
"/>
9+
<property name="rootNamespaces" type="array">
10+
<element key="src" value="Contributte\Imagist"/>
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>
2117
</properties>
2218
</rule>
23-
<exclude-pattern>tests/_support</exclude-pattern>
24-
<exclude-pattern>src/Bridge/Nette/Tracy/assets</exclude-pattern>
19+
20+
<!-- Excludes -->
21+
<exclude-pattern>/tests/tmp</exclude-pattern>
2522
</ruleset>

0 commit comments

Comments
 (0)