[Carbon] Skip first class callable on DateTimeMethodCallToCarbonRector (

#5893)
rectorphp · May 18, 2024 · b2ec1f0 · b2ec1f0
1 parent 6ebfa15
commit b2ec1f0
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 0 deletions.
diff --git a/...rbon/Rector/FuncCall/DateFuncCallToCarbonRector/Fixture/skip_first_class_callable.php.inc b/...rbon/Rector/FuncCall/DateFuncCallToCarbonRector/Fixture/skip_first_class_callable.php.inc
@@ -0,0 +1,11 @@
+<?php
+
+namespace Rector\Tests\Carbon\Rector\FuncCall\DateFuncCallToCarbonRector\Fixture;
+
+class SkipFirstClassCallable
+{
+    public function run()
+    {
+        $date = date(...);
+    }
+}
diff --git a/rules/Carbon/Rector/FuncCall/DateFuncCallToCarbonRector.php b/rules/Carbon/Rector/FuncCall/DateFuncCallToCarbonRector.php
@@ -65,6 +65,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         if (count($node->getArgs()) !== 1) {
             return null;
         }

diff --git a/rules/Carbon/Rector/MethodCall/DateTimeMethodCallToCarbonRector.php b/rules/Carbon/Rector/MethodCall/DateTimeMethodCallToCarbonRector.php
@@ -79,6 +79,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($new->isFirstClassCallable()) {
+            return null;
+        }
+
         if (count($new->getArgs()) !== 1) {
             // @todo handle in separate static call
             return null;

diff --git a/rules/Carbon/Rector/New_/DateTimeInstanceToCarbonRector.php b/rules/Carbon/Rector/New_/DateTimeInstanceToCarbonRector.php
@@ -60,6 +60,10 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
+        if ($node->isFirstClassCallable()) {
+            return null;
+        }
+
         // no arg? ::now()
         $carbonFullyQualified = new FullyQualified('Carbon\Carbon');
         if ($node->args === []) {