Skip to content

Commit 0adbd9f

Browse files
ruudkondrejmirtes
authored andcommitted
Updated coding standard that can run on PHP 7.4
1 parent e5edd1c commit 0adbd9f

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
"phpunit/phpunit": "<7.0"
1414
},
1515
"require-dev": {
16-
"consistence/coding-standard": "^3.5",
16+
"consistence/coding-standard": "^3.10",
1717
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
1818
"ergebnis/composer-normalize": "^2.0.2",
1919
"phing/phing": "^2.16.0",
2020
"php-parallel-lint/php-parallel-lint": "^1.2",
2121
"phpstan/phpstan-strict-rules": "^0.12",
2222
"phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
2323
"satooshi/php-coveralls": "^1.0",
24-
"slevomat/coding-standard": "^4.7.2"
24+
"slevomat/coding-standard": "^6.4"
2525
},
2626
"config": {
2727
"sort-packages": true

phpcs.xml

+14-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<property name="newlinesCountBetweenOpenTagAndDeclare" value="0"/>
1818
</properties>
1919
</rule>
20-
<rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration">
20+
<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">
2121
<properties>
2222
<property name="usefulAnnotations" type="array" value="
2323
@dataProvider,
@@ -27,8 +27,20 @@
2727
<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification"/>
2828
<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification"/>
2929
</rule>
30+
<rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
31+
<properties>
32+
<property name="enableNativeTypeHint" value="false"/>
33+
</properties>
34+
<exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification"/>
35+
</rule>
36+
<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
37+
<properties>
38+
<property name="enableObjectTypeHint" value="false"/>
39+
</properties>
40+
<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification"/>
41+
</rule>
3042
<rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
31-
<rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
43+
<rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators"/>
3244
<rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
3345
<rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming"/>
3446
<rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming"/>

0 commit comments

Comments
 (0)