[Carbon] Add immutable support to other rules (#5896)

rules-tests/Carbon/Rector/MethodCall/DateTimeMethodCallToCarbonRector/Fixture/immutable.php.inc

@@ -0,0 +1,27 @@
+<?php
+
+namespace Rector\Tests\Carbon\Rector\MethodCall\DateTimeMethodCallToCarbonRector\Fixture;
+
+final class Immutable
+{
+    public function run()
+    {
+        $date = (new \DateTimeImmutable('today +20 day'))->format('Y-m-d');
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Carbon\Rector\MethodCall\DateTimeMethodCallToCarbonRector\Fixture;
+
+final class Immutable
+{
+    public function run()
+    {
+        $date = (\Carbon\CarbonImmutable::today()->addDays(20))->format('Y-m-d');
+    }
+}
+
+?>

rules/Carbon/Rector/MethodCall/DateTimeMethodCallToCarbonRector.php

@@ -75,7 +75,7 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        if (! $this->isName($new->class, 'DateTime')) {
+        if (! $this->isName($new->class, 'DateTime') && ! $this->isName($new->class, 'DateTimeImmutable')) {
             return null;
         }
 
@@ -93,7 +93,11 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $carbonFullyQualified = new FullyQualified('Carbon\Carbon');
+        if ($this->isName($new->class, 'DateTime')) {
+            $carbonFullyQualified = new FullyQualified('Carbon\Carbon');
+        } else {
+            $carbonFullyQualified = new FullyQualified('Carbon\CarbonImmutable');
+        }
 
         $carbonCall = $this->carbonCallFactory->createFromDateTimeString($carbonFullyQualified, $firstArg->value);
 

rules/Carbon/Rector/New_/DateTimeInstanceToCarbonRector.php

@@ -4,8 +4,8 @@
 
 namespace Rector\Carbon\Rector\New_;
 
-use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node;
+use PhpParser\Node\Expr\MethodCall;
 use PhpParser\Node\Expr\New_;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Identifier;
@@ -57,6 +57,10 @@ public function getNodeTypes(): array
      */
     public function refactor(Node $node): ?Node
     {
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if ($this->isName($node->class, 'DateTime')) {
             return $this->refactorWithClass($node, 'Carbon\\Carbon');
         }
@@ -70,10 +74,6 @@ public function refactor(Node $node): ?Node
 
     public function refactorWithClass(New_ $new, string $className): MethodCall|StaticCall|null
     {
-        if ($new->isFirstClassCallable()) {
-            return null;
-        }
-
         // no arg? ::now()
         $carbonFullyQualified = new FullyQualified($className);