Generic ScopeIndentSniff no longer does exact checking for content inside parenthesis (request #528)

Author: gsherwood

CodeSniffer/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php

@@ -188,7 +188,14 @@ public function process(PHP_CodeSniffer_File $phpcsFile, $stackPtr)
 
             $checkToken  = null;
             $checkIndent = null;
-            $exact       = $this->exact;
+
+            $exact = (bool) $this->exact;
+            if ($exact === true && isset($tokens[$i]['nested_parenthesis']) === true) {
+                // Don't check indents exactly between parenthesis as they
+                // tend to have custom rules, such as with multi-line function calls
+                // and control structure conditions.
+                $exact = false;
+            }
 
             // Detect line changes and figure out where the indent is.
             if ($tokens[$i]['column'] === 1) {

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.3.inc

@@ -0,0 +1,17 @@
+@codingStandardsChangeSetting Generic.WhiteSpace.ScopeIndent tabIndent false
+@codingStandardsChangeSetting Generic.WhiteSpace.ScopeIndent exact true
+<?php
+function test()
+{
+     echo 'test';
+     echo 'test2';
+    echo 'test3';
+    if (true) {
+         echo 'test3';
+    }
+    echo 'test3';
+    $x = f1(
+        'test1', 'test2',
+        'test3'
+    );
+}

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.3.inc.fixed

@@ -0,0 +1,17 @@
+@codingStandardsChangeSetting Generic.WhiteSpace.ScopeIndent tabIndent false
+@codingStandardsChangeSetting Generic.WhiteSpace.ScopeIndent exact true
+<?php
+function test()
+{
+    echo 'test';
+    echo 'test2';
+    echo 'test3';
+    if (true) {
+        echo 'test3';
+    }
+    echo 'test3';
+    $x = f1(
+        'test1', 'test2',
+        'test3'
+    );
+}

CodeSniffer/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php

@@ -88,6 +88,14 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
                    );
         }
 
+        if ($testFile === 'ScopeIndentUnitTest.3.inc') {
+            return array(
+                    6  => 1,
+                    7  => 1,
+                    10 => 1,
+                   );
+        }
+
         return array(
                 7   => 1,
                 10  => 1,

package.xml

@@ -33,6 +33,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Xaver Loppenstedt for helping with tests
   - Added Generic DisallowShortArraySyntaxSniff to ban the use of the PHP short array syntax (request #483)
     -- Thanks to Xaver Loppenstedt for helping with tests
+  - Generic ScopeIndentSniff no longer does exact checking for content inside parenthesis (request #528)
+    -- Only applies to custom coding standards that set the "exact" flag to TRUE
   - Squiz ConcatenationSpacingSniff now has a setting to ignore newline characters around operators (request #511)
       -- Default remains FALSE, so newlines are not allowed
       -- Override the "ignoreNewlines" setting in a ruleset.xml file to change
@@ -755,6 +757,8 @@ http://pear.php.net/dtd/package-2.0.xsd">
         <file baseinstalldir="PHP" name="ScopeIndentUnitTest.1.js.fixed" role="test" />
         <file baseinstalldir="PHP" name="ScopeIndentUnitTest.2.inc" role="test" />
         <file baseinstalldir="PHP" name="ScopeIndentUnitTest.2.inc.fixed" role="test" />
+        <file baseinstalldir="PHP" name="ScopeIndentUnitTest.3.inc" role="test" />
+        <file baseinstalldir="PHP" name="ScopeIndentUnitTest.3.inc.fixed" role="test" />
         <file baseinstalldir="PHP" name="ScopeIndentUnitTest.php" role="test">
          <tasks:replace from="@package_version@" to="version" type="package-info" />
         </file>