From 51486d72b3bfae2a472e66c568906d951bae0920 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Wed, 18 Oct 2023 09:56:20 +0200
Subject: [PATCH] [Naming] Skip DateTime from renaming, to keep convention of
 named dates

---
 .../Fixture/keep_date.php.inc                       | 12 ++++++++++++
 ...RemoveUnusedNonEmptyArrayBeforeForeachRector.php |  2 +-
 .../MatchParamTypeExpectedNameResolver.php          | 13 ++++++++++++-
 src/PhpParser/Node/BetterNodeFinder.php             |  2 +-
 .../config/match_to_switch_reflection.php           |  6 +++---
 5 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 rules-tests/Naming/Rector/ClassMethod/RenameParamToMatchTypeRector/Fixture/keep_date.php.inc

diff --git a/rules-tests/Naming/Rector/ClassMethod/RenameParamToMatchTypeRector/Fixture/keep_date.php.inc b/rules-tests/Naming/Rector/ClassMethod/RenameParamToMatchTypeRector/Fixture/keep_date.php.inc
new file mode 100644
index 00000000000..61b978c8032
--- /dev/null
+++ b/rules-tests/Naming/Rector/ClassMethod/RenameParamToMatchTypeRector/Fixture/keep_date.php.inc
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Naming\Rector\ClassMethod\RenameParamToMatchTypeRector\Fixture;
+
+final class KeepDate
+{
+    private function getItemByRefOrNull(?\DateTime $startDate)
+    {
+    }
+}
diff --git a/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php b/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php
index 476a2f32e1a..860466f09e7 100644
--- a/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php
+++ b/rules/DeadCode/Rector/If_/RemoveUnusedNonEmptyArrayBeforeForeachRector.php
@@ -4,9 +4,9 @@
 
 namespace Rector\DeadCode\Rector\If_;
 
-use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\ArrayDimFetch;
 use PhpParser\Node\Expr\BinaryOp\BooleanAnd;
 use PhpParser\Node\Expr\Variable;
 use PhpParser\Node\Stmt;
diff --git a/rules/Naming/ExpectedNameResolver/MatchParamTypeExpectedNameResolver.php b/rules/Naming/ExpectedNameResolver/MatchParamTypeExpectedNameResolver.php
index 0b3120b482b..9addf9ea9f8 100644
--- a/rules/Naming/ExpectedNameResolver/MatchParamTypeExpectedNameResolver.php
+++ b/rules/Naming/ExpectedNameResolver/MatchParamTypeExpectedNameResolver.php
@@ -6,6 +6,7 @@
 
 use PhpParser\Node\Param;
 use PHPStan\Type\ObjectType;
+use PHPStan\Type\Type;
 use Rector\Naming\Naming\PropertyNaming;
 use Rector\Naming\ValueObject\ExpectedName;
 use Rector\StaticTypeMapper\StaticTypeMapper;
@@ -29,7 +30,7 @@ public function resolve(Param $param): ?string
 
         // include nullable too
         // skip date time + date time interface, as should be kept
-        if ($staticType->isSuperTypeOf(new ObjectType('DateTimeInterface'))->yes()) {
+        if ($this->isDateTimeType($staticType)) {
             return null;
         }
 
@@ -40,4 +41,14 @@ public function resolve(Param $param): ?string
 
         return $expectedName->getName();
     }
+
+    private function isDateTimeType(Type $type): bool
+    {
+        if ($type->isSuperTypeOf(new ObjectType('DateTimeInterface'))->yes()) {
+            return true;
+        }
+
+        return $type->isSuperTypeOf(new ObjectType('DateTime'))
+            ->yes();
+    }
 }
diff --git a/src/PhpParser/Node/BetterNodeFinder.php b/src/PhpParser/Node/BetterNodeFinder.php
index 9fcc35ebe0b..8877d2711e0 100644
--- a/src/PhpParser/Node/BetterNodeFinder.php
+++ b/src/PhpParser/Node/BetterNodeFinder.php
@@ -192,7 +192,7 @@ static function (Node $subNode) use ($types, &$isFoundNode): ?int {
      * @return T[]
      */
     public function findInstancesOfInFunctionLikeScoped(
-        ClassMethod | Function_ | Closure  $functionLike,
+        ClassMethod | Function_ | Closure $functionLike,
         string|array $types
     ): array {
         if (is_string($types)) {
diff --git a/tests/Issues/ScopeNotAvailable/config/match_to_switch_reflection.php b/tests/Issues/ScopeNotAvailable/config/match_to_switch_reflection.php
index a5bbf73d86f..708acad8172 100644
--- a/tests/Issues/ScopeNotAvailable/config/match_to_switch_reflection.php
+++ b/tests/Issues/ScopeNotAvailable/config/match_to_switch_reflection.php
@@ -3,12 +3,12 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
-use Rector\DowngradePhp81\Rector\StmtsAwareInterface\DowngradeSetAccessibleReflectionPropertyRector;
 use Rector\DowngradePhp80\Rector\Expression\DowngradeMatchToSwitchRector;
+use Rector\DowngradePhp81\Rector\StmtsAwareInterface\DowngradeSetAccessibleReflectionPropertyRector;
 
 return static function (RectorConfig $rectorConfig): void {
     $rectorConfig->rules([
-       DowngradeSetAccessibleReflectionPropertyRector::class,
-       DowngradeMatchToSwitchRector::class,
+        DowngradeSetAccessibleReflectionPropertyRector::class,
+        DowngradeMatchToSwitchRector::class,
     ]);
 };