Skip to content

Commit

Permalink
Merge pull request #1813 from smrealms/dependabot/composer/fig-r/psr2…
Browse files Browse the repository at this point in the history
…r-sniffer-2.1.0

build(deps-dev): update fig-r/psr2r-sniffer requirement from 1.4.0 to 2.1.0
  • Loading branch information
hemberger authored Apr 20, 2024
2 parents 621fc62 + 838c40f commit e31ca8b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 17 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
}
},
"require-dev": {
"fig-r/psr2r-sniffer": "1.4.0",
"fig-r/psr2r-sniffer": "2.1.0",
"overtrue/phplint": "9.1.2",
"phpstan/phpstan": "1.10.67",
"phpunit/phpunit": "10.5.10",
Expand Down
24 changes: 8 additions & 16 deletions phpcs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,10 @@
<exclude name="SlevomatCodingStandard.TypeHints.NullableTypeForNullDefaultValue" />

<!-- We do not demand that all constants have a docstring. -->
<exclude name="Spryker.Commenting.DocBlockConst" />
<exclude name="PhpCollective.Commenting.DocBlockConst" />

<!-- Docstring for return void is redundant with typehint. -->
<exclude name="Spryker.Commenting.DocBlockReturnVoid" />

<!-- We do not expect that all class vars have a docstring. -->
<exclude name="Spryker.Commenting.DocBlockVar" />
<exclude name="PhpCollective.Commenting.DocBlockReturnVoid" />

<!-- Prevents compact class declarations. -->
<exclude name="Squiz.WhiteSpace.MemberVarSpacing" />
Expand Down Expand Up @@ -94,7 +91,7 @@
<rule ref="Generic.ControlStructures.InlineControlStructure">
<exclude-pattern>src/templates/*</exclude-pattern>
</rule>
<rule ref="Spryker.ControlStructures.NoInlineAssignment">
<rule ref="PhpCollective.ControlStructures.NoInlineAssignment">
<exclude-pattern>src/templates/*</exclude-pattern>
</rule>

Expand All @@ -104,7 +101,7 @@
</rule>

<!-- Ignore unknown docstring types. -->
<rule ref="Spryker.Commenting.DocBlockParamAllowDefaultValue.Typehint">
<rule ref="PhpCollective.Commenting.DocBlockParamAllowDefaultValue.Typehint">
<severity>0</severity>
</rule>

Expand All @@ -120,17 +117,17 @@
<exclude-pattern>test/*</exclude-pattern>
</rule>

<!-- Spryker sniffs do not support nullable typehints in docblocks.
<!-- PhpCollective sniffs do not support nullable typehints in docblocks.
See https://github.com/spryker/code-sniffer/issues/349. -->
<rule ref="Spryker.Commenting.DocBlockParamAllowDefaultValue.Default">
<rule ref="PhpCollective.Commenting.DocBlockParamAllowDefaultValue.Default">
<severity>0</severity>
</rule>
<rule ref="Spryker.Commenting.DocBlockReturnNullableType.ReturnNullableMissing">
<rule ref="PhpCollective.Commenting.DocBlockReturnNullableType.ReturnNullableMissing">
<severity>0</severity>
</rule>

<!-- Conflicts with PSR2R.Namespaces.NoInlineFullyQualifiedClassName.Signature -->
<rule ref="Spryker.Commenting.Attributes.ExpectedFQCN">
<rule ref="PhpCollective.Commenting.Attributes.ExpectedFQCN">
<severity>0</severity>
</rule>

Expand All @@ -151,9 +148,4 @@
<rule ref="PSR12.Operators.OperatorSpacing">
<exclude-pattern>src/lib/Smr/Chess/ChessPiece\.php</exclude-pattern>
</rule>

<!-- Ignore bug in Spryker. See https://github.com/spryker/code-sniffer/issues/368. -->
<rule ref="Spryker.Commenting.DocBlockParamAllowDefaultValue.WrongNullable">
<exclude-pattern>src/lib/Smr/Database\.php</exclude-pattern>
</rule>
</ruleset>

0 comments on commit e31ca8b

Please sign in to comment.