Generic/OpeningFunctionBraceKernighanRitchie: check spacing before brace for empty functions

As things were, when an empty function was detected, the sniff would bow out and not execute the "SpaceBeforeBrace" check.

Fixed now.

Includes tests.

Author: jrfnl

CHANGELOG.md

@@ -73,6 +73,8 @@ The file documents changes to the PHP_CodeSniffer project.
     - Thanks to Juliette Reinders Folmer (@jrfnl) for the patch
 - Sniff error messages are now more informative to help bugs get reported to the correct project
     - Thanks to Juliette Reinders Folmer (@jrfnl) for the patch
+- Generic.Functions.OpeningFunctionBraceKernighanRitchie will now check the spacing before the opening brace for empty functions
+    - Thanks to Juliette Reinders Folmer (@jrfnl) for the patch
 - PSR2.Classes.PropertyDeclaration now enforces that the readonly modifier comes after the visibility modifier
     - PSR2 and PSR12 do not have documented rules for this as they pre-date the readonly modifier
     - PSR-PER has been used to confirm the order of this keyword so it can be applied to PSR2 and PSR12 correctly

src/Standards/Generic/Sniffs/Functions/OpeningFunctionBraceKernighanRitchieSniff.php

@@ -130,17 +130,15 @@ public function process(File $phpcsFile, $stackPtr)
         $ignore[] = T_WHITESPACE;
         $next     = $phpcsFile->findNext($ignore, ($openingBrace + 1), null, true);
         if ($tokens[$next]['line'] === $tokens[$openingBrace]['line']) {
-            if ($next === $tokens[$stackPtr]['scope_closer']
-                || $tokens[$next]['code'] === T_CLOSE_TAG
+            // Only throw this error when this is not an empty function.
+            if ($next !== $tokens[$stackPtr]['scope_closer']
+                && $tokens[$next]['code'] !== T_CLOSE_TAG
             ) {
-                // Ignore empty functions.
-                return;
-            }
-
-            $error = 'Opening brace must be the last content on the line';
-            $fix   = $phpcsFile->addFixableError($error, $openingBrace, 'ContentAfterBrace');
-            if ($fix === true) {
-                $phpcsFile->fixer->addNewline($openingBrace);
+                $error = 'Opening brace must be the last content on the line';
+                $fix   = $phpcsFile->addFixableError($error, $openingBrace, 'ContentAfterBrace');
+                if ($fix === true) {
+                    $phpcsFile->fixer->addNewline($openingBrace);
+                }
             }
         }
 

src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.inc

@@ -208,3 +208,7 @@ function myFunction($a, $lot, $of, $params)
     : array { // phpcs:ignore Standard.Category.Sniff -- for reasons.
     return null;
 }
+
+function myFunction() {}
+function myFunction()      {} // Too many spaces with an empty function.
+function myFunction()	{} // Too many spaces (tab) with an empty function.

src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.inc.fixed

@@ -196,3 +196,7 @@ function myFunction($a, $lot, $of, $params)
     : array { // phpcs:ignore Standard.Category.Sniff -- for reasons.
     return null;
 }
+
+function myFunction() {}
+function myFunction() {} // Too many spaces with an empty function.
+function myFunction() {} // Too many spaces (tab) with an empty function.

src/Standards/Generic/Tests/Functions/OpeningFunctionBraceKernighanRitchieUnitTest.php

@@ -52,6 +52,8 @@ public function getErrorList()
             191 => 1,
             197 => 1,
             203 => 1,
+            213 => 1,
+            214 => 1,
         ];
 
     }//end getErrorList()