[DowngradePhp73] Real patch for previous node token just swapped with trailing comma and named argument

Author: samsonasik

rules/DowngradePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector.php

@@ -85,24 +85,15 @@ 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) {
-            if ($arg->getEndTokenPos() < 0) {
-                $node->setAttribute(AttributeKey::ORIGINAL_NODE, null);
-                return $node;
-            }
-        }
-
         $lastArgKey = count($args) - 1;
 
         $lastArg = $args[$lastArgKey];
         if (! $this->followedByCommaAnalyzer->isFollowed($this->file, $lastArg)) {
             return null;
         }
 
-        $this->trailingCommaRemover->remove($this->file, $lastArg);
+        $previousArg = $args[$lastArgKey - 1] ?? null;
+        $this->trailingCommaRemover->remove($this->file, $lastArg, $previousArg);
 
         return $node;
     }

rules/DowngradePhp73/Tokenizer/TrailingCommaRemover.php

@@ -9,7 +9,7 @@
 
 final class TrailingCommaRemover
 {
-    public function remove(File $file, Node $node): void
+    public function remove(File $file, Node $node, ?Node $previousNode = null): void
     {
         $tokens = $file->getOldTokens();
         $iteration = 1;
@@ -24,6 +24,12 @@ public function remove(File $file, Node $node): void
                 break;
             }
 
+            // position just swapped
+            if ($previousNode instanceof Node && $previousNode->getEndTokenPos() > $node->getEndTokenPos()) {
+                $this->remove($file, $previousNode);
+                break;
+            }
+
             $tokens[$node->getEndTokenPos() + $iteration]->text = '';
             break;
         }

rules/DowngradePhp80/NodeAnalyzer/NamedToUnnamedArgs.php

@@ -52,13 +52,8 @@ public function fillFromNamedArgs(
                     continue;
                 }
 
-                $unnamedArgs[$paramPosition] = new Arg(
-                    $currentArg->value,
-                    $currentArg->byRef,
-                    $currentArg->unpack,
-                    [],
-                    null
-                );
+                $currentArg->name = null;
+                $unnamedArgs[$paramPosition] = $currentArg;
             }
         }
 

rules/DowngradePhp80/NodeAnalyzer/UnnamedArgumentResolver.php

@@ -45,7 +45,7 @@ public function resolveFromReflection(
 
         foreach ($currentArgs as $key => $arg) {
             if (! $arg->name instanceof Identifier) {
-                $unnamedArgs[$key] = new Arg($arg->value, $arg->byRef, $arg->unpack, [], null);
+                $unnamedArgs[$key] = $arg;
 
                 continue;
             }

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

@@ -13,11 +13,6 @@ final class NamedArgumentTrailingComma
             foo: 'foo',
             bar: 'bar',
         );
-
-        $this->run(
-            bar: 'bar',
-            foo: 'foo',
-        );
     }
 }
 
@@ -34,9 +29,10 @@ final class NamedArgumentTrailingComma
 
     public function execute()
     {
-        $this->run('foo', 'bar');
-
-        $this->run('foo', 'bar');
+        $this->run(
+            'foo',
+            'bar'
+        );
     }
 }
 

tests/Set/Fixture/named_argument_trailing_comma2.php.inc

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