Skip to content

Commit 6d05fff

Browse files
committed
VIPMinimum ruleset: replace assignment-in-condition sniff
... which has been split.
1 parent 71dbddd commit 6d05fff

File tree

6 files changed

+19
-5
lines changed

6 files changed

+19
-5
lines changed

WordPress-VIP-Go/ruleset-test.inc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ url_to_postid( $url ); // Warning + Message.
153153
wpcom_vip_old_slug_redirect(); // Ok.
154154
wp_old_slug_redirect(); // Warning.
155155

156-
// WordPress.CodeAnalysis.AssignmentInCondition.Found
156+
// Generic.CodeAnalysis.AssignmentInCondition.Found
157157
if ($a = 123) { // Warning.
158158
}
159159

@@ -572,3 +572,8 @@ $_SERVER["REMOTE_ADDR"]; // Error.
572572
<<<<<<< HEAD // Error.
573573

574574
>>>>>>> // Error.
575+
576+
<?php
577+
578+
// WordPress.CodeAnalysis.AssignmentInTernaryCondition
579+
$var = ($a = 123) ? $a : 0; // Warning.

WordPress-VIP-Go/ruleset-test.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@
233233
540 => 1,
234234
550 => 1,
235235
556 => 1,
236+
579 => 1,
236237
],
237238
'messages' => [
238239
7 => [

WordPress-VIP-Go/ruleset.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,10 @@
179179
<rule ref="Internal.LineEndings.Mixed">
180180
<severity>1</severity>
181181
</rule>
182-
<rule ref="WordPress.CodeAnalysis.AssignmentInCondition.Found">
182+
<rule ref="Generic.CodeAnalysis.AssignmentInCondition">
183+
<severity>1</severity>
184+
</rule>
185+
<rule ref="WordPress.CodeAnalysis.AssignmentInTernaryCondition.FoundInTernaryCondition">
183186
<severity>1</severity>
184187
</rule>
185188
<rule ref="WordPress.PHP.DiscouragedPHPFunctions.urlencode_urlencode">

WordPressVIPMinimum/ruleset-test.inc

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ $GLOBALS['wpdb'] = 'test'; // Error.
7676
if ( true == $true ) { // Warning.
7777
}
7878

79-
// WordPress.CodeAnalysis.AssignmentInCondition
79+
// Generic.CodeAnalysis.AssignmentInCondition
8080
if ( $test = get_post( $post ) ) { // Warning.
8181
}
8282

@@ -614,6 +614,9 @@ class MyClass {
614614
>>>>>>> // Error.
615615
<?php
616616

617+
// WordPress.CodeAnalysis.AssignmentInTernaryCondition
618+
$var = ( $test = get_post( $post ) ) ? $test : ''; // Warning.
619+
617620
// Squiz.WhiteSpace.SuperfluousWhitespace
618621
// Error. ?>
619622

WordPressVIPMinimum/ruleset-test.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
597 => 1,
198198
612 => 1,
199199
614 => 1,
200-
618 => 1,
200+
621 => 1,
201201
],
202202
'warnings' => [
203203
32 => 1,
@@ -290,6 +290,7 @@
290290
559 => 1,
291291
565 => 1,
292292
589 => 1,
293+
618 => 1,
293294
],
294295
'messages' => [
295296
130 => [

WordPressVIPMinimum/ruleset.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
<rule ref="Universal.Operators.StrictComparisons" phpcs-only="true">
4040
<type>warning</type>
4141
</rule>
42-
<rule ref="WordPress.CodeAnalysis.AssignmentInCondition"/>
42+
<rule ref="Generic.CodeAnalysis.AssignmentInCondition"/>
43+
<rule ref="WordPress.CodeAnalysis.AssignmentInTernaryCondition"/>
4344
<rule ref="WordPress.PHP.StrictInArray"/>
4445
<rule ref="WordPress.PHP.DontExtract"/>
4546
<rule ref="WordPress.WP.CronInterval">

0 commit comments

Comments
 (0)