Skip to content

Commit 3df3bc8

Browse files
simPodsimPod
committed
Require slevomat/coding-standard v8.16
Use DNFTypeHintFormat instead of deprecated UnionTypeHintFormat sniff. Drop support for php 7.2 + 7.3 since it's super ancient and slevomat/coding-standard does not support in anymore as well.
1 parent 0308bc4 commit 3df3bc8

12 files changed

+61
-1100
lines changed

‎.github/workflows/continuous-integration.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
php-version:
22-
- "7.2"
22+
- "7.4"
2323

2424
steps:
2525
- name: "Checkout"
@@ -52,7 +52,7 @@ jobs:
5252
strategy:
5353
matrix:
5454
php-version:
55-
- "7.2"
55+
- "7.4"
5656

5757
steps:
5858
- name: "Checkout"
@@ -91,8 +91,6 @@ jobs:
9191
fail-fast: false
9292
matrix:
9393
php-version:
94-
- "7.2"
95-
- "7.3"
9694
- "7.4"
9795
- "8.0"
9896
- "8.1"
@@ -130,8 +128,6 @@ jobs:
130128
fail-fast: false
131129
matrix:
132130
php-version:
133-
- "7.2"
134-
- "7.3"
135131
- "7.4"
136132
- "8.0"
137133
- "8.1"

‎Makefile‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,6 @@ test-report: vendor
1010
test-fix: vendor
1111
./bin/test-fix
1212

13-
update-compatibility-patch-72:
14-
@git apply tests/php72-compatibility.patch
15-
@printf "Please open your editor and apply your changes\n"
16-
@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
17-
@git diff -- tests/expected_report.txt tests/fixed tests/input > .tmp-patch && mv .tmp-patch tests/php72-compatibility.patch && git apply -R tests/php72-compatibility.patch
18-
@git commit -m 'Update compatibility patch' tests/php72-compatibility.patch
19-
20-
update-compatibility-patch-73:
21-
@git apply tests/php73-compatibility.patch
22-
@printf "Please open your editor and apply your changes\n"
23-
@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
24-
@git diff -- tests/expected_report.txt tests/fixed tests/input > .tmp-patch && mv .tmp-patch tests/php73-compatibility.patch && git apply -R tests/php73-compatibility.patch
25-
@git commit -m 'Update compatibility patch' tests/php73-compatibility.patch
26-
2713
update-compatibility-patch-74:
2814
@git apply tests/php74-compatibility.patch
2915
@printf "Please open your editor and apply your changes\n"
@@ -38,6 +24,20 @@ update-compatibility-patch-80:
3824
@git diff -- tests/expected_report.txt tests/fixed tests/input > .tmp-patch && mv .tmp-patch tests/php80-compatibility.patch && git apply -R tests/php80-compatibility.patch
3925
@git commit -m 'Update compatibility patch' tests/php80-compatibility.patch
4026

27+
update-compatibility-patch-81:
28+
@git apply tests/php81-compatibility.patch
29+
@printf "Please open your editor and apply your changes\n"
30+
@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
31+
@git diff -- tests/expected_report.txt tests/fixed tests/input > .tmp-patch && mv .tmp-patch tests/php81-compatibility.patch && git apply -R tests/php81-compatibility.patch
32+
@git commit -m 'Update compatibility patch' tests/php81-compatibility.patch
33+
34+
update-compatibility-patch-82:
35+
@git apply tests/php82-compatibility.patch
36+
@printf "Please open your editor and apply your changes\n"
37+
@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
38+
@git diff -- tests/expected_report.txt tests/fixed tests/input > .tmp-patch && mv .tmp-patch tests/php82-compatibility.patch && git apply -R tests/php82-compatibility.patch
39+
@git commit -m 'Update compatibility patch' tests/php82-compatibility.patch
40+
4141
vendor: composer.json
4242
composer update
4343
touch -c vendor

‎composer.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
{"name": "Steve Müller", "email": "st.mueller@dzh-online.de"}
2323
],
2424
"require": {
25-
"php": "^7.2 || ^8.0",
25+
"php": "^7.4 || ^8.0",
2626
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0.0",
27-
"slevomat/coding-standard": "^8.14",
27+
"slevomat/coding-standard": "^8.16",
2828
"squizlabs/php_codesniffer": "^3.7"
2929
},
3030
"config": {

‎lib/Doctrine/ruleset.xml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -482,10 +482,11 @@
482482
</property>
483483
</properties>
484484
</rule>
485-
<!-- Define unions style -->
486-
<rule ref="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat">
485+
<!-- Define DNF style -->
486+
<rule ref="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat">
487487
<properties>
488-
<property name="withSpaces" value="no" />
488+
<property name="withSpacesAroundOperators" value="no" />
489+
<property name="withSpacesInsideParentheses" value="no" />
489490
<property name="shortNullable" value="no" />
490491
<property name="nullPosition" value="last" />
491492
</properties>

‎tests/expected_report.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FILE ERRORS WARNINGS
55
----------------------------------------------------------------------
66
tests/input/annotation-name.php 8 0
77
tests/input/array_indentation.php 10 0
8-
tests/input/arrow-functions-format.php 10 0
8+
tests/input/arrow-functions-format.php 12 0
99
tests/input/assignment-operators.php 4 0
1010
tests/input/attributes.php 15 0
1111
tests/input/binary_operators.php 9 0

‎tests/fixed/arrow-functions-format.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@
3232
];
3333

3434
$singleLineArrayReturn = Collection::map(
35-
static fn () => [1, 2]
35+
static fn () => [1, 2],
3636
);
3737

3838
$wrongMultiLineArrayReturn = Collection::map(
3939
static fn () => [
4040
1,
4141
2,
42-
]
42+
],
4343
);

0 commit comments

Comments
 (0)