Skip to content

Commit d6abac8

Browse files
Merge pull request #2099 from WordPress/update/plugin-check
Update plugin-check to 1.6 and reuse PHPCS ruleset
2 parents e147007 + 42c9054 commit d6abac8

File tree

4 files changed

+9
-168
lines changed

4 files changed

+9
-168
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"yoast/phpunit-polyfills": "^4.0",
5252
"phpstan/php-8-stubs": "^0.4.0",
5353
"phpstan/phpstan-strict-rules": "^1.6",
54-
"wpackagist-plugin/plugin-check": "^1.5"
54+
"wpackagist-plugin/plugin-check": "^1.6"
5555
},
5656
"config": {
5757
"allow-plugins": {

composer.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/phpcs/phpcs.ruleset.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@
33
<description>Sniffs for WordPress plugins</description>
44

55
<rule ref="../../vendor/wpackagist-plugin/plugin-check/vendor/plugin-check/phpcs-sniffs/PluginCheck/ruleset.xml" />
6-
7-
<!-- Note: The following rule is not directly referencing '../../vendor/wpackagist-plugin/plugin-check/phpcs-rulesets/plugin-review.xml' -->
8-
<!-- This is because it has rules/configs that are not desired, especially setting the testVersion to 5.2-. -->
9-
<rule ref="./plugin-check.ruleset.xml"/>
6+
<rule ref="../../vendor/wpackagist-plugin/plugin-check/phpcs-rulesets/plugin-check.ruleset.xml"/>
107

118
<rule ref="PHPCompatibility"/>
129
<config name="testVersion" value="7.2-"/>
@@ -128,9 +125,6 @@
128125
<rule ref="PluginCheck.CodeAnalysis.Offloading.OffloadedContent">
129126
<exclude-pattern>./plugins/*/tests/**</exclude-pattern>
130127
</rule>
131-
<rule ref="PluginCheck.CodeAnalysis.ImageFunctions.NonEnqueuedImage">
132-
<exclude-pattern>./plugins/*/tests/**</exclude-pattern>
133-
</rule>
134128
<rule ref="Squiz.PHP.DiscouragedFunctions.Discouraged">
135129
<exclude-pattern>./plugins/*/tests/**</exclude-pattern>
136130
</rule>

tools/phpcs/plugin-check.ruleset.xml

Lines changed: 0 additions & 153 deletions
This file was deleted.

0 commit comments

Comments
 (0)