Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit b531f73

Browse files
Kocalondrejmirtes
authored andcommitted
Drop Phing for Makefile
See phpstan/phpstan-symfony#160 
1 parent 9feb3ca commit b531f73

File tree

12 files changed

+92
-149
lines changed

12 files changed

+92
-149
lines changed

‎.gitattributes‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,12 @@
22
*.stub linguist-language=PHP
33
*.neon linguist-language=YAML
44

5-
/tests export-ignore
5+
.github export-ignore
6+
tests export-ignore
7+
tmp export-ignore
8+
.gitattributes export-ignore
9+
.gitignore export-ignore
10+
Makefile export-ignore
11+
phpcs.xml export-ignore
12+
phpstan.neon export-ignore
13+
phpunit.xml export-ignore

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444

4545

4646
- name: "Lint"
47-
run: "vendor/bin/phing lint"
47+
run: "make lint"
4848

4949
coding-standards:
5050
name: "Coding Standard"
@@ -68,10 +68,10 @@ jobs:
6868
run: "composer install --no-interaction --no-progress --no-suggest"
6969

7070
- name: "Lint"
71-
run: "vendor/bin/phing lint"
71+
run: "make lint"
7272

7373
- name: "Coding Standard"
74-
run: "vendor/bin/phing cs"
74+
run: "make cs"
7575

7676
tests:
7777
name: "Tests"
@@ -113,7 +113,7 @@ jobs:
113113
run: "composer require --dev phpunit/phpunit:'^9.5' --update-with-dependencies"
114114

115115
- name: "Tests"
116-
run: "vendor/bin/phing tests"
116+
run: "make tests"
117117

118118
static-analysis:
119119
name: "PHPStan"
@@ -157,4 +157,4 @@ jobs:
157157
run: "composer require --dev phpunit/phpunit:'^9.5' --update-with-dependencies"
158158

159159
- name: "PHPStan"
160-
run: "vendor/bin/phing phpstan"
160+
run: "make phpstan"

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
/composer.lock
1+
/tests/tmp
22
/vendor
3+
composer.lock
4+
.phpunit.result.cache

‎Makefile‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
.PHONY: check
2+
check: lint cs tests phpstan
3+
4+
.PHONY: tests
5+
tests:
6+
php vendor/bin/phpunit
7+
8+
.PHONY: lint
9+
lint:
10+
php vendor/bin/parallel-lint --colors \
11+
src tests
12+
13+
.PHONY: cs
14+
cs:
15+
composer install --working-dir build-cs && php build-cs/vendor/bin/phpcs
16+
17+
.PHONY: cs-fix
18+
cs-fix:
19+
php build-cs/vendor/bin/phpcbf
20+
21+
.PHONY: phpstan
22+
phpstan:
23+
php vendor/bin/phpstan analyse -l 8 -c phpstan.neon src tests

‎build-cs/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require-dev": {
3-
"consistence/coding-standard": "^3.10",
3+
"consistence-community/coding-standard": "^3.10",
44
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
55
"slevomat/coding-standard": "^6.4"
66
}

‎build.xml‎

Lines changed: 0 additions & 112 deletions
This file was deleted.

‎composer.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"require-dev": {
2121
"nette/forms": "^3.0",
2222
"nette/utils": "^2.3.0 || ^3.0.0",
23-
"phing/phing": "^2.16.3",
2423
"php-parallel-lint/php-parallel-lint": "^1.2",
2524
"phpstan/phpstan-php-parser": "^0.12.2",
2625
"phpstan/phpstan-phpunit": "^0.12.16",

‎phpcs.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
<?xml version="1.0"?>
22
<ruleset name="PHPStan Nette">
3-
<rule ref="build-cs/vendor/consistence/coding-standard/Consistence/ruleset.xml">
3+
<arg name="colors"/>
4+
<arg name="extensions" value="php"/>
5+
<arg name="encoding" value="utf-8"/>
6+
<arg name="tab-width" value="4"/>
7+
<arg name="cache" value="tmp/cache/phpcs"/>
8+
<arg value="sp"/>
9+
<file>src</file>
10+
<file>tests</file>
11+
<rule ref="build-cs/vendor/consistence-community/coding-standard/Consistence/ruleset.xml">
412
<exclude name="Squiz.Functions.GlobalFunction.Found"/>
513
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword"/>
614
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation"/>
@@ -53,5 +61,6 @@
5361
<property name="rootNamespaces" type="array" value="src=>PHPStan,tests=>PHPStan"/>
5462
</properties>
5563
</rule>
64+
<exclude-pattern>tests/tmp</exclude-pattern>
5665
<exclude-pattern>tests/*/data</exclude-pattern>
5766
</ruleset>

‎phpunit.xml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0"?>
2+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
bootstrap="tests/bootstrap.php"
4+
colors="true"
5+
backupGlobals="false"
6+
backupStaticAttributes="false"
7+
beStrictAboutChangesToGlobalState="true"
8+
beStrictAboutOutputDuringTests="true"
9+
beStrictAboutTestsThatDoNotTestAnything="true"
10+
beStrictAboutTodoAnnotatedTests="true"
11+
failOnRisky="true"
12+
failOnWarning="true"
13+
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
14+
>
15+
<coverage>
16+
<include>
17+
<directory suffix=".php">./src</directory>
18+
</include>
19+
<report>
20+
<clover outputFile="tests/tmp/clover.xml"/>
21+
<text
22+
outputFile="php://stdout"
23+
showUncoveredFiles="true"
24+
showOnlySummary="true"
25+
/>
26+
</report>
27+
</coverage>
28+
29+
<testsuites>
30+
<testsuite name="PHPStan for Nette">
31+
<directory suffix="Test.php">tests</directory>
32+
</testsuite>
33+
</testsuites>
34+
35+
<logging/>
36+
</phpunit>

‎tests/phpunit.xml‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /