Skip to content

Commit 7a85038

Browse files
authored
Upgrade to squizlabs/php_codesniffer: 4 (#2845)
1 parent d162d2d commit 7a85038

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/coding-standards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ on:
1111
jobs:
1212
coding-standards:
1313
name: "Coding Standards"
14-
uses: "doctrine/.github/.github/workflows/coding-standards.yml@7.3.0"
14+
uses: "doctrine/.github/.github/workflows/coding-standards.yml@8.0.0"

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
"require-dev": {
4141
"ext-bcmath": "*",
4242
"doctrine/annotations": "^1.12 || ^2.0",
43-
"doctrine/coding-standard": "^12.0",
43+
"doctrine/coding-standard": "^14.0",
4444
"doctrine/orm": "^3.2",
4545
"jmikola/geojson": "^1.0",
4646
"phpbench/phpbench": "^1.0.0",
4747
"phpstan/phpstan": "^2.1",
4848
"phpstan/phpstan-deprecation-rules": "^2.0",
4949
"phpstan/phpstan-phpunit": "^2.0",
5050
"phpunit/phpunit": "^10.4",
51-
"squizlabs/php_codesniffer": "^3.5",
51+
"squizlabs/php_codesniffer": "^4",
5252
"symfony/cache": "^5.4 || ^6.0 || ^7.0",
5353
"symfony/uid": "^5.4 || ^6.0 || ^7.0"
5454
},

phpcs.xml.dist

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040

4141
<!-- Allow short nullable syntax for non-union types -->
4242
<exclude name="SlevomatCodingStandard.TypeHints.UnionTypeHintFormat.DisallowedShortNullable" />
43+
<exclude name="SlevomatCodingStandard.TypeHints.DNFTypeHintFormat.DisallowedShortNullable" />
4344
</rule>
4445

4546
<rule ref="SlevomatCodingStandard.ControlStructures.EarlyExit">
@@ -52,7 +53,7 @@
5253
<exclude-pattern>tests/Doctrine/ODM/MongoDB/Tests/Mapping/Documents/GlobalNamespaceDocument.php</exclude-pattern>
5354
</rule>
5455

55-
<rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
56+
<rule ref="Squiz.Classes.ValidClassName.NotPascalCase">
5657
<exclude-pattern>tests/Doctrine/ODM/MongoDB/Tests/Mapping/Documents/GlobalNamespaceDocument.php</exclude-pattern>
5758
</rule>
5859

0 commit comments

Comments
 (0)