Merge branch 'master' into 3.0

Author: gsherwood

package.xml

@@ -108,6 +108,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #1109 : Wrong scope indent reported in anonymous class
   - Fixed bug #1112 : File docblock not recognized when require_once follows it
   - Fixed bug #1120 : InlineControlStructureSniff does not handle auto-fixing for control structures that make function calls
+  - Fixed bug #1124 : Squiz.Operators.ComparisonOperatorUsage does not detect bracketed conditions for inline IF statements
+    -- Thanks to Raphael Horber for the patch
  </notes>
  <contents>
   <dir name="/">

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

@@ -121,7 +121,7 @@ public function process(File $phpcsFile, $stackPtr)
 
                 $start = $phpcsFile->findNext(Tokens::$emptyTokens, ($i + 1), null, true);
             } else {
-                if (isset($tokens[$stackPtr]['parenthesis_opener']) === false) {
+                if (isset($tokens[$end]['parenthesis_opener']) === false) {
                     return;
                 }
 

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

@@ -117,3 +117,15 @@ while (TRUE) {
 
 while (FALSE) {
 }
+
+$var = ($var1 === true) ? $var1 : "foobar";
+
+$var = ($var1 == true) ? $var1 : "foobar";
+
+$var = ($var1 === false) ? $var1 : "foobar";
+
+$var = ($var1 == false) ? $var1 : "foobar";
+
+$var = ($var1 === 0) ? $var1 : "foobar";
+
+$var = ($var1 == 0) ? $var1 : "foobar";

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

@@ -57,3 +57,15 @@ for (one = 10; one !== 0; one--) {
 
 for (type in types) {
 }
+
+variable = (variable2 === true) ? variable1 : "foobar";
+
+variable = (variable2 == true) ? variable1 : "foobar";
+
+variable = (variable2 === false) ? variable1 : "foobar";
+
+variable = (variable2 == false) ? variable1 : "foobar";
+
+variable = (variable2 === 0) ? variable1 : "foobar";
+
+variable = (variable2 == 0) ? variable1 : "foobar";

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

@@ -54,6 +54,9 @@ public function getErrorList($testFile='ComparisonOperatorUsageUnitTest.inc')
                     100 => 1,
                     106 => 1,
                     112 => 1,
+                    123 => 1,
+                    127 => 1,
+                    131 => 1,
                    );
             break;
         case 'ComparisonOperatorUsageUnitTest.js':
@@ -66,6 +69,9 @@ public function getErrorList($testFile='ComparisonOperatorUsageUnitTest.inc')
                     40 => 1,
                     47 => 1,
                     52 => 1,
+                    63 => 1,
+                    67 => 1,
+                    71 => 1,
                    );
             break;
         default: