Merge pull request #827 from PHPCSStandards/feature/pear-functiondeclaration-prevent-fixer-conflict

PEAR/FunctionDeclaration: prevent fixer conflict for unfinished closures/live coding

Author: jrfnl

src/Standards/PEAR/Sniffs/Functions/FunctionDeclarationSniff.php

@@ -103,11 +103,10 @@ public function process(File $phpcsFile, $stackPtr)
         // enforced by the previous check because there is no content between the keywords
         // and the opening parenthesis.
         // Unfinished closures are tokenized as T_FUNCTION however, and can be excluded
-        // by checking for the scope_opener.
+        // by checking if the function has a name.
         $methodProps = $phpcsFile->getMethodProperties($stackPtr);
-        if ($tokens[$stackPtr]['code'] === T_FUNCTION
-            && (isset($tokens[$stackPtr]['scope_opener']) === true || $methodProps['has_body'] === false)
-        ) {
+        $methodName  = $phpcsFile->getDeclarationName($stackPtr);
+        if ($tokens[$stackPtr]['code'] === T_FUNCTION && $methodName !== null) {
             if ($tokens[($openBracket - 1)]['content'] === $phpcsFile->eolChar) {
                 $spaces = 'newline';
             } else if ($tokens[($openBracket - 1)]['code'] === T_WHITESPACE) {

src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.3.inc

@@ -0,0 +1,7 @@
+<?php
+
+// Intentional parse error/live coding.
+// Ensuring that the sniff does not get into a fixer conflict with itself for unfinished closure declarations
+// (missing close parenthesis for import use).
+// This must be the only test in this file.
+$closure = function (string $param) use ($var

src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.4.inc

@@ -0,0 +1,7 @@
+<?php
+
+// Intentional parse error/live coding.
+// Ensuring that the sniff does not get into a fixer conflict with itself for unfinished closure declarations
+// (missing close parenthesis for import use).
+// This must be the only test in this file.
+$closure = function(string $param) use ($var

src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.4.inc.fixed

@@ -0,0 +1,7 @@
+<?php
+
+// Intentional parse error/live coding.
+// Ensuring that the sniff does not get into a fixer conflict with itself for unfinished closure declarations
+// (missing close parenthesis for import use).
+// This must be the only test in this file.
+$closure = function (string $param) use ($var

src/Standards/PEAR/Tests/Functions/FunctionDeclarationUnitTest.php

@@ -124,6 +124,11 @@ public function getErrorList($testFile='')
                 48 => 1,
             ];
 
+        case 'FunctionDeclarationUnitTest.4.inc':
+            return [
+                7 => 1,
+            ];
+
         default:
             return [];
         }//end switch