[DowngradePhp73] Real patch for previous node token just swapped with trailing comma and named argument (take 2) (#288)

* [DowngradePhp73] Real patch for previous node token just swapped with trailing comma and named argument (take 2)

* clean

* rectify

Author: samsonasik

rules/DowngradePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector.php

@@ -11,7 +11,6 @@
 use PhpParser\Node\Expr\StaticCall;
 use Rector\DowngradePhp73\Tokenizer\FollowedByCommaAnalyzer;
 use Rector\DowngradePhp73\Tokenizer\TrailingCommaRemover;
-use Rector\NodeTypeResolver\Node\AttributeKey;
 use Rector\Rector\AbstractRector;
 use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
 use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
@@ -85,13 +84,16 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        // reprint is needed as position changed that can't rely on token position
-        // @see https://github.com/rectorphp/rector-downgrade-php/pull/281
-        // @see https://github.com/rectorphp/rector-downgrade-php/pull/285
         foreach ($args as $arg) {
+            // reprinted, needs to remove from call like itself
             if ($arg->getEndTokenPos() < 0) {
-                $node->setAttribute(AttributeKey::ORIGINAL_NODE, null);
-                return $node;
+                $hasChanged = $this->trailingCommaRemover->removeFromCallLike($this->file, $node);
+
+                if ($hasChanged) {
+                    return $node;
+                }
+
+                return null;
             }
         }
 

rules/DowngradePhp73/Tokenizer/TrailingCommaRemover.php

@@ -5,6 +5,7 @@
 namespace Rector\DowngradePhp73\Tokenizer;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\CallLike;
 use Rector\ValueObject\Application\File;
 
 final class TrailingCommaRemover
@@ -28,4 +29,29 @@ public function remove(File $file, Node $node): void
             break;
         }
     }
+
+    public function removeFromCallLike(File $file, CallLike $callLike): bool
+    {
+        $tokens = $file->getOldTokens();
+        $iteration = 1;
+
+        $hasChanged = false;
+        while (isset($tokens[$callLike->getEndTokenPos() - $iteration])) {
+            $text = trim($tokens[$callLike->getEndTokenPos() - $iteration]->text);
+
+            if (in_array($text, [')', ''], true)) {
+                ++$iteration;
+                continue;
+            }
+
+            if ($text === ',') {
+                $tokens[$callLike->getEndTokenPos() - $iteration]->text = '';
+                $hasChanged = true;
+            }
+
+            break;
+        }
+
+        return $hasChanged;
+    }
 }

tests/Issues/DowngradeNamedTrailing/Fixture/fixture.php.inc

@@ -44,6 +44,10 @@ class Fixture
     }
 }
 
-$contents = new Fixture($content->getType(), ['error' => $e->getMessage()], $content->getId());
+$contents = new Fixture(
+    $content->getType(),
+    ['error' => $e->getMessage()],
+    $content->getId()
+);
 
 ?>

tests/Set/Fixture/named_argument_trailing_comma.php.inc

@@ -29,7 +29,10 @@ final class NamedArgumentTrailingComma
 
     public function execute()
     {
-        $this->run('foo', 'bar');
+        $this->run(
+            'foo',
+            'bar'
+        );
     }
 }
 

tests/Set/Fixture/named_argument_trailing_comma2.php.inc

@@ -29,7 +29,10 @@ final class NamedArgumentTrailingComma2
 
     public function execute()
     {
-        $this->run('foo', 'bar');
+        $this->run(
+            'foo',
+            'bar'
+        );
     }
 }
 

tests/Set/Fixture/named_argument_trailing_comma3.php.inc

@@ -30,7 +30,11 @@ final class NamedArgumentTrailingComma3
 
     public function execute()
     {
-        $this->run('foo', 'bar', 'baz');
+        $this->run(
+            'foo',
+            'bar',
+            'baz'
+        );
     }
 }
 

tests/Set/Fixture/named_argument_trailing_comma4.php.inc

@@ -30,7 +30,11 @@ final class NamedArgumentTrailingComma4
 
     public function execute()
     {
-        $this->run('foo', 'bar', 'baz');
+        $this->run(
+            'foo',
+            'bar',
+            'baz'
+        );
     }
 }
 

tests/Set/Fixture/named_argument_without_trailing_comma.php.inc

@@ -0,0 +1,41 @@
+<?php
+
+namespace Rector\Tests\Set\Fixture;
+
+final class NamedArgumentWithoutTrailingComma
+{
+	public function run(string $foo, string $bar, string $baz)
+    {}
+
+    public function execute()
+    {
+        $this->run(
+            baz: 'baz',
+            foo: 'foo',
+            bar: 'bar'
+        );
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Set\Fixture;
+
+final class NamedArgumentWithoutTrailingComma
+{
+	public function run(string $foo, string $bar, string $baz)
+    {}
+
+    public function execute()
+    {
+        $this->run(
+            'foo',
+            'bar',
+            'baz'
+        );
+    }
+}
+
+?>