Fix incompatibility in a different way

fredden · fredden · commit dc4c2d976e7b · 2023-07-11T17:23:27.000+01:00
diff --git a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.3.inc b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.3.inc
@@ -26,3 +26,18 @@ if ($foo) {
 $this->foo()
     ->bar()
     ->baz();
+
+// https://github.com/squizlabs/PHP_CodeSniffer/issues/2078#issuecomment-401641650
+// See also PSR2.Methods.FunctionCallSignature
+$repository->foo()
+           ->bar(
+                function () {
+                    return true;
+                }
+           );
+$repository->foo()
+           ->bar(
+               function () {
+                   return true;
+               }
+           );
diff --git a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.3.inc.fixed b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.3.inc.fixed
@@ -26,3 +26,18 @@ if ($foo) {
 $this->foo()
     ->bar()
     ->baz();
+
+// https://github.com/squizlabs/PHP_CodeSniffer/issues/2078#issuecomment-401641650
+// See also PSR2.Methods.FunctionCallSignature
+$repository->foo()
+           ->bar(
+                function () {
+                    return true;
+                }
+           );
+$repository->foo()
+           ->bar(
+                function () {
+                    return true;
+                }
+           );
diff --git a/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php b/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php
@@ -79,6 +79,9 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')
                 6  => 1,
                 7  => 1,
                 10 => 1,
+                40 => 1,
+                41 => 1,
+                42 => 1,
             ];
         }
 
diff --git a/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php b/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php
@@ -41,13 +41,6 @@ class FunctionCallSignatureSniff implements Sniff
      */
     public $allowMultipleArguments = true;
 
-    /**
-     * If TRUE, we are running at the same time as a conflicting sniff
-     *
-     * @var boolean
-     */
-    private bool $isConflictWithGenericWhitespace;
-
     /**
      * How many spaces should follow the opening bracket.
      *
@@ -383,9 +376,13 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
         // at a tab stop. Without this, the function will be indented a further
         // $indent spaces to the right.
         $functionIndent = (int) (floor($foundFunctionIndent / $this->indent) * $this->indent);
-        $adjustment     = 0;
+        $adjustment     = ($functionIndent - $foundFunctionIndent);
 
-        if ($foundFunctionIndent !== $functionIndent) {
+        // This rule doesn't apply to PSR2, but this sniff is used there. We can
+        // silence the complaint in the PSR2 ruleset.xml, but the unit tests
+        // don't seem to respect that. If there is a way to make the unit tests
+        // respect ruleset.xml, then we can remove the `strpos()` call here.
+        if ($foundFunctionIndent !== $functionIndent && strpos(get_class($this), '\\PSR2\\') === false) {
             $error = 'Opening statement of multi-line function call not indented correctly; expected %s spaces but found %s';
             $data  = [
                 $functionIndent,
@@ -394,8 +391,7 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
 
             $fix = $phpcsFile->addFixableError($error, $first, 'OpeningIndent', $data);
             if ($fix === true) {
-                $adjustment = ($functionIndent - $foundFunctionIndent);
-                $padding    = str_repeat(' ', $functionIndent);
+                $padding = str_repeat(' ', $functionIndent);
                 if ($foundFunctionIndent === 0) {
                     $phpcsFile->fixer->addContentBefore($first, $padding);
                 } else if ($tokens[$first]['code'] === T_INLINE_HTML) {
@@ -470,7 +466,7 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
             $i--;
         }
 
-        for ($i; $i < $closeBracket; $i++) {
+        for (; $i < $closeBracket; $i++) {
             if ($i > $argStart && $i < $argEnd) {
                 $inArg = true;
             } else {
@@ -550,22 +546,34 @@ public function processMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $
                         $foundIndent = $tokens[$i]['length'];
                     }
 
-                    if (!isset($this->isConflictWithGenericWhitespace)) {
-                        $this->isConflictWithGenericWhitespace = false;
-                        $ruleset = new Ruleset($phpcsFile->config);
-                        foreach ($ruleset->sniffCodes as $sniff) {
-                            if ($sniff === \PHP_CodeSniffer\Standards\Generic\Sniffs\WhiteSpace\ScopeIndentSniff::class) {
-                                $this->isConflictWithGenericWhitespace = true;
-                                break;
+                    $indentCorrect = true;
+
+                    if ($foundIndent < $expectedIndent) {
+                        $indentCorrect = false;
+                    } else if ($inArg === false && $expectedIndent !== $foundIndent) {
+                        $indentCorrect = false;
+
+                        // It is permitted to indent chains further than one tab stop to
+                        // align vertically with the previous method call.
+                        if ($i === ($closeBracket - 1)) {
+                            if ($foundIndent === $foundFunctionIndent) {
+                                // This is the closing paren; it lines up vertically with the opening paren.
+                                $indentCorrect = true;
+                            }
+                        } else {
+                            if ($foundIndent === ($tokens[$openBracket]['column'] - 1)) {
+                                // This is a parameter; it lines up vertically with the opening paren.
+                                $indentCorrect = true;
+                            }
+
+                            if ($foundIndent === ($foundFunctionIndent + ($this->indent))) {
+                                // This is a parameter; it is indented one more step than the function call around it.
+                                $indentCorrect = true;
                             }
                         }
-                    }
+                    }//end if
 
-                    if (($foundIndent < $expectedIndent
-                        || ($inArg === false
-                        && $expectedIndent !== $foundIndent))
-                        && $this->isConflictWithGenericWhitespace === false
-                    ) {
+                    if ($indentCorrect === false) {
                         $error = 'Multi-line function call not indented correctly; expected %s spaces but found %s';
                         $data  = [
                             $expectedIndent,
diff --git a/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php b/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php
@@ -69,7 +69,7 @@ public function getErrorList($testFile='FunctionCallSignatureUnitTest.inc')
             82  => 1,
             93  => 1,
             100 => 1,
-            106 => 2,
+            106 => 1,
             119 => 1,
             120 => 1,
             129 => 1,
@@ -98,15 +98,9 @@ public function getErrorList($testFile='FunctionCallSignatureUnitTest.inc')
             346 => 2,
             353 => 1,
             354 => 1,
-            355 => 2,
+            355 => 1,
             377 => 1,
-            378 => 1,
-            379 => 1,
-            380 => 1,
             385 => 1,
-            386 => 1,
-            387 => 1,
-            388 => 1,
             393 => 1,
             394 => 1,
             395 => 1,
diff --git a/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php b/src/Standards/PSR2/Sniffs/Methods/FunctionCallSignatureSniff.php
@@ -25,7 +25,7 @@ class FunctionCallSignatureSniff extends PEARFunctionCallSignatureSniff
 
 
     /**
-     * Processes single-line calls.
+     * Determine if this is a multi-line function call.
      *
      * @param \PHP_CodeSniffer\Files\File $phpcsFile   The file being scanned.
      * @param int                         $stackPtr    The position of the current token
@@ -35,7 +35,7 @@ class FunctionCallSignatureSniff extends PEARFunctionCallSignatureSniff
      * @param array                       $tokens      The stack of tokens that make up
      *                                                 the file.
      *
-     * @return void
+     * @return bool
      */
     public function isMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $tokens)
     {
diff --git a/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.inc b/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.inc
@@ -265,3 +265,18 @@ array_fill_keys(
     ), value: true,
 );
 // phpcs:set PSR2.Methods.FunctionCallSignature allowMultipleArguments false
