Merge branch 'hotfix/16' into develop

Forward port #16
webimpress · May 13, 2019 · 17f3382 · 17f3382
2 parents 91b61ca + 1af1846
commit 17f3382
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,7 +44,9 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- [#14](https://github.com/webimpress/coding-standard/pull/14) `PHP\DisallowFqn` - fixes importing FQN
+- [#15](https://github.com/webimpress/coding-standard/pull/15) `PHP\DisallowFqn` - fixes importing FQN
+
+- [#16](https://github.com/webimpress/coding-standard/pull/16) `WhiteSpace\ScopeIndent` - fixes code fixer for the case when boolean operator is at the end of the line
 
 ## 1.0.2 - 2019-05-12
 

diff --git a/src/WebimpressCodingStandard/Sniffs/WhiteSpace/ScopeIndentSniff.php b/src/WebimpressCodingStandard/Sniffs/WhiteSpace/ScopeIndentSniff.php
@@ -207,13 +207,23 @@ public function process(File $phpcsFile, $stackPtr)
                     $fix = $phpcsFile->addFixableError($error, $i, 'BooleanOperatorAtTheEnd');
 
                     if ($fix) {
-                        $lastNonEmpty = $phpcsFile->findPrevious(Tokens::$emptyTokens, $next - 1, null, true);
-                        $string = $phpcsFile->getTokensAsString($i, $lastNonEmpty - $i + 1);
+                        $lastNonEmpty = $i;
+                        while ($tokens[$lastNonEmpty + 1]['line'] === $tokens[$i]['line']) {
+                            ++$lastNonEmpty;
+                        }
+                        while (in_array($tokens[$lastNonEmpty]['code'], Tokens::$emptyTokens, true)) {
+                            --$lastNonEmpty;
+                        }
 
+                        $string = $phpcsFile->getTokensAsString($i, $lastNonEmpty - $i + 1);
                         if (substr($string, -1) !== '(') {
                             $string .= ' ';
                         }
 
+                        while ($bracket = $phpcsFile->findPrevious(T_OPEN_PARENTHESIS, $next - 1, $lastNonEmpty + 1)) {
+                            $next = $bracket;
+                        }
+
                         $phpcsFile->fixer->beginChangeset();
                         $j = $i - 1;
                         while ($tokens[$j]['code'] === T_WHITESPACE) {

diff --git a/test/Sniffs/WhiteSpace/ScopeIndentUnitTest.1.inc b/test/Sniffs/WhiteSpace/ScopeIndentUnitTest.1.inc
@@ -226,3 +226,18 @@ if ($a
         || ($f && $g))
 ) {
 }
+
+if ($a ||
+    ($b && $c)
+) {
+}
+
+if ($a || // comment
+    ($b && $c)
+) {
+}
+
+if ($a ||
+    ((($b && $c)))
+) {
+}
diff --git a/test/Sniffs/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed b/test/Sniffs/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed
@@ -220,3 +220,18 @@ if ($a
         || ($f && $g))
 ) {
 }
+
+if ($a
+    || ($b && $c)
+) {
+}
+
+if ($a // comment
+    || ($b && $c)
+) {
+}
+
+if ($a
+    || ((($b && $c)))
+) {
+}
diff --git a/test/Sniffs/WhiteSpace/ScopeIndentUnitTest.php b/test/Sniffs/WhiteSpace/ScopeIndentUnitTest.php
@@ -52,6 +52,12 @@ protected function getErrorList(string $testFile = '') : array
                     138 => 1,
                     146 => 1,
                     149 => 1,
+                    230 => 1,
+                    231 => 1,
+                    235 => 1,
+                    236 => 1,
+                    240 => 1,
+                    241 => 1,
                 ];
             case 'ScopeIndentUnitTest.2.inc':
                 return [
-Original file line number
+Diff line change
@@ Expand Up @@
 => 1,
 => 1,
 => 1,
+=> 1,
+=> 1,
+=> 1,
+=> 1,
+=> 1,
+=> 1,
                     ];
                 case 'ScopeIndentUnitTest.2.inc':
                     return [
@@ Expand Down @@