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 46feb53

Browse files
authored
Drop Phing for Makefile, migrate PHPUnit config, update PHPCS config (#160)
1 parent 7f47026 commit 46feb53

File tree

11 files changed

+83
-144
lines changed

11 files changed

+83
-144
lines changed

‎.gitattributes‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
*.php text eol=lf
22

33
tests export-ignore
4+
tmp export-ignore
45
.coveralls.yml export-ignore
56
.gitattributes export-ignore
67
.gitignore export-ignore
78
.travis.yml export-ignore
8-
build.xml export-ignore
9+
Makefile export-ignore
910
phpcs.xml export-ignore
1011
phpstan.neon export-ignore
12+
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"
@@ -116,7 +116,7 @@ jobs:
116116
run: "composer require --dev phpunit/phpunit:'^9.5' --update-with-dependencies"
117117

118118
- name: "Tests"
119-
run: "vendor/bin/phing tests"
119+
run: "make tests"
120120

121121
static-analysis:
122122
name: "PHPStan"
@@ -160,4 +160,4 @@ jobs:
160160
run: "composer require --dev phpunit/phpunit:'^9.5' --update-with-dependencies"
161161

162162
- name: "PHPStan"
163-
run: "vendor/bin/phing phpstan"
163+
run: "make phpstan"

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/tests/tmp
22
/vendor
33
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.xml‎

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

‎composer.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"symfony/framework-bundle": "<3.0"
2222
},
2323
"require-dev": {
24-
"phing/phing": "^2.16.3",
2524
"php-parallel-lint/php-parallel-lint": "^1.2",
2625
"phpstan/phpstan-phpunit": "^0.12.16",
2726
"phpstan/phpstan-strict-rules": "^0.12.5",
@@ -35,8 +34,8 @@
3534
},
3635
"config": {
3736
"platform": {
38-
"php": "7.4.6"
39-
},
37+
"php": "7.4.6"
38+
},
4039
"sort-packages": true
4140
},
4241
"extra": {

‎phpcs.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
<?xml version="1.0"?>
22
<ruleset name="PHPStan PHPUnit extensions and rules">
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>
311
<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"/>

‎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 Symfony">
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.

‎tmp/.gitignore‎

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

0 commit comments

Comments
(0)

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