Skip to content

Commit 70b84f6

Browse files
ruudkondrejmirtes
authored andcommitted
Updated coding standard that can run on PHP 7.4
1 parent 1237536 commit 70b84f6

File tree

3 files changed

+19
-5
lines changed

3 files changed

+19
-5
lines changed

Diff for: composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
"phpstan/phpstan": "^0.12.33"
1111
},
1212
"require-dev": {
13-
"consistence/coding-standard": "^3.0.1",
13+
"consistence/coding-standard": "^3.10",
1414
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
1515
"ergebnis/composer-normalize": "^2.0.2",
1616
"phing/phing": "^2.16.0",
1717
"php-parallel-lint/php-parallel-lint": "^1.2",
1818
"phpstan/phpstan-phpunit": "^0.12",
1919
"phpunit/phpunit": "^7.0",
20-
"slevomat/coding-standard": "^4.5.2"
20+
"slevomat/coding-standard": "^6.4"
2121
},
2222
"config": {
2323
"sort-packages": true

Diff for: 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"/>

Diff for: src/Rules/DisallowedConstructs/DisallowedImplicitArrayCreationRule.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,9 @@ public function processNode(\PhpParser\Node $node, Scope $scope): array
4141
return [
4242
sprintf('Implicit array creation is not allowed - variable $%s does not exist.', $node->name),
4343
];
44-
} elseif ($certainty->maybe()) {
44+
}
45+
46+
if ($certainty->maybe()) {
4547
return [
4648
sprintf('Implicit array creation is not allowed - variable $%s might not exist.', $node->name),
4749
];

0 commit comments

Comments
 (0)