Fixed bug #1512 : PEAR.Functions.FunctionCallSignature enforces spaces when no arguments if required spaces is not 0

Author: gsherwood

package.xml

@@ -35,6 +35,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
     -- Thanks to Vytautas Stankus for the patch
   - Squiz.Commenting.InlineComment incorrectly identified comment blocks in some cases, muting some errors
     -- Thanks to Juliette Reinders Folmer for the patch
+  - Fixed bug #1512 : PEAR.Functions.FunctionCallSignature enforces spaces when no arguments if required spaces is not 0
   - Fixed bug #1522 : Squiz Arrays.ArrayDeclaration and Strings.ConcatenationSpacing fixers causing parse errors with here/nowdocs
   - Fixed bug #1570 : Squiz.Arrays.ArrayDeclaration fixer removes comments between array keyword and open parentheses
   - Fixed bug #1604 : File::isReference has problems with some bitwise operators and class property references

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

@@ -205,33 +205,43 @@ public function isMultiLineCall(File $phpcsFile, $stackPtr, $openBracket, $token
      */
     public function processSingleLineCall(File $phpcsFile, $stackPtr, $openBracket, $tokens)
     {
+        // If the function call has no arguments or comments, enforce 0 spaces.
         $closer = $tokens[$openBracket]['parenthesis_closer'];
         if ($openBracket === ($closer - 1)) {
             return;
         }
 
-        if ($this->requiredSpacesAfterOpen === 0 && $tokens[($openBracket + 1)]['code'] === T_WHITESPACE) {
+        $next = $phpcsFile->findNext(T_WHITESPACE, ($openBracket + 1), $closer, true);
+        if ($next === false) {
+            $requiredSpacesAfterOpen   = 0;
+            $requiredSpacesBeforeClose = 0;
+        } else {
+            $requiredSpacesAfterOpen   = $this->requiredSpacesAfterOpen;
+            $requiredSpacesBeforeClose = $this->requiredSpacesBeforeClose;
+        }
+
+        if ($requiredSpacesAfterOpen === 0 && $tokens[($openBracket + 1)]['code'] === T_WHITESPACE) {
             // Checking this: $value = my_function([*]...).
             $error = 'Space after opening parenthesis of function call prohibited';
             $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterOpenBracket');
             if ($fix === true) {
                 $phpcsFile->fixer->replaceToken(($openBracket + 1), '');
             }
-        } else if ($this->requiredSpacesAfterOpen > 0) {
+        } else if ($requiredSpacesAfterOpen > 0) {
             $spaceAfterOpen = 0;
             if ($tokens[($openBracket + 1)]['code'] === T_WHITESPACE) {
                 $spaceAfterOpen = strlen($tokens[($openBracket + 1)]['content']);
             }
 
-            if ($spaceAfterOpen !== $this->requiredSpacesAfterOpen) {
+            if ($spaceAfterOpen !== $requiredSpacesAfterOpen) {
                 $error = 'Expected %s spaces after opening bracket; %s found';
                 $data  = array(
-                          $this->requiredSpacesAfterOpen,
+                          $requiredSpacesAfterOpen,
                           $spaceAfterOpen,
                          );
                 $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceAfterOpenBracket', $data);
                 if ($fix === true) {
-                    $padding = str_repeat(' ', $this->requiredSpacesAfterOpen);
+                    $padding = str_repeat(' ', $requiredSpacesAfterOpen);
                     if ($spaceAfterOpen === 0) {
                         $phpcsFile->fixer->addContent($openBracket, $padding);
                     } else {
@@ -255,15 +265,15 @@ public function processSingleLineCall(File $phpcsFile, $stackPtr, $openBracket,
             $spaceBeforeClose = strlen($tokens[($closer - 1)]['content']);
         }
 
-        if ($spaceBeforeClose !== $this->requiredSpacesBeforeClose) {
+        if ($spaceBeforeClose !== $requiredSpacesBeforeClose) {
             $error = 'Expected %s spaces before closing bracket; %s found';
             $data  = array(
-                      $this->requiredSpacesBeforeClose,
+                      $requiredSpacesBeforeClose,
                       $spaceBeforeClose,
                      );
             $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'SpaceBeforeCloseBracket', $data);
             if ($fix === true) {
-                $padding = str_repeat(' ', $this->requiredSpacesBeforeClose);
+                $padding = str_repeat(' ', $requiredSpacesBeforeClose);
 
                 if ($spaceBeforeClose === 0) {
                     $phpcsFile->fixer->addContentBefore($closer, $padding);

src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc

@@ -213,6 +213,9 @@ function foo()
 test($arg, $arg2);
 test( $arg, $arg2 );
 test(  $arg, $arg2  );
+test();
+test( );
+test(  );
 // @codingStandardsChangeSetting PEAR.Functions.FunctionCallSignature requiredSpacesAfterOpen 0
 // @codingStandardsChangeSetting PEAR.Functions.FunctionCallSignature requiredSpacesBeforeClose 0
 

src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc.fixed

@@ -218,6 +218,9 @@ function foo()
 test( $arg, $arg2 );
 test( $arg, $arg2 );
 test( $arg, $arg2 );
+test();
+test();
+test();
 // @codingStandardsChangeSetting PEAR.Functions.FunctionCallSignature requiredSpacesAfterOpen 0
 // @codingStandardsChangeSetting PEAR.Functions.FunctionCallSignature requiredSpacesBeforeClose 0
 

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

@@ -81,22 +81,24 @@ public function getErrorList($testFile='FunctionCallSignatureUnitTest.inc')
                 194 => 1,
                 213 => 2,
                 215 => 2,
-                274 => 1,
-                275 => 1,
-                300 => 1,
-                305 => 1,
-                318 => 1,
-                319 => 1,
-                326 => 1,
-                327 => 1,
-                334 => 1,
-                339 => 1,
-                340 => 1,
+                217 => 2,
+                218 => 2,
+                277 => 1,
+                278 => 1,
+                303 => 1,
+                308 => 1,
+                321 => 1,
+                322 => 1,
+                329 => 1,
+                330 => 1,
+                337 => 1,
                 342 => 1,
-                343 => 2,
-                350 => 1,
-                351 => 1,
-                352 => 2,
+                343 => 1,
+                345 => 1,
+                346 => 2,
+                353 => 1,
+                354 => 1,
+                355 => 2,
                );
 
     }//end getErrorList()