Bump up slevomat coding standard.

cakephp · Jun 26, 2022 · 81493b5 · 81493b5
1 parent 5f04412
commit 81493b5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/CakePHP/ruleset.xml b/CakePHP/ruleset.xml
@@ -203,7 +203,16 @@
         <exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.UselessAnnotation"/>
         <exclude-pattern>*/tests/*</exclude-pattern>
     </rule>
-    <rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHintSpacing"/>
+    <rule ref="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat">
+        <properties>
+            <property name="enable" type="boolean" value="true"/>
+            <property name="withSpaces" value="no"/>
+            <property name="shortNullable" value="yes"/>
+            <property name="nullPosition" value="last"/>
+        </properties>
+        <exclude-pattern>*/tests/*</exclude-pattern>
+    </rule>
+    <rule ref="SlevomatCodingStandard.Classes.PropertyDeclaration"/>
     <rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHintSpacing"/>
     <rule ref="SlevomatCodingStandard.Variables.DuplicateAssignmentToVariable"/>
 

diff --git a/composer.json b/composer.json
@@ -20,8 +20,8 @@
     "require": {
         "php": ">=7.2.0",
         "phpstan/phpdoc-parser": "^1.4.5",
-        "slevomat/coding-standard": "^6.3.6 || ^7.0",
-        "squizlabs/php_codesniffer": "^3.6"
+        "slevomat/coding-standard": "^8.1",
+        "squizlabs/php_codesniffer": "^3.7.1"
     },
     "require-dev": {
         "phpunit/phpunit": "^7.1"