Skip DateTime from property type to property renaming to keep code readable (#6812)

Author: TomasVotruba

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

@@ -4,8 +4,11 @@ namespace Rector\Tests\Naming\Rector\Class_\RenamePropertyToMatchTypeRector\Fixt
 
 final class KeepDateTime
 {
-    public function __construct(
-        private \DateTimeInterface $cratedAt,
+    private ?DateTime $timestamp = null;
+
+    public function setValue(
+        \DateTime $timestamp,
     ) {
+        $this->timestamp = $timestamp;
     }
 }

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

@@ -0,0 +1,11 @@
+<?php
+
+namespace Rector\Tests\Naming\Rector\Class_\RenamePropertyToMatchTypeRector\Fixture;
+
+final class KeepDateTimeInterface
+{
+    public function __construct(
+        private \DateTimeInterface $cratedAt,
+    ) {
+    }
+}

rules/DeadCode/Rector/FuncCall/RemoveFilterVarOnExactTypeRector.php

@@ -85,7 +85,8 @@ public function refactor(Node $node): ?Node
         if (in_array(
             $constantFilterName,
             ['FILTER_VALIDATE_BOOLEAN', 'FILTER_VALIDATE_BOOL']
-        ) && $valueType->isBoolean()->yes()) {
+        ) && $valueType->isBoolean()
+            ->yes()) {
             return $firstArgValue;
         }
 

rules/Naming/Rector/Class_/RenamePropertyToMatchTypeRector.php

@@ -148,7 +148,6 @@ private function skipDateTimeOrMockObjectPropertyType(Property $property): bool
         if ($this->isName($property->type, ClassName::MOCK_OBJECT)) {
             return true;
         }
-
         return $this->isName($property->type, ClassName::DATE_TIME);
     }
 }

rules/Naming/RenameGuard/PropertyRenameGuard.php

@@ -32,6 +32,11 @@ 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;
         }

src/NodeTypeResolver/PHPStan/Scope/PHPStanNodeScopeResolver.php

@@ -4,7 +4,6 @@
 
 namespace Rector\NodeTypeResolver\PHPStan\Scope;
 
-use PHPStan\Analyser\UndefinedVariableException;
 use Error;
 use PhpParser\Node;
 use PhpParser\Node\Arg;
@@ -88,6 +87,7 @@
 use PHPStan\Analyser\MutatingScope;
 use PHPStan\Analyser\NodeScopeResolver;
 use PHPStan\Analyser\ScopeContext;
+use PHPStan\Analyser\UndefinedVariableException;
 use PHPStan\Node\FunctionCallableNode;
 use PHPStan\Node\InstantiationCallableNode;
 use PHPStan\Node\MethodCallableNode;