fix

rectorphp · Dec 12, 2024 · 1dbfd30 · 1dbfd30
1 parent fe6ddfc
commit 1dbfd30
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 13 deletions.
diff --git a/...hp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/Fixture/fixture.php.inc b/...hp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/Fixture/fixture.php.inc
@@ -26,12 +26,13 @@ class Fixture
 {
     public function run()
     {
-        compact('posts', 'units');
-        $this->setData('posts', 'units');
+        compact('posts','units');
+        $this->setData('posts','units');
 
-        self::run('posts', 'units');
+        self::run('posts','units');
 
-        self::run('posts', 'units');
+        self::run('posts',
+                  'units');
     }
 }
 

diff --git a/...adePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/Fixture/new.php.inc b/...adePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector/Fixture/new.php.inc
@@ -22,7 +22,10 @@ class Foo
 {
     public function doFoo()
     {
-        new self('foo', 'bar');
+        new self(
+            'foo',
+            'bar'
+        );
     }
 }
 ?>
diff --git a/rules/DowngradePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector.php b/rules/DowngradePhp73/Rector/FuncCall/DowngradeTrailingCommasInFunctionCallsRector.php
@@ -90,8 +90,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        // remove comma
-        $node->setAttribute(AttributeKey::ORIGINAL_NODE, null);
+        $tokens = $this->file->getOldTokens();
+        if (isset($tokens[$args[$lastArgKey]->getEndTokenPos() + 1]) && $tokens[$args[$lastArgKey]->getEndTokenPos() + 1]->text === ',') {
+            $tokens[$args[$lastArgKey]->getEndTokenPos() + 1]->text = '';
+        }
 
         return $node;
     }

diff --git a/tests/Issues/DowngradeHeredoc/Fixture/fixture.php.inc b/tests/Issues/DowngradeHeredoc/Fixture/fixture.php.inc
@@ -63,8 +63,11 @@ class Fixture
 {
     public function getDefinition(): FixerDefinitionInterface
     {
-        return new FixerDefinition('Sorts attributes using the configured sort algorithm.', [
-            new VersionSpecificCodeSample(<<<'EOL'
+        return new FixerDefinition(
+            'Sorts attributes using the configured sort algorithm.',
+            [
+                new VersionSpecificCodeSample(
+                    <<<'EOL'
 <?php
 
 #[Foo]
@@ -82,8 +85,11 @@ Corge(a: 'test'),
 class Sample2 {}
 
 EOL
-, new VersionSpecification(80000)),
-            new VersionSpecificCodeSample(<<<'EOL'
+,
+                    new VersionSpecification(80000)
+                ),
+                new VersionSpecificCodeSample(
+                    <<<'EOL'
 <?php
 
 use A\B\Foo;
@@ -97,8 +103,12 @@ use A\B as AB;
 class Sample1 {}
 
 EOL
-, new VersionSpecification(80000), ['sort_algorithm' => self::ORDER_CUSTOM, 'order' => ['A\B\Qux', 'A\B\Bar', 'A\B\Corge']]),
-        ]);
+,
+                    new VersionSpecification(80000),
+                    ['sort_algorithm' => self::ORDER_CUSTOM, 'order' => ['A\B\Qux', 'A\B\Bar', 'A\B\Corge']]
+                ),
+            ]
+        );
     }
 }