Fix reporting of changed nodes

packages/CodingStyle/tests/Rector/Catch_/CatchExceptionNameMatchingTypeRector/CatchExceptionNameMatchingTypeRectorTest.php

@@ -9,7 +9,11 @@ final class CatchExceptionNameMatchingTypeRectorTest extends AbstractRectorTestC
 {
     public function test(): void
     {
-        $this->doTestFiles([__DIR__ . '/Fixture/fixture.php.inc', __DIR__ . '/Fixture/skip.php.inc']);
+        $this->doTestFiles([
+            __DIR__ . '/Fixture/fixture.php.inc',
+            __DIR__ . '/Fixture/nested_call.php.inc',
+            __DIR__ . '/Fixture/skip.php.inc',
+        ]);
     }
 
     protected function getRectorClass(): string

packages/CodingStyle/tests/Rector/Catch_/CatchExceptionNameMatchingTypeRector/Fixture/nested_call.php.inc

@@ -0,0 +1,47 @@
+<?php
+
+namespace Rector\CodingStyle\Tests\Rector\Catch_\CatchExceptionNameMatchingTypeRector\Fixture;
+
+class NestedCall
+{
+    public function run()
+    {
+        try {
+            // ...
+        } catch (SomeException $typoException) {
+            $typoException->getMessage();
+
+            if ($typoException) {
+                $processMe = function () use ($typoException) {
+                    return (bool) $typoException;
+                };
+            }
+        }
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\CodingStyle\Tests\Rector\Catch_\CatchExceptionNameMatchingTypeRector\Fixture;
+
+class NestedCall
+{
+    public function run()
+    {
+        try {
+            // ...
+        } catch (SomeException $someException) {
+            $someException->getMessage();
+
+            if ($someException) {
+                $processMe = function () use ($someException) {
+                    return (bool) $someException;
+                };
+            }
+        }
+    }
+}
+
+?>

packages/Php/src/Rector/FuncCall/CountOnNullRector.php

@@ -9,6 +9,7 @@
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Expr\Instanceof_;
 use PhpParser\Node\Expr\Ternary;
+use PhpParser\Node\Name;
 use PhpParser\Node\Name\FullyQualified;
 use PhpParser\Node\Scalar\LNumber;
 use Rector\NodeTypeResolver\Node\AttributeKey;
@@ -75,7 +76,7 @@ public function refactor(Node $node): ?Node
             $ternaryNode = new Ternary($identicalNode, new LNumber(0), $node);
         } else {
             if ($this->isAtLeastPhpVersion('7.3')) {
-                $conditionNode = new FuncCall(new Node\Name('is_countable'), [new Arg($countedNode)]);
+                $conditionNode = new FuncCall(new Name('is_countable'), [new Arg($countedNode)]);
             } else {
                 $conditionNode = new BooleanOr(
                     $this->createFunction('is_array', [new Arg($countedNode)]),

packages/Symfony/src/Rector/Class_/MakeCommandLazyRector.php

@@ -9,6 +9,7 @@
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassMethod;
 use PhpParser\Node\Stmt\Expression;
+use PhpParser\Node\Stmt\Property;
 use PHPStan\Type\StringType;
 use Rector\Rector\AbstractRector;
 use Rector\RectorDefinition\CodeSample;
@@ -83,7 +84,7 @@ public function refactor(Node $node): ?Node
         return $node;
     }
 
-    private function createDefaultNameProperty(Node $commandNameNode): Node\Stmt\Property
+    private function createDefaultNameProperty(Node $commandNameNode): Property
     {
         return $this->builderFactory->property('defaultName')
             ->makeProtected()

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

@@ -3,7 +3,9 @@
 namespace Rector\Symfony\Rector\MethodCall;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node\Expr\MethodCall;
+use PHPStan\Type\ObjectType;
 use Rector\Rector\AbstractRector;
 use Rector\RectorDefinition\CodeSample;
 use Rector\RectorDefinition\RectorDefinition;
@@ -33,9 +35,9 @@ public function getDefinition(): RectorDefinition
 
 class SomeClass
 {
-    public function run(EventDispatcherInterface $eventDisptacher)
+    public function run(EventDispatcherInterface $eventDispatcher)
     {
-        $eventDisptacher->dispatch('event_name', new Event());
+        $eventDispatcher->dispatch('event_name', new Event());
     }
 }
 CODE_SAMPLE
@@ -45,9 +47,9 @@ public function run(EventDispatcherInterface $eventDisptacher)
 
 class SomeClass
 {
-    public function run(EventDispatcherInterface $eventDisptacher)
+    public function run(EventDispatcherInterface $eventDispatcher)
     {
-        $eventDisptacher->dispatch(new Event(), 'event_name');
+        $eventDispatcher->dispatch(new Event(), 'event_name');
     }
 }
 CODE_SAMPLE
@@ -87,6 +89,30 @@ public function refactor(Node $node): ?Node
         // swap arguments
         [$node->args[0], $node->args[1]] = [$node->args[1], $node->args[0]];
 
+        if ($this->isEventNameSameAsEventObjectClass($node)) {
+            unset($node->args[1]);
+        }
+
         return $node;
     }
+
+    /**
+     * Is the event name just `::class`?
+     * We can remove it
+     */
+    private function isEventNameSameAsEventObjectClass(MethodCall $methodCall): bool
+    {
+        if (! $methodCall->args[1]->value instanceof ClassConstFetch) {
+            return false;
+        }
+
+        $classConst = $this->getValue($methodCall->args[1]->value);
+        $eventStaticType = $this->getStaticType($methodCall->args[0]->value);
+
+        if (! $eventStaticType instanceof ObjectType) {
+            return false;
+        }
+
+        return $classConst === $eventStaticType->getClassName();
+    }
 }

packages/Symfony/tests/Rector/MethodCall/MakeDispatchFirstArgumentEventRector/Fixture/event_class_constant.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 EventClassConstant
+{
+    public function run(EventDispatcher $eventDispatcher)
+    {
+        $customEvent = new CustomEvent();
+        $eventDispatcher->dispatch(CustomEvent::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 EventClassConstant
+{
+    public function run(EventDispatcher $eventDispatcher)
+    {
+        $customEvent = new CustomEvent();
+        $eventDispatcher->dispatch($customEvent);
+    }
+}
+
+?>

packages/Symfony/tests/Rector/MethodCall/MakeDispatchFirstArgumentEventRector/Fixture/keep_string_event_constant.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 KeepStringEventConstant
+{
+    public function run(EventDispatcher $eventDispatcher)
+    {
+        $customEvent = new CustomEvent();
+        $eventDispatcher->dispatch(CustomEvent::NAME, $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 KeepStringEventConstant
+{
+    public function run(EventDispatcher $eventDispatcher)
+    {
+        $customEvent = new CustomEvent();
+        $eventDispatcher->dispatch($customEvent, CustomEvent::NAME);
+    }
+}
+
+?>

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

@@ -9,7 +9,11 @@ final class MakeDispatchFirstArgumentEventRectorTest extends AbstractRectorTestC
 {
     public function test(): void
     {
-        $this->doTestFiles([__DIR__ . '/Fixture/fixture.php.inc']);
+        $this->doTestFiles([
+            __DIR__ . '/Fixture/fixture.php.inc',
+            __DIR__ . '/Fixture/event_class_constant.php.inc',
+            __DIR__ . '/Fixture/keep_string_event_constant.php.inc',
+        ]);
     }
 
     protected function getRectorClass(): string

packages/Symfony/tests/Rector/MethodCall/MakeDispatchFirstArgumentEventRector/Source/CustomEvent.php

@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);
+
+namespace Rector\Symfony\Tests\Rector\MethodCall\MakeDispatchFirstArgumentEventRector\Source;
+
+use Symfony\Contracts\EventDispatcher\Event;
+
+final class CustomEvent extends Event
+{
+    public const NAME = 'custom_event';
+}

src/Rector/AbstractRector.php

@@ -82,7 +82,7 @@ final public function enterNode(Node $node)
             return null;
         }
 
-        $originalNode = clone $node;
+        $originalNode = $node->getAttribute(AttributeKey::ORIGINAL_NODE) ?? clone $node;
         $originalComment = $node->getComments();
         $originalDocComment = $node->getDocComment();
         $node = $this->refactor($node);
@@ -102,6 +102,7 @@ final public function enterNode(Node $node)
             $this->notifyNodeChangeFileInfo($node);
         }
 
+        // if stmt ("$value;") was replaced by expr ("$value"), add the ending ";" (Expression) to prevent breaking code
         if ($originalNode instanceof Stmt && $node instanceof Expr) {
             return new Expression($node);
         }