[Symfony] Make MakeDispatchFirstArgumentEventRector work with get_class

bin/run_all_sets.php

@@ -14,7 +14,7 @@
 $file = 'src/Rector/AbstractRector.php';
 $excludedSets = [
     // required Kernel class to be set in parameters
-    'symfony-code-quality'
+    'symfony-code-quality',
 ];
 
 $errors = [];

packages/Symfony/src/Rector/MethodCall/MakeDispatchFirstArgumentEventRector.php

@@ -4,6 +4,7 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\ClassConstFetch;
+use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Type\ObjectType;
 use Rector\Rector\AbstractRector;
@@ -83,18 +84,32 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if (! $this->isStringOrUnionStringOnlyType($node->args[0]->value)) {
-            return null;
+        $firstArgumentValue = $node->args[0]->value;
+        $secondArgumentValue = $node->args[1]->value;
+
+        if ($this->isStringOrUnionStringOnlyType($firstArgumentValue)) {
+            // swap arguments
+            [$node->args[0], $node->args[1]] = [$node->args[1], $node->args[0]];
+
+            if ($this->isEventNameSameAsEventObjectClass($node)) {
+                unset($node->args[1]);
+            }
+
+            return $node;
         }
 
-        // swap arguments
-        [$node->args[0], $node->args[1]] = [$node->args[1], $node->args[0]];
+        if ($secondArgumentValue instanceof FuncCall) {
+            if ($this->isName($secondArgumentValue, 'get_class')) {
+                $getClassArgument = $secondArgumentValue->args[0]->value;
 
-        if ($this->isEventNameSameAsEventObjectClass($node)) {
-            unset($node->args[1]);
+                if ($this->areNodesEqual($firstArgumentValue, $getClassArgument)) {
+                    unset($node->args[1]);
+                    return $node;
+                }
+            }
         }
 
-        return $node;
+        return null;
     }
 
     /**

packages/Symfony/tests/Rector/MethodCall/MakeDispatchFirstArgumentEventRector/Fixture/get_class.php.inc

@@ -0,0 +1,35 @@
+<?php
+
+namespace Rector\Symfony\Tests\Rector\MethodCall\MakeDispatchFirstArgumentEventRector\Fixture;
+
+use Rector\Symfony\Tests\Rector\MethodCall\MakeDispatchFirstArgumentEventRector\Source\CustomEvent;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+
+class EventGetClass
+{
+    public function run(EventDispatcher $eventDispatcher)
+    {
+        $customEvent = new CustomEvent();
+        $eventDispatcher->dispatch($customEvent, get_class($customEvent));
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Symfony\Tests\Rector\MethodCall\MakeDispatchFirstArgumentEventRector\Fixture;
+
+use Rector\Symfony\Tests\Rector\MethodCall\MakeDispatchFirstArgumentEventRector\Source\CustomEvent;
+use Symfony\Component\EventDispatcher\EventDispatcher;
+
+class EventGetClass
+{
+    public function run(EventDispatcher $eventDispatcher)
+    {
+        $customEvent = new CustomEvent();
+        $eventDispatcher->dispatch($customEvent);
+    }
+}
+
+?>

packages/Symfony/tests/Rector/MethodCall/MakeDispatchFirstArgumentEventRector/MakeDispatchFirstArgumentEventRectorTest.php

@@ -22,6 +22,7 @@ public function provideDataForTest(): iterable
     {
         yield [__DIR__ . '/Fixture/fixture.php.inc'];
         yield [__DIR__ . '/Fixture/event_class_constant.php.inc'];
+        yield [__DIR__ . '/Fixture/get_class.php.inc'];
         yield [__DIR__ . '/Fixture/keep_string_event_constant.php.inc'];
     }