Skip to content

Commit 5572ee7

Browse files
committed
Remove bugged or too restrictive WP rules
1 parent 0894474 commit 5572ee7

File tree

4 files changed

+12
-18
lines changed

4 files changed

+12
-18
lines changed

Inpsyde/Sniffs/CodeQuality/VariablesNameSniff.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,8 @@ public function process(File $phpcsFile, $stackPtr)
9292
$ignored = $this->allIgnored();
9393
$name = $phpcsFile->getTokens()[$stackPtr]['content'];
9494

95-
if (in_array($name, $ignored, true)
95+
if (
96+
in_array($name, $ignored, true)
9697
|| strpos($name, '$wp_') === 0
9798
|| strpos($name, '$_wp_') === 0
9899
) {
@@ -108,7 +109,8 @@ public function process(File $phpcsFile, $stackPtr)
108109

109110
$isProperty = PhpcsHelpers::variableIsProperty($phpcsFile, $stackPtr);
110111

111-
if (($isProperty && $this->arePropertiesIgnored())
112+
if (
113+
($isProperty && $this->arePropertiesIgnored())
112114
|| (!$isProperty && $this->areVariablesIgnored())
113115
) {
114116
return;

Inpsyde/ruleset.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<rule ref="WordPress.DB.RestrictedClasses"/>
5454
<rule ref="WordPress.DB.RestrictedFunctions"/>
5555
<rule ref="WordPress.DateTime.CurrentTimeTimestamp"/>
56-
<rule ref="WordPress.DateTime.RestrictedFunctions"/>
5756
<rule ref="WordPress.NamingConventions.PrefixAllGlobals"/>
5857
<rule ref="WordPress.NamingConventions.ValidHookName">
5958
<properties>
@@ -71,9 +70,7 @@
7170
<rule ref="WordPress.PHP.RestrictedPHPFunctions"/>
7271
<rule ref="WordPress.PHP.DiscouragedPHPFunctions">
7372
<properties>
74-
<property name="exclude" value="serialize"/>
75-
<property name="exclude" value="urlencode"/>
76-
<property name="exclude" value="obfuscation"/>
73+
<property name="exclude" type="array" value="serialize,urlencode,obfuscation"/>
7774
</properties>
7875
</rule>
7976
<rule ref="WordPress.PHP.DiscouragedPHPFunctions.runtime_configuration">
@@ -108,9 +105,7 @@
108105
<rule ref="WordPress.WP.DiscouragedFunctions"/>
109106
<rule ref="WordPress.WP.EnqueuedResourceParameters"/>
110107
<rule ref="WordPress.WP.EnqueuedResources"/>
111-
<rule ref="WordPress.WP.GlobalVariablesOverride"/>
112108
<rule ref="WordPress.WP.I18n"/>
113-
<rule ref="WordPress.WhiteSpace.CastStructureSpacing"/>
114109

115110
<!--
116111
Curated list of WordPress VIP rules.
@@ -123,7 +118,6 @@
123118
<rule ref="WordPressVIPMinimum.Functions.DynamicCalls"/>
124119
<rule ref="WordPressVIPMinimum.Hooks.AlwaysReturnInFilter"/>
125120
<rule ref="WordPressVIPMinimum.Hooks.PreGetPosts"/>
126-
<rule ref="WordPressVIPMinimum.Performance.OrderByRand"/>
127121
<rule ref="WordPressVIPMinimum.Performance.RegexpCompare"/>
128122
<rule ref="WordPressVIPMinimum.Performance.TaxonomyMetaInOptions"/>
129123
<rule ref="WordPressVIPMinimum.Security.EscapingVoidReturnFunctions"/>

phpcs.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
<ruleset name="Inpsyde Coding Standard">
33

44
<description>PHP 7+ coding standards for Inpsyde WordPress projects.</description>
5+
56
<autoload>./Inpsyde/PhpcsHelpers.php</autoload>
7+
68
<file>./Inpsyde/Sniffs</file>
79
<file>./tests/src</file>
810
<file>./tests/cases</file>
@@ -66,7 +68,6 @@
6668
<rule ref="WordPress.DB.RestrictedClasses"/>
6769
<rule ref="WordPress.DB.RestrictedFunctions"/>
6870
<rule ref="WordPress.DateTime.CurrentTimeTimestamp"/>
69-
<rule ref="WordPress.DateTime.RestrictedFunctions"/>
7071
<rule ref="WordPress.NamingConventions.PrefixAllGlobals"/>
7172
<rule ref="WordPress.NamingConventions.ValidHookName">
7273
<properties>
@@ -84,9 +85,7 @@
8485
<rule ref="WordPress.PHP.RestrictedPHPFunctions"/>
8586
<rule ref="WordPress.PHP.DiscouragedPHPFunctions">
8687
<properties>
87-
<property name="exclude" value="serialize"/>
88-
<property name="exclude" value="urlencode"/>
89-
<property name="exclude" value="obfuscation"/>
88+
<property name="exclude" type="array" value="serialize,urlencode,obfuscation"/>
9089
</properties>
9190
</rule>
9291
<rule ref="WordPress.PHP.DiscouragedPHPFunctions.runtime_configuration">
@@ -121,9 +120,7 @@
121120
<rule ref="WordPress.WP.DiscouragedFunctions"/>
122121
<rule ref="WordPress.WP.EnqueuedResourceParameters"/>
123122
<rule ref="WordPress.WP.EnqueuedResources"/>
124-
<rule ref="WordPress.WP.GlobalVariablesOverride"/>
125123
<rule ref="WordPress.WP.I18n"/>
126-
<rule ref="WordPress.WhiteSpace.CastStructureSpacing"/>
127124

128125
<!--
129126
Curated list of WordPress VIP rules.
@@ -136,7 +133,6 @@
136133
<rule ref="WordPressVIPMinimum.Functions.DynamicCalls"/>
137134
<rule ref="WordPressVIPMinimum.Hooks.AlwaysReturnInFilter"/>
138135
<rule ref="WordPressVIPMinimum.Hooks.PreGetPosts"/>
139-
<rule ref="WordPressVIPMinimum.Performance.OrderByRand"/>
140136
<rule ref="WordPressVIPMinimum.Performance.RegexpCompare"/>
141137
<rule ref="WordPressVIPMinimum.Performance.TaxonomyMetaInOptions"/>
142138
<rule ref="WordPressVIPMinimum.Security.EscapingVoidReturnFunctions"/>

tests/src/FixtureContentParser.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ private function processResults(\stdClass $accumulator, string $fixturePath): ar
9393
$results = $cb(...$results);
9494
// phpcs:enable
9595

96-
if ($accumulator->process->content
96+
if (
97+
$accumulator->process->content
9798
&& !is_array($results)
9899
|| count($results) !== 5
99100
|| !is_string($results[0] ?? null)
@@ -167,7 +168,8 @@ private function readFile(string $file)
167168
*/
168169
private function readLine(int $lineNum, string $line, \stdClass $accumulator)
169170
{
170-
if (!$this->readProcessLine($lineNum, $line, $accumulator)
171+
if (
172+
!$this->readProcessLine($lineNum, $line, $accumulator)
171173
&& !$this->readSniffLine($line, $accumulator)
172174
&& !$this->readPropertiesLine($lineNum, $line, $accumulator)
173175
) {

0 commit comments

Comments
 (0)