Merge pull request #325 from simPod/bumpie

Require slevomat/coding-standard v8.16

Author: greg0ire

.github/workflows/continuous-integration.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
+          - "7.4"
 
     steps:
       - name: "Checkout"
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - "7.2"
+          - "7.4"
 
     steps:
       - name: "Checkout"
@@ -91,8 +91,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"
@@ -130,8 +128,6 @@ jobs:
       fail-fast: false
       matrix:
         php-version:
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"

Makefile

@@ -10,20 +10,6 @@ test-report: vendor
 test-fix: vendor
 	./bin/test-fix
 
-update-compatibility-patch-72:
-	@git apply tests/php72-compatibility.patch
-	@printf "Please open your editor and apply your changes\n"
-	@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
-	@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
-	@git commit -m 'Update compatibility patch' tests/php72-compatibility.patch
-
-update-compatibility-patch-73:
-	@git apply tests/php73-compatibility.patch
-	@printf "Please open your editor and apply your changes\n"
-	@until [ "$${compatibility_resolved}" == "y" ]; do read -p "Have finished your changes (y|n)? " compatibility_resolved; done && compatibility_resolved=
-	@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
-	@git commit -m 'Update compatibility patch' tests/php73-compatibility.patch
-
 update-compatibility-patch-74:
 	@git apply tests/php74-compatibility.patch
 	@printf "Please open your editor and apply your changes\n"

composer.json

@@ -22,9 +22,9 @@
         {"name": "Steve Müller", "email": "st.mueller@dzh-online.de"}
     ],
     "require": {
-        "php": "^7.2 || ^8.0",
+        "php": "^7.4 || ^8.0",
         "dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0.0",
-        "slevomat/coding-standard": "^8.14",
+        "slevomat/coding-standard": "^8.16",
         "squizlabs/php_codesniffer": "^3.7"
     },
     "config": {

lib/Doctrine/ruleset.xml

@@ -482,10 +482,11 @@
             </property>
         </properties>
     </rule>
-    <!-- Define unions style -->
-    <rule ref="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat">
+    <!-- Define DNF style -->
+    <rule ref="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat">
         <properties>
-            <property name="withSpaces" value="no" />
+            <property name="withSpacesAroundOperators" value="no" />
+            <property name="withSpacesInsideParentheses" value="no" />
             <property name="shortNullable" value="no" />
             <property name="nullPosition" value="last" />
         </properties>

tests/expected_report.txt

@@ -5,7 +5,7 @@ FILE                                                  ERRORS  WARNINGS
 ----------------------------------------------------------------------
 tests/input/annotation-name.php                       8       0
 tests/input/array_indentation.php                     10      0
-tests/input/arrow-functions-format.php                10      0
+tests/input/arrow-functions-format.php                12      0
 tests/input/assignment-operators.php                  4       0
 tests/input/attributes.php                            15      0
 tests/input/binary_operators.php                      9       0
@@ -54,9 +54,9 @@ tests/input/use-ordering.php                          1       0
 tests/input/useless-semicolon.php                     2       0
 tests/input/UselessConditions.php                     21      0
 ----------------------------------------------------------------------
-A TOTAL OF 464 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
+A TOTAL OF 466 ERRORS AND 2 WARNINGS WERE FOUND IN 50 FILES
 ----------------------------------------------------------------------
-PHPCBF CAN FIX 380 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
+PHPCBF CAN FIX 382 OF THESE SNIFF VIOLATIONS AUTOMATICALLY
 ----------------------------------------------------------------------
 
 

tests/fixed/arrow-functions-format.php

@@ -32,12 +32,12 @@
 ];
 
 $singleLineArrayReturn = Collection::map(
-    static fn () => [1, 2]
+    static fn () => [1, 2],
 );
 
 $wrongMultiLineArrayReturn = Collection::map(
     static fn () => [
         1,
         2,
-    ]
+    ],
 );