Merge branch 'feature/psr12-shortformtypekeywords-bugfix' of https://github.com/jrfnl/PHP_CodeSniffer

Author: gsherwood

src/Standards/PSR12/Sniffs/Keywords/ShortFormTypeKeywordsSniff.php

@@ -42,24 +42,31 @@ public function register()
      */
     public function process(File $phpcsFile, $stackPtr)
     {
-        $tokens = $phpcsFile->getTokens();
+        $tokens     = $phpcsFile->getTokens();
+        $typecast   = str_replace(' ', '', $tokens[$stackPtr]['content']);
+        $typecast   = str_replace("\t", '', $typecast);
+        $typecast   = trim($typecast, '()');
+        $typecastLc = strtolower($typecast);
 
         if (($tokens[$stackPtr]['code'] === T_BOOL_CAST
-            && strtolower($tokens[$stackPtr]['content']) === '(bool)')
+            && $typecastLc === 'bool')
             || ($tokens[$stackPtr]['code'] === T_INT_CAST
-            && strtolower($tokens[$stackPtr]['content']) === '(int)')
+            && $typecastLc === 'int')
         ) {
             return;
         }
 
-        $error = 'Short form type keywords must be used';
-        $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'LongFound');
+        $error = 'Short form type keywords must be used. Found: %s';
+        $data  = [$tokens[$stackPtr]['content']];
+        $fix   = $phpcsFile->addFixableError($error, $stackPtr, 'LongFound', $data);
         if ($fix === true) {
             if ($tokens[$stackPtr]['code'] === T_BOOL_CAST) {
-                $phpcsFile->fixer->replaceToken($stackPtr, '(bool)');
+                $replacement = str_replace($typecast, 'bool', $tokens[$stackPtr]['content']);
             } else {
-                $phpcsFile->fixer->replaceToken($stackPtr, '(int)');
+                $replacement = str_replace($typecast, 'int', $tokens[$stackPtr]['content']);
             }
+
+            $phpcsFile->fixer->replaceToken($stackPtr, $replacement);
         }
 
     }//end process()

src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.inc

@@ -6,3 +6,9 @@ $bar = (BOOLEAN) $foo;
 $bar = (int) $foo;
 $bar = (integer) $foo;
 $bar = (INT) $foo;
+
+// Test recognition with whitespace within the cast.
+$bar = (  bool  ) $foo;
+$bar = ( int ) $foo;
+$bar = (     boolean   	    ) $foo;
+$bar = (  integer) $foo;

src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.inc.fixed

@@ -6,3 +6,9 @@ $bar = (bool) $foo;
 $bar = (int) $foo;
 $bar = (int) $foo;
 $bar = (INT) $foo;
+
+// Test recognition with whitespace within the cast.
+$bar = (  bool  ) $foo;
+$bar = ( int ) $foo;
+$bar = (     bool   	    ) $foo;
+$bar = (  int) $foo;

src/Standards/PSR12/Tests/Keywords/ShortFormTypeKeywordsUnitTest.php

@@ -26,9 +26,11 @@ class ShortFormTypeKeywordsUnitTest extends AbstractSniffUnitTest
     public function getErrorList()
     {
         return [
-            3 => 1,
-            5 => 1,
-            7 => 1,
+            3  => 1,
+            5  => 1,
+            7  => 1,
+            13 => 1,
+            14 => 1,
         ];
 
     }//end getErrorList()