Skip to content

Commit c8a4ec6

Browse files
ruudkondrejmirtes
authored andcommitted
Updated coding standard that can run on PHP 7.4
1 parent f433832 commit c8a4ec6

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"nette/utils": "<2.3.0"
1919
},
2020
"require-dev": {
21-
"consistence/coding-standard": "^3.0.1",
21+
"consistence/coding-standard": "^3.10",
2222
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
2323
"ergebnis/composer-normalize": "^2.0.2",
2424
"nette/forms": "^3.0",
@@ -30,7 +30,7 @@
3030
"phpstan/phpstan-strict-rules": "^0.12",
3131
"phpunit/phpunit": "^7.0",
3232
"satooshi/php-coveralls": "^1.0",
33-
"slevomat/coding-standard": "^4.5.2"
33+
"slevomat/coding-standard": "^6.4"
3434
},
3535
"config": {
3636
"sort-packages": true

phpcs.xml

Lines changed: 14 additions & 2 deletions
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,
@@ -28,8 +28,20 @@
2828
<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification"/>
2929
<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification"/>
3030
</rule>
31+
<rule ref="SlevomatCodingStandard.TypeHints.PropertyTypeHint">
32+
<properties>
33+
<property name="enableNativeTypeHint" value="false"/>
34+
</properties>
35+
<exclude name="SlevomatCodingStandard.TypeHints.PropertyTypeHint.MissingTraversableTypeHintSpecification"/>
36+
</rule>
37+
<rule ref="SlevomatCodingStandard.TypeHints.ReturnTypeHint">
38+
<properties>
39+
<property name="enableObjectTypeHint" value="false"/>
40+
</properties>
41+
<exclude name="SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingTraversableTypeHintSpecification"/>
42+
</rule>
3143
<rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
32-
<rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
44+
<rule ref="SlevomatCodingStandard.Operators.DisallowEqualOperators"/>
3345
<rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
3446
<rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming"/>
3547
<rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming"/>

0 commit comments

Comments
 (0)