NoLeadingSlashInGlobalNamespaceFixer - fix for type hints (#437)

Author: kubawerlos

README.md

@@ -8,7 +8,7 @@
 
 [![CI Status](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/workflows/CI/badge.svg?branch=master&event=push)](https://github.com/kubawerlos/php-cs-fixer-custom-fixers/actions)
 [![Code coverage](https://img.shields.io/coveralls/github/kubawerlos/php-cs-fixer-custom-fixers/master.svg)](https://coveralls.io/github/kubawerlos/php-cs-fixer-custom-fixers?branch=master)
-![Tests](https://img.shields.io/badge/tests-2304-brightgreen.svg)
+![Tests](https://img.shields.io/badge/tests-2307-brightgreen.svg)
 [![Mutation testing badge](https://badge.stryker-mutator.io/github.com/kubawerlos/php-cs-fixer-custom-fixers/master)](https://stryker-mutator.github.io)
 [![Psalm type coverage](https://shepherd.dev/github/kubawerlos/php-cs-fixer-custom-fixers/coverage.svg)](https://shepherd.dev/github/kubawerlos/php-cs-fixer-custom-fixers)
 

src/Fixer/NoLeadingSlashInGlobalNamespaceFixer.php

@@ -16,6 +16,7 @@
 use PhpCsFixer\FixerDefinition\CodeSample;
 use PhpCsFixer\FixerDefinition\FixerDefinition;
 use PhpCsFixer\FixerDefinition\FixerDefinitionInterface;
+use PhpCsFixer\Tokenizer\CT;
 use PhpCsFixer\Tokenizer\Token;
 use PhpCsFixer\Tokenizer\Tokens;
 
@@ -54,33 +55,47 @@ public function fix(\SplFileInfo $file, Tokens $tokens): void
         while (++$index < $tokens->count()) {
             $index = $this->skipNamespacedCode($tokens, $index);
 
-            /** @var Token $token */
-            $token = $tokens[$index];
-
-            if (!$token->isGivenKind(T_NS_SEPARATOR)) {
+            if (!$this->isToRemove($tokens, $index)) {
                 continue;
             }
 
-            /** @var int $prevIndex */
-            $prevIndex = $tokens->getPrevMeaningfulToken($index);
+            $tokens->clearTokenAndMergeSurroundingWhitespace($index);
+        }
+    }
 
-            /** @var Token $prevToken */
-            $prevToken = $tokens[$prevIndex];
+    private function isToRemove(Tokens $tokens, int $index): bool
+    {
+        /** @var Token $token */
+        $token = $tokens[$index];
 
-            if ($prevToken->isGivenKind(T_STRING)) {
-                continue;
-            }
+        if (!$token->isGivenKind(T_NS_SEPARATOR)) {
+            return false;
+        }
 
-            /** @var int $nextIndex */
-            $nextIndex = $tokens->getTokenNotOfKindSibling($index, 1, [[T_COMMENT], [T_DOC_COMMENT], [T_NS_SEPARATOR], [T_STRING], [T_WHITESPACE]]);
+        /** @var int $prevIndex */
+        $prevIndex = $tokens->getPrevMeaningfulToken($index);
 
-            /** @var Token $nextToken */
-            $nextToken = $tokens[$nextIndex];
+        /** @var Token $prevToken */
+        $prevToken = $tokens[$prevIndex];
 
-            if ($prevToken->isGivenKind(T_NEW) || $nextToken->isGivenKind(T_DOUBLE_COLON)) {
-                $tokens->clearTokenAndMergeSurroundingWhitespace($index);
-            }
+        if ($prevToken->isGivenKind(T_STRING)) {
+            return false;
         }
+        if ($prevToken->isGivenKind([T_NEW, CT::T_NULLABLE_TYPE, CT::T_TYPE_COLON])) {
+            return true;
+        }
+
+        /** @var int $nextIndex */
+        $nextIndex = $tokens->getTokenNotOfKindSibling($index, 1, [[T_COMMENT], [T_DOC_COMMENT], [T_NS_SEPARATOR], [T_STRING], [T_WHITESPACE]]);
+
+        /** @var Token $nextToken */
+        $nextToken = $tokens[$nextIndex];
+
+        if ($nextToken->isGivenKind(T_DOUBLE_COLON)) {
+            return true;
+        }
+
+        return $prevToken->equalsAny(['(', ',']) && $nextToken->isGivenKind(T_VARIABLE);
     }
 
     private function skipNamespacedCode(Tokens $tokens, int $index): int

tests/Fixer/NoLeadingSlashInGlobalNamespaceFixerTest.php

@@ -35,9 +35,8 @@ public function testFix(string $expected, ?string $input = null): void
 
     public static function provideFixCases(): iterable
     {
-        yield [
-            '<?php namespace Foo; $y = new \\Bar();',
-        ];
+        yield ['<?php namespace Foo; $y = new \\Bar();'];
+        yield ['<?php \foo(\bar(), \baz());'];
 
         yield [
             '<?php $foo = new Bar();',
@@ -59,6 +58,16 @@ public static function provideFixCases(): iterable
             '<?php $foo = \\Bar\\Baz::NAME;',
         ];
 
+        yield [
+            '<?php function f(Bar $bar, Baz $baz, ?Qux $qux) {};',
+            '<?php function f(\\Bar $bar, \\Baz $baz, ?\\Qux $qux) {};',
+        ];
+
+        yield [
+            '<?php function f(): Bar {};',
+            '<?php function f(): \\Bar {};',
+        ];
+
         yield [
             '<?php
                 namespace { $x = new Foo(); }