Skip date time on naming, as custom standard (#3278)

rectorphp · Jan 13, 2023 · bea3bc6 · bea3bc6
1 parent 9a2bcbf
commit bea3bc6
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 15 deletions.
diff --git a/rules/Naming/ExpectedNameResolver/MatchParamTypeExpectedNameResolver.php b/rules/Naming/ExpectedNameResolver/MatchParamTypeExpectedNameResolver.php
@@ -8,15 +8,13 @@
 use PHPStan\Type\ObjectType;
 use Rector\Naming\Naming\PropertyNaming;
 use Rector\Naming\ValueObject\ExpectedName;
-use Rector\NodeNameResolver\NodeNameResolver;
 use Rector\StaticTypeMapper\StaticTypeMapper;
 
 final class MatchParamTypeExpectedNameResolver
 {
     public function __construct(
         private readonly StaticTypeMapper $staticTypeMapper,
         private readonly PropertyNaming $propertyNaming,
-        private readonly NodeNameResolver $nodeNameResolver,
     ) {
     }
 
@@ -31,9 +29,7 @@ public function resolve(Param $param): ?string
 
         // skip date time + date time interface, as should be kept
         if ($staticType instanceof ObjectType && $staticType->isInstanceOf('DateTimeInterface')->yes()) {
-            if ($this->nodeNameResolver->isName($param, '*At')) {
-                return null;
-            }
+            return null;
         }
 
         $expectedName = $this->propertyNaming->getExpectedNameFromType($staticType);

diff --git a/tests/Issues/IssueConstructorPromotionRename/Fixture/fixture.php.inc b/tests/Issues/IssueConstructorPromotionRename/Fixture/fixture.php.inc
@@ -4,14 +4,17 @@ declare(strict_types=1);
 
 namespace Rector\Core\Tests\Issues\IssueConstructorPromotionRename\Fixture;
 
+use Rector\Core\Tests\Issues\IssueConstructorPromotionRename\Source\PromotedPropertyObject;
+
 final class Fixture
 {
     private $a;
-    public function __construct(\DateTimeInterface $a)
+
+    public function __construct(PromotedPropertyObject $a)
     {
         $this->a = $a;
         dump($a);
-        dump($a->format('Y-m-d'));
+        dump($a->someCall('Y-m-d'));
     }
 }
 
@@ -23,12 +26,14 @@ declare(strict_types=1);
 
 namespace Rector\Core\Tests\Issues\IssueConstructorPromotionRename\Fixture;
 
+use Rector\Core\Tests\Issues\IssueConstructorPromotionRename\Source\PromotedPropertyObject;
+
 final class Fixture
 {
-    public function __construct(private \DateTimeInterface $dateTime)
+    public function __construct(private PromotedPropertyObject $promotedPropertyObject)
     {
-        dump($dateTime);
-        dump($dateTime->format('Y-m-d'));
+        dump($promotedPropertyObject);
+        dump($promotedPropertyObject->someCall('Y-m-d'));
     }
 }
 

diff --git a/tests/Issues/IssueConstructorPromotionRename/Source/PromotedPropertyObject.php b/tests/Issues/IssueConstructorPromotionRename/Source/PromotedPropertyObject.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues\IssueConstructorPromotionRename\Source;
+
+final class PromotedPropertyObject
+{
+
+}
diff --git a/tests/Issues/IssueCreatePublicPropertyOnRename/Fixture/fixture.php.inc b/tests/Issues/IssueCreatePublicPropertyOnRename/Fixture/fixture.php.inc
@@ -4,9 +4,11 @@ declare(strict_types=1);
 
 namespace Rector\Core\Tests\Issues\IssueCreatePublicPropertyOnRename\Fixture;
 
-final class DemoFile
+use Rector\Core\Tests\Issues\IssueCreatePublicPropertyOnRename\Source\SomePropertyObject;
+
+final class Fixture
 {
-    public function __construct(private \DateTimeImmutable $date)
+    public function __construct(private SomePropertyObject $date)
     {
     }
 
@@ -23,15 +25,17 @@ declare(strict_types=1);
 
 namespace Rector\Core\Tests\Issues\IssueCreatePublicPropertyOnRename\Fixture;
 
-final class DemoFile
+use Rector\Core\Tests\Issues\IssueCreatePublicPropertyOnRename\Source\SomePropertyObject;
+
+final class Fixture
 {
-    public function __construct(private \DateTimeImmutable $dateTimeImmutable)
+    public function __construct(private SomePropertyObject $somePropertyObject)
     {
     }
 
     public function run(): string
     {
-        return $this->dateTimeImmutable->format('l, F j, Y');
+        return $this->somePropertyObject->format('l, F j, Y');
     }
 }
 ?>
diff --git a/tests/Issues/IssueCreatePublicPropertyOnRename/Source/SomePropertyObject.php b/tests/Issues/IssueCreatePublicPropertyOnRename/Source/SomePropertyObject.php
@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Core\Tests\Issues\IssueCreatePublicPropertyOnRename\Source;
+
+final class SomePropertyObject
+{
+
+}