Skip to content

Commit 377972f

Browse files
ruudkondrejmirtes
authored andcommitted
Updated coding standard that can run on PHP 7.4
1 parent 2283bee commit 377972f

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@
2121
"symfony/framework-bundle": "<3.0"
2222
},
2323
"require-dev": {
24-
"consistence/coding-standard": "^3.0.1",
24+
"consistence/coding-standard": "^3.10",
2525
"dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
2626
"ergebnis/composer-normalize": "^2.0.2",
2727
"phing/phing": "^2.16.0",
2828
"php-parallel-lint/php-parallel-lint": "^1.2",
2929
"phpstan/phpstan-phpunit": "^0.12.8",
3030
"phpstan/phpstan-strict-rules": "^0.12.2",
3131
"phpunit/phpunit": "^7.5.20",
32-
"slevomat/coding-standard": "^4.5.2",
33-
"squizlabs/php_codesniffer": "^3.3.2",
32+
"slevomat/coding-standard": "^6.4",
33+
"squizlabs/php_codesniffer": "^3.5.6",
3434
"symfony/console": "^4.0",
3535
"symfony/framework-bundle": "^4.0",
3636
"symfony/http-foundation": "^4.0",

phpcs.xml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedClassNameInAnnotation"/>
77
<exclude name="SlevomatCodingStandard.Namespaces.FullyQualifiedExceptions"/>
88
<exclude name="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly"/>
9-
<exclude name="SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingTraversableReturnTypeHintSpecification"/>
9+
<exclude name="SlevomatCodingStandard.TypeHints.ParameterTypeHint.MissingTraversableTypeHintSpecification"/>
1010
<exclude name="Consistence.Exceptions.ExceptionDeclaration"/>
1111
<exclude name="Squiz.Commenting.FunctionComment.MissingParamTag"/>
1212
</rule>
@@ -20,16 +20,28 @@
2020
<property name="newlinesCountBetweenOpenTagAndDeclare" value="0"/>
2121
</properties>
2222
</rule>
23-
<rule ref="SlevomatCodingStandard.TypeHints.TypeHintDeclaration">
23+
<rule ref="SlevomatCodingStandard.TypeHints.ParameterTypeHint">
2424
<properties>
2525
<property name="usefulAnnotations" type="array" value="
2626
@dataProvider,
2727
@requires
2828
"/>
2929
</properties>
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"/>

src/Symfony/ConsoleApplicationResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function __construct(?string $consoleApplicationLoader)
2525

2626
/**
2727
* @return \Symfony\Component\Console\Application|null
28-
* @phpcsSuppress SlevomatCodingStandard.TypeHints.TypeHintDeclaration.MissingReturnTypeHint
28+
* @phpcsSuppress SlevomatCodingStandard.TypeHints.ReturnTypeHint.MissingNativeTypeHint
2929
*/
3030
private function loadConsoleApplication(string $consoleApplicationLoader)
3131
{

0 commit comments

Comments
 (0)