Skip to content

Commit 6e7761b

Browse files
committed
Drop Phing for Makefile
See phpstan/phpstan-symfony#160
1 parent 56b0aec commit 6e7761b

File tree

10 files changed

+49
-98
lines changed

10 files changed

+49
-98
lines changed

.gitattributes

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1-
/e2e export-ignore
1+
*.php text eol=lf
2+
3+
.github export-ignore
4+
e2e export-ignore
5+
tmp export-ignore
6+
.gitattributes export-ignore
7+
.gitignore export-ignore
8+
Makefile export-ignore
9+
phpcs.xml export-ignore
10+
phpstan.neon export-ignore
11+
phpunit.xml export-ignore

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
run: "composer install --no-interaction --no-progress --no-suggest"
4040

4141
- name: "Lint"
42-
run: "vendor/bin/phing lint"
42+
run: "make lint"
4343

4444
coding-standards:
4545
name: "Coding Standard"
@@ -63,10 +63,10 @@ jobs:
6363
run: "composer install --no-interaction --no-progress --no-suggest"
6464

6565
- name: "Lint"
66-
run: "vendor/bin/phing lint"
66+
run: "make lint"
6767

6868
- name: "Coding Standard"
69-
run: "vendor/bin/phing cs"
69+
run: "make cs"
7070

7171
static-analysis:
7272
name: "PHPStan"
@@ -110,4 +110,4 @@ jobs:
110110
run: "composer require --dev phpstan/phpstan:'^0.12.60' --update-with-dependencies"
111111

112112
- name: "PHPStan"
113-
run: "vendor/bin/phing phpstan"
113+
run: "make phpstan"

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/src/GeneratedConfig.php
22
/vendor
33
composer.lock
4+
.phpunit.result.cache

Makefile

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

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 & 90 deletions
This file was deleted.

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
},
1313
"require-dev": {
1414
"composer/composer": "^2.0",
15-
"phing/phing": "^2.16.3",
1615
"php-parallel-lint/php-parallel-lint": "^1.2.0",
1716
"phpstan/phpstan-strict-rules": "^0.11 || ^0.12"
1817
},

phpcs.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
<?xml version="1.0"?>
22
<ruleset name="PHPStan extension installer">
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+
<rule ref="build-cs/vendor/consistence-community/coding-standard/Consistence/ruleset.xml">
411
<exclude name="Squiz.Functions.GlobalFunction.Found"/>
512
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword"/>
613
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation"/>

tmp/.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*
2+
!cache
3+
!.*

tmp/cache/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*
2+
!.*

0 commit comments

Comments
 (0)