Fixed bug #1432 : PHPCBF can make invalid fixes to inline JS control structures that make use of JS objects

Author: gsherwood

CodeSniffer/File.php

@@ -2258,7 +2258,7 @@ private static function _recurseScopeMap(
                         // current scope opener, so it must be a string offset.
                         if (PHP_CODESNIFFER_VERBOSITY > 1) {
                             echo str_repeat("\t", $depth);
-                            echo '* ignoring curly brace *'.PHP_EOL;
+                            echo '* ignoring curly brace inside condition *'.PHP_EOL;
                         }
 
                         $ignore++;
@@ -2269,15 +2269,21 @@ private static function _recurseScopeMap(
                             if (isset(PHP_CodeSniffer_Tokens::$emptyTokens[$tokens[$x]['code']]) === true) {
                                 continue;
                             } else {
-                                // If the first non-whitespace/comment token is a
-                                // variable or object operator then this is an opener
-                                // for a string offset and not a scope.
-                                if ($tokens[$x]['code'] === T_VARIABLE
-                                    || $tokens[$x]['code'] === T_OBJECT_OPERATOR
-                                ) {
+                                // If the first non-whitespace/comment token looks like this
+                                // brace is a string offset, or this brace is mid-way through
+                                // a new statement, it isn't a scope opener.
+                                $disallowed  = PHP_CodeSniffer_Tokens::$assignmentTokens;
+                                $disallowed += array(
+                                                T_VARIABLE         => true,
+                                                T_OBJECT_OPERATOR  => true,
+                                                T_COMMA            => true,
+                                                T_OPEN_PARENTHESIS => true,
+                                               );
+
+                                if (isset($disallowed[$tokens[$x]['code']]) === true) {
                                     if (PHP_CODESNIFFER_VERBOSITY > 1) {
                                         echo str_repeat("\t", $depth);
-                                        echo '* ignoring curly brace *'.PHP_EOL;
+                                        echo '* ignoring curly brace after condition *'.PHP_EOL;
                                     }
 
                                     $ignore++;

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

@@ -23,3 +23,9 @@ do i++; while (i < 5);
 SomeClass.prototype.switch = function() {
     // do something
 };
+
+if ($("#myid").rotationDegrees()=='90')
+    $('.modal').css({'transform': 'rotate(90deg)'});
+
+if ($("#myid").rotationDegrees()=='90')
+    $foo = {'transform': 'rotate(90deg)'};

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

@@ -29,3 +29,11 @@ do { i++;
 SomeClass.prototype.switch = function() {
     // do something
 };
+
+if ($("#myid").rotationDegrees()=='90') {
+    $('.modal').css({'transform': 'rotate(90deg)'});
+}
+
+if ($("#myid").rotationDegrees()=='90') {
+    $foo = {'transform': 'rotate(90deg)'};
+}

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

@@ -91,6 +91,8 @@ public function getErrorList($testFile='InlineControlStructureUnitTest.inc')
                     13 => 1,
                     15 => 1,
                     21 => 1,
+                    27 => 1,
+                    30 => 1,
                    );
             break;
         default:

CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.js

@@ -127,3 +127,9 @@ if (window.jQuery)(function($) {
         });
     };
 })(jQuery);
+
+if ($("#myid").rotationDegrees()=='90')
+    $('.modal').css({'transform': 'rotate(90deg)'});
+
+if ($("#myid").rotationDegrees()=='90')
+    $foo = {'transform': 'rotate(90deg)'};

CodeSniffer/Standards/Squiz/Tests/ControlStructures/ControlSignatureUnitTest.js.fixed

@@ -133,3 +133,9 @@ if (window.jQuery)(function($) {
         });
     };
 })(jQuery);
+
+if ($("#myid").rotationDegrees()=='90')
+    $('.modal').css({'transform': 'rotate(90deg)'});
+
+if ($("#myid").rotationDegrees()=='90')
+    $foo = {'transform': 'rotate(90deg)'};

package.xml

@@ -61,6 +61,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #1421 : Ternaries used in constant scalar expression for param default misidentified by tokenizer
   - Fixed bug #1431 : PHPCBF can't fix short open tags when they are not followed by a space
     -- Thanks to Gonçalo Queirós for the patch
+  - Fixed bug #1432 : PHPCBF can make invalid fixes to inline JS control structures that make use of JS objects
  </notes>
  <contents>
   <dir name="/">