Fixed bug #333 : Nested ternary operators causing problems

Author: gsherwood

CodeSniffer/File.php

@@ -1836,10 +1836,11 @@ private static function _recurseScopeMap(
 
             if (PHP_CODESNIFFER_VERBOSITY > 1) {
                 $type    = $tokens[$i]['type'];
+                $line    = $tokens[$i]['line'];
                 $content = PHP_CodeSniffer::prepareForOutput($tokens[$i]['content']);
 
                 echo str_repeat("\t", $depth);
-                echo "Process token $i [";
+                echo "Process token $i on line $line [";
                 if ($opener !== null) {
                     echo "opener:$opener;";
                 }
@@ -1851,11 +1852,30 @@ private static function _recurseScopeMap(
                 echo "]: $type => $content".PHP_EOL;
             }//end if
 
+            if ($opener === null && $tokens[$i]['code'] === T_OPEN_PARENTHESIS) {
+                $i = $tokens[$i]['parenthesis_closer'];
+
+                // Because we might have skipped a bunch of lines, we can
+                // keep looking a little longer.
+                $startLine = $tokens[$i]['line'];
+
+                if (PHP_CODESNIFFER_VERBOSITY > 1) {
+                    $type = $tokens[$stackPtr]['type'];
+                    echo str_repeat("\t", $depth);
+                    echo "* skipping parenthesis *".PHP_EOL;
+                }
+
+                continue;
+            }
+
             // Very special case for IF statements in PHP that can be defined without
             // scope tokens. E.g., if (1) 1; 1 ? (1 ? 1 : 1) : 1;
             // If an IF statement below this one has an opener but no
             // keyword, the opener will be incorrectly assigned to this IF statement.
-            if (($currType === T_IF || $currType === T_ELSE) && $opener === null && $tokens[$i]['code'] === T_SEMICOLON) {
+            if (($currType === T_IF || $currType === T_ELSE)
+                && $opener === null
+                && $tokens[$i]['code'] === T_SEMICOLON
+            ) {
                 if (PHP_CODESNIFFER_VERBOSITY > 1) {
                     $type = $tokens[$stackPtr]['type'];
                     echo str_repeat("\t", $depth);
@@ -1933,7 +1953,7 @@ private static function _recurseScopeMap(
                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
                         $type = $tokens[$stackPtr]['type'];
                         echo str_repeat("\t", $depth);
-                        echo "=> Couldn't find scope opener for $stackPtr:$type, bailing".PHP_EOL;
+                        echo "=> Found new opening condition before scope opener for $stackPtr:$type, bailing".PHP_EOL;
                     }
 
                     return $stackPtr;

CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc

@@ -56,3 +56,9 @@ elseif ($something) :
 else:
     echo 'false';
 endif;
+
+function test()
+{
+    if ($a)
+        $a.=' '.($b ? 'b' : ($c ? ($d ? 'd' : 'c') : ''));
+}

CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.inc.fixed

@@ -57,3 +57,9 @@ elseif ($something) :
 else:
     echo 'false';
 endif;
+
+function test()
+{
+    if ($a) {
+        $a.=' '.($b ? 'b' : ($c ? ($d ? 'd' : 'c') : '')); }
+}

CodeSniffer/Standards/Generic/Tests/ControlStructures/InlineControlStructureUnitTest.php

@@ -59,6 +59,7 @@ public function getErrorList($testFile='InlineControlStructureUnitTest.inc')
                     45 => 1,
                     46 => 1,
                     49 => 1,
+                    62 => 1,
                    );
             break;
         case 'InlineControlStructureUnitTest.js':

package.xml

@@ -54,6 +54,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Improved fixing of lines after cases statements in Squiz SwitchDeclarationSniff
   - Fixed bug #311 : Suppression of function prototype breaks checking of lines within function
   - Fixed bug #320 : Code sniffer identation issue
+  - Fixed bug #333 : Nested ternary operators causing problems
  </notes>
  <contents>
   <dir name="/">