Skip to content
This repository was archived by the owner on Sep 19, 2023. It is now read-only.

Commit 45cc47c

Browse files
committed
Updated coding standard
1 parent 9832f0a commit 45cc47c

File tree

3 files changed

+27
-16
lines changed

3 files changed

+27
-16
lines changed

Diff for: build.xml

-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
<arg value="--extensions=php"/>
4545
<arg value="--encoding=utf-8"/>
4646
<arg value="--tab-width=4"/>
47-
<arg value="--ignore=tests/*/data"/>
4847
<arg value="-sp"/>
4948
<arg path="src"/>
5049
<arg path="tests"/>
@@ -61,7 +60,6 @@
6160
<arg value="--extensions=php"/>
6261
<arg value="--encoding=utf-8"/>
6362
<arg value="--tab-width=4"/>
64-
<arg value="--ignore=tests/*/data"/>
6563
<arg value="-sp"/>
6664
<arg path="src"/>
6765
<arg path="tests"/>

Diff for: composer.json

+4-3
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
"nikic/php-parser": "^3.1|^4.0"
1616
},
1717
"require-dev": {
18-
"consistence/coding-standard": "^2.0.0",
19-
"jakub-onderka/php-parallel-lint": "^0.9.2",
18+
"consistence/coding-standard": "^3.0.1",
19+
"dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
20+
"jakub-onderka/php-parallel-lint": "^1.0",
2021
"phing/phing": "^2.16.0",
2122
"phpstan/phpstan-phpunit": "^0.10",
2223
"phpstan/phpstan-strict-rules": "^0.10",
2324
"phpunit/phpunit": "^7.0",
24-
"slevomat/coding-standard": "^3.3.0"
25+
"slevomat/coding-standard": "^4.5.2"
2526
},
2627
"autoload": {
2728
"psr-4": {

Diff for: phpcs.xml

+23-11
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
<?xml version="1.0"?>
2-
<ruleset name="PHPStan">
2+
<ruleset name="PHPStan PHP-Parser">
33
<rule ref="vendor/consistence/coding-standard/Consistence/ruleset.xml">
44
<exclude name="Squiz.Functions.GlobalFunction.Found"/>
5-
</rule>
6-
<rule ref="vendor/slevomat/coding-standard/SlevomatCodingStandard/ruleset.xml">
7-
<exclude name="SlevomatCodingStandard.Files.TypeNameMatchesFileName"/>
85
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameAfterKeyword"/>
9-
<exclude name="SlevomatCodingStandard.Namespaces.UseOnlyWhitelistedNamespaces"/>
6+
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation"/>
7+
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedExceptions"/>
108
<exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly"/>
11-
<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification"/>
12-
<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification"/>
13-
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation.NonFullyQualifiedClassName"/>
14-
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedGlobalConstants"/>
15-
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedGlobalFunctions"/>
16-
<exclude name="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue"/>
179
</rule>
1810
<rule ref="SlevomatCodingStandard.Namespaces.AlphabeticallySortedUses">
1911
<properties>
@@ -33,4 +25,24 @@
3325
"/>
3426
</properties>
3527
</rule>
28+
<rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification">
29+
<exclude-pattern>tests/*</exclude-pattern>
30+
</rule>
31+
<rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableParameterTypeHintSpecification">
32+
<exclude-pattern>tests/*</exclude-pattern>
33+
</rule>
34+
<rule ref="SlevomatCodingStandard.ControlStructures.AssignmentInCondition"/>
35+
<rule ref="SlevomatCodingStandard.ControlStructures.DisallowEqualOperators"/>
36+
<rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit"/>
37+
<rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming"/>
38+
<rule ref="SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming"/>
39+
<!-- <rule ref="SlevomatCodingStandard.ControlStructures.DisallowShortTernaryOperator"/>-->
40+
<!-- <rule ref="SlevomatCodingStandard.Namespaces.RequireOneNamespaceInFile"/> -->
41+
<!-- <rule ref="SlevomatCodingStandard.PHP.ShortList"/> -->
42+
<rule ref="SlevomatCodingStandard.Files.TypeNameMatchesFileName">
43+
<properties>
44+
<property name="rootNamespaces" type="array" value="src=>PHPStan,tests=>PHPStan"/>
45+
</properties>
46+
</rule>
47+
<exclude-pattern>tests/*/data</exclude-pattern>
3648
</ruleset>

0 commit comments

Comments
 (0)