[Naming] Fix generics RenamePropertyToMatchTypeRector (#626)

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

@@ -0,0 +1,21 @@
+<?php
+
+namespace Rector\Tests\Naming\Rector\Class_\RenamePropertyToMatchTypeRector\Fixture;
+
+use Rector\Tests\Naming\Rector\Class_\RenamePropertyToMatchTypeRector\Source\Doctrine\ObjectRepository;
+use Rector\Tests\Naming\Rector\Class_\RenamePropertyToMatchTypeRector\Source\Entity\SomeEntity;
+
+final class SkipRepositoryGeneric
+{
+    /**
+     * @var ObjectRepository<SomeEntity>
+     */
+     private $timestampableRepository;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->timestampableRepository = $this->entityManager->getRepository(SomeEntity::class);
+    }
+}

rules-tests/Naming/Rector/Class_/RenamePropertyToMatchTypeRector/Source/Doctrine/ObjectRepository.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Naming\Rector\Class_\RenamePropertyToMatchTypeRector\Source\Doctrine;
+
+/**
+ * @template T
+ */
+interface ObjectRepository
+{
+}

rules-tests/Naming/Rector/Class_/RenamePropertyToMatchTypeRector/Source/Entity/SomeEntity.php

@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Naming\Rector\Class_\RenamePropertyToMatchTypeRector\Source\Entity;
+
+final class SomeEntity
+{
+}

rules/Naming/Naming/PropertyNaming.php

@@ -6,6 +6,7 @@
 
 use Nette\Utils\Strings;
 use PHPStan\Reflection\ReflectionProvider;
+use PHPStan\Type\Generic\GenericObjectType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\StaticType;
 use PHPStan\Type\Type;
@@ -83,6 +84,11 @@ public function getExpectedNameFromType(Type $type): ?ExpectedName
 
         $className = $this->nodeTypeResolver->getFullyQualifiedClassName($type);
 
+        // generic types are usually mix of parent type and specific type - various way to handle it
+        if ($type instanceof GenericObjectType) {
+            return null;
+        }
+
         foreach (self::EXCLUDED_CLASSES as $excludedClass) {
             if (Strings::match($className, $excludedClass)) {
                 return null;

rules/Naming/Rector/Class_/RenamePropertyToMatchTypeRector.php

@@ -5,7 +5,6 @@
 namespace Rector\Naming\Rector\Class_;
 
 use PhpParser\Node;
-use PhpParser\Node\Param;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\Interface_;