diff --git a/packages/Php/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_commented_param_func_get_args.php.inc b/packages/Php/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_commented_param_func_get_args.php.inc
new file mode 100644
index 00000000000..c4c113108a5
--- /dev/null
+++ b/packages/Php/tests/Rector/FuncCall/RemoveExtraParametersRector/Fixture/skip_commented_param_func_get_args.php.inc
@@ -0,0 +1,14 @@
+<?php
+
+namespace Rector\Php\Tests\Rector\FuncCall\RemoveExtraParametersRector\Fixture;
+
+use Rector\Php\Tests\Rector\FuncCall\RemoveExtraParametersRector\Source\MagicEventDispatcher;
+
+final class SkipCommentedParamFuncGetArgs
+{
+    public function run()
+    {
+        $magicEventDispatcher = new MagicEventDispatcher();
+        $magicEventDispatcher->dispatch(1, 2);
+    }
+}
diff --git a/packages/Php/tests/Rector/FuncCall/RemoveExtraParametersRector/RemoveExtraParametersRectorTest.php b/packages/Php/tests/Rector/FuncCall/RemoveExtraParametersRector/RemoveExtraParametersRectorTest.php
index 9123c977f2b..d11bde3e333 100644
--- a/packages/Php/tests/Rector/FuncCall/RemoveExtraParametersRector/RemoveExtraParametersRectorTest.php
+++ b/packages/Php/tests/Rector/FuncCall/RemoveExtraParametersRector/RemoveExtraParametersRectorTest.php
@@ -17,6 +17,7 @@ final class RemoveExtraParametersRectorTest extends AbstractRectorTestCase
             __DIR__ . '/Fixture/static_calls.php.inc',
             __DIR__ . '/Fixture/external_scope.php.inc',
             __DIR__ . '/Fixture/static_call_parent.php.inc',
+            __DIR__ . '/Fixture/skip_commented_param_func_get_args.php.inc',
         ]);
     }
 
diff --git a/packages/Php/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/MagicEventDispatcher.php b/packages/Php/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/MagicEventDispatcher.php
new file mode 100644
index 00000000000..cf55fb05a19
--- /dev/null
+++ b/packages/Php/tests/Rector/FuncCall/RemoveExtraParametersRector/Source/MagicEventDispatcher.php
@@ -0,0 +1,19 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Php\Tests\Rector\FuncCall\RemoveExtraParametersRector\Source;
+
+use Symfony\Component\EventDispatcher\Event;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+
+final class MagicEventDispatcher
+{
+    /**
+     * {@inheritdoc}
+     *
+     * @param string|null $eventName
+     */
+    public function dispatch($event/*, string $eventName = null*/)
+    {
+        $eventName = 1 < \func_num_args() ? \func_get_arg(1) : null;
+    }
+}
diff --git a/packages/Symfony/tests/Rector/MethodCall/MakeDispatchFirstArgumentEventRector/Fixture/keep_string_event_constant.php.inc b/packages/Symfony/tests/Rector/MethodCall/MakeDispatchFirstArgumentEventRector/Fixture/keep_string_event_constant.php.inc
index 335399094bf..1485ecef439 100644
--- a/packages/Symfony/tests/Rector/MethodCall/MakeDispatchFirstArgumentEventRector/Fixture/keep_string_event_constant.php.inc
+++ b/packages/Symfony/tests/Rector/MethodCall/MakeDispatchFirstArgumentEventRector/Fixture/keep_string_event_constant.php.inc
@@ -13,6 +13,7 @@ class KeepStringEventConstant
         /** @var Event|CustomEvent $customEvent */
         $customEvent = new CustomEvent();
         $eventDispatcher->dispatch(CustomEvent::NAME, $customEvent);
+        $eventDispatcher->dispatch($customEvent, CustomEvent::NAME);
     }
 }
 
@@ -24,6 +25,7 @@ namespace Rector\Symfony\Tests\Rector\MethodCall\MakeDispatchFirstArgumentEventR
 
 use Rector\Symfony\Tests\Rector\MethodCall\MakeDispatchFirstArgumentEventRector\Source\CustomEvent;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Contracts\EventDispatcher\Event;
 
 class KeepStringEventConstant
 {
@@ -32,6 +34,7 @@ class KeepStringEventConstant
         /** @var Event|CustomEvent $customEvent */
         $customEvent = new CustomEvent();
         $eventDispatcher->dispatch($customEvent, CustomEvent::NAME);
+        $eventDispatcher->dispatch($customEvent, CustomEvent::NAME);
     }
 }