+
+// https://github.com/squizlabs/PHP_CodeSniffer/issues/2078#issuecomment-401641650
+// This sniff should accept both of these styles. Generic.WhiteSpace.ScopeIndent can complain & fix this if enabled.
+$repository->foo()
+           ->bar(
+                function () {
+                    return true;
+                }
+           );
+$repository->foo()
+           ->bar(
+               function () {
+                   return true;
+               }
+           );
diff --git a/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.inc.fixed b/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.inc.fixed
@@ -281,3 +281,18 @@ array_fill_keys(
     ), value: true,
 );
 // phpcs:set PSR2.Methods.FunctionCallSignature allowMultipleArguments false
+
+// https://github.com/squizlabs/PHP_CodeSniffer/issues/2078#issuecomment-401641650
+// This sniff should accept both of these styles. Generic.WhiteSpace.ScopeIndent can complain & fix this if enabled.
+$repository->foo()
+           ->bar(
+                function () {
+                    return true;
+                }
+           );
+$repository->foo()
+           ->bar(
+               function () {
+                   return true;
+               }
+           );
diff --git a/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php b/src/Standards/PSR2/Tests/Methods/FunctionCallSignatureUnitTest.php
@@ -52,12 +52,12 @@ public function getErrorList()
             187 => 1,
             194 => 3,
             199 => 1,
-            200 => 2,
+            200 => 1,
             202 => 1,
             203 => 1,
             210 => 2,
             211 => 1,
-            212 => 2,
+            212 => 1,
             217 => 1,
             218 => 1,
             227 => 1,
diff --git a/src/Standards/PSR2/ruleset.xml b/src/Standards/PSR2/ruleset.xml
@@ -151,9 +151,6 @@
     <rule ref="PSR2.Methods.FunctionCallSignature.SpaceAfterCloseBracket">
         <severity>0</severity>
     </rule>
-    <rule ref="PSR2.Methods.FunctionCallSignature.OpeningIndent">
-        <severity>0</severity>
-    </rule>
 
     <!-- 5. Control Structures -->
 

Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,9 @@ public function getErrorList($testFile='ScopeIndentUnitTest.inc')`
`79`	`79`	`6 => 1,`
`80`	`80`	`7 => 1,`
`81`	`81`	`10 => 1,`
	`82`	`+ 40 => 1,`
	`83`	`+ 41 => 1,`
	`84`	`+ 42 => 1,`
`82`	`85`	`];`
`83`	`86`	`}`
`84`	`87`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ class FunctionCallSignatureSniff extends PEARFunctionCallSignatureSniff`
`25`	`25`
`26`	`26`
`27`	`27`	`/**`
`28`		`- * Processes single-line calls.`
	`28`	`+ * Determine if this is a multi-line function call.`
`29`	`29`	`*`
`30`	`30`	`* @param \PHP_CodeSniffer\Files\File $phpcsFile The file being scanned.`
`31`	`31`	`* @param int $stackPtr The position of the current token`
`@@ -35,7 +35,7 @@ class FunctionCallSignatureSniff extends PEARFunctionCallSignatureSniff`
`35`	`35`	`* @param array $tokens The stack of tokens that make up`
`36`	`36`	`* the file.`
`37`	`37`	`*`
`38`		`- * @return void`
	`38`	`+ * @return bool`
`39`	`39`	`*/`
`40`	`40`	`public function isMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $tokens)`
`41`	`41`	`{`