[Naming] Re-use repetitive DateTimeInterface object type check on services into PropertyNaming service (#6926)

* [Naming] Re-use repetitive DateTimeInterface object type check on services

* fix

* clean up

* [ci-review] Rector Rectify

* Fix test

---------

Co-authored-by: GitHub Action <actions@github.com>

Author: samsonasik

rules-tests/Naming/Rector/Class_/RenamePropertyToMatchTypeRector/Fixture/keep_date_time.php.inc

@@ -4,7 +4,7 @@ namespace Rector\Tests\Naming\Rector\Class_\RenamePropertyToMatchTypeRector\Fixt
 
 final class KeepDateTime
 {
-    private ?DateTime $timestamp = null;
+    private ?\DateTime $timestamp = null;
 
     public function setValue(
         \DateTime $timestamp,

rules/Naming/ExpectedNameResolver/MatchParamTypeExpectedNameResolver.php

@@ -6,18 +6,15 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Param;
-use PHPStan\Type\ObjectType;
 use Rector\Naming\Naming\PropertyNaming;
 use Rector\Naming\ValueObject\ExpectedName;
-use Rector\NodeTypeResolver\NodeTypeResolver;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 
 final readonly class MatchParamTypeExpectedNameResolver
 {
     public function __construct(
         private StaticTypeMapper $staticTypeMapper,
         private PropertyNaming $propertyNaming,
-        private NodeTypeResolver $nodeTypeResolver,
     ) {
     }
 
@@ -28,12 +25,6 @@ public function resolve(Param $param): ?string
             return null;
         }
 
-        // include nullable too
-        // skip date time + date time interface, as should be kept
-        if ($this->nodeTypeResolver->isObjectType($param->type, new ObjectType('DateTimeInterface'))) {
-            return null;
-        }
-
         $staticType = $this->staticTypeMapper->mapPhpParserNodePHPStanType($param->type);
         $expectedName = $this->propertyNaming->getExpectedNameFromType($staticType);
 

rules/Naming/Naming/ExpectedNameResolver.php

@@ -118,11 +118,8 @@ public function resolveForCall(MethodCall | StaticCall | FuncCall $expr): ?strin
             return null;
         }
 
-        if ($this->isDateTimeType($returnedType)) {
-            return null;
-        }
-
         $expectedName = $this->propertyNaming->getExpectedNameFromType($returnedType);
+
         if ($expectedName instanceof ExpectedName) {
             return $expectedName->getName();
         }
@@ -211,17 +208,4 @@ private function resolveReturnTypeFromArrayType(ArrayType $arrayType): ?Type
 
         return $arrayType->getIterableValueType();
     }
-
-    /**
-     * Skip date time, as custom naming
-     */
-    private function isDateTimeType(ObjectType $objectType): bool
-    {
-        if ($objectType->isInstanceOf('DateTimeInterface')->yes()) {
-            return true;
-        }
-
-        return $objectType->isInstanceOf('DateTime')
-            ->yes();
-    }
 }

rules/Naming/Naming/PropertyNaming.php

@@ -11,6 +11,7 @@
 use PHPStan\Type\ThisType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
+use Rector\Enum\ClassName;
 use Rector\Exception\ShouldNotHappenException;
 use Rector\Naming\RectorNamingInflector;
 use Rector\Naming\ValueObject\ExpectedName;
@@ -71,6 +72,8 @@ public function getExpectedNameFromMethodName(string $methodName): ?ExpectedName
 
     public function getExpectedNameFromType(Type $type): ?ExpectedName
     {
+        $type = TypeCombinator::removeNull($type);
+
         // keep collections untouched
         if ($type instanceof ObjectType) {
             if ($type->isInstanceOf('Doctrine\Common\Collections\Collection')->yes()) {
@@ -80,6 +83,10 @@ public function getExpectedNameFromType(Type $type): ?ExpectedName
             if ($type->isInstanceOf('Illuminate\Support\Collection')->yes()) {
                 return null;
             }
+
+            if ($type->isInstanceOf(ClassName::DATE_TIME_INTERFACE)->yes()) {
+                return null;
+            }
         }
 
         $className = $this->resolveClassNameFromType($type);
@@ -278,7 +285,6 @@ private function normalizeShortClassName(string $shortClassName): string
 
     private function resolveClassNameFromType(Type $type): ?string
     {
-        $type = TypeCombinator::removeNull($type);
         $className = ClassNameFromObjectTypeResolver::resolve($type);
 
         if ($className === null) {

rules/Naming/RenameGuard/PropertyRenameGuard.php

@@ -32,11 +32,6 @@ public function shouldSkip(PropertyRename $propertyRename): bool
             return true;
         }
 
-        // skip date times, as often custom named and using "dateTime" does not bring any value to code
-        if ($propertyRename->getExpectedName() === 'dateTime') {
-            return true;
-        }
-
         if ($this->dateTimeAtNamingConventionGuard->isConflicting($propertyRename)) {
             return true;
         }