Skip to content

Commit cc83d36

Browse files
rhorberrhorber
authored andcommitted
Fixed test in ComparisonOperatorUsageSniff and added tests for it.
1 parent a5d3f14 commit cc83d36

File tree

4 files changed

+31
-1
lines changed

4 files changed

+31
-1
lines changed

CodeSniffer/Standards/Squiz/Sniffs/Operators/ComparisonOperatorUsageSniff.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
154154

155155
$start = $phpcsFile->findNext(PHP_CodeSniffer_Tokens::$emptyTokens, ($i + 1), null, true);
156156
} else {
157-
if (isset($tokens[$stackPtr]['parenthesis_opener']) === false) {
157+
if (isset($tokens[$end]['parenthesis_opener']) === false) {
158158
return;
159159
}
160160

CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.inc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,15 @@ while (TRUE) {
117117

118118
while (FALSE) {
119119
}
120+
121+
$var = ($var1 === true) ? $var1 : "foobar";
122+
123+
$var = ($var1 == true) ? $var1 : "foobar";
124+
125+
$var = ($var1 === false) ? $var1 : "foobar";
126+
127+
$var = ($var1 == false) ? $var1 : "foobar";
128+
129+
$var = ($var1 === 0) ? $var1 : "foobar";
130+
131+
$var = ($var1 == 0) ? $var1 : "foobar";

CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,15 @@ for (one = 10; one !== 0; one--) {
5757

5858
for (type in types) {
5959
}
60+
61+
variable = (variable2 === true) ? variable1 : "foobar";
62+
63+
variable = (variable2 == true) ? variable1 : "foobar";
64+
65+
variable = (variable2 === false) ? variable1 : "foobar";
66+
67+
variable = (variable2 == false) ? variable1 : "foobar";
68+
69+
variable = (variable2 === 0) ? variable1 : "foobar";
70+
71+
variable = (variable2 == 0) ? variable1 : "foobar";

CodeSniffer/Standards/Squiz/Tests/Operators/ComparisonOperatorUsageUnitTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ public function getErrorList($testFile='ComparisonOperatorUsageUnitTest.inc')
7171
100 => 1,
7272
106 => 1,
7373
112 => 1,
74+
123 => 1,
75+
127 => 1,
76+
131 => 1,
7477
);
7578
break;
7679
case 'ComparisonOperatorUsageUnitTest.js':
@@ -83,6 +86,9 @@ public function getErrorList($testFile='ComparisonOperatorUsageUnitTest.inc')
8386
40 => 1,
8487
47 => 1,
8588
52 => 1,
89+
63 => 1,
90+
67 => 1,
91+
71 => 1,
8692
);
8793
break;
8894
default:

0 commit comments

Comments
 (0)