Fix RenamePropertyToMatchTypeRector to skip Laravel collections and a…

…void accident rename (#4811)

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

@@ -0,0 +1,20 @@
+<?php
+
+namespace Rector\Tests\Naming\Rector\Class_\RenamePropertyToMatchTypeRector\Fixture;
+
+use Illuminate\Support\Collection;
+
+final class SkipCollectionOfType
+{
+    private Collection $items;
+
+    public function __construct(Collection $items)
+    {
+        $this->items = $items;
+    }
+
+    public function getItems(): Collection
+    {
+        return $this->items;
+    }
+}

rules/Naming/Naming/PropertyNaming.php

@@ -74,9 +74,15 @@ public function getExpectedNameFromMethodName(string $methodName): ?ExpectedName
 
     public function getExpectedNameFromType(Type $type): ?ExpectedName
     {
-        // keep doctrine collections untouched
-        if ($type instanceof ObjectType && $type->isInstanceOf('Doctrine\Common\Collections\Collection')->yes()) {
-            return null;
+        // keep collections untouched
+        if ($type instanceof ObjectType) {
+            if ($type->isInstanceOf('Doctrine\Common\Collections\Collection')->yes()) {
+                return null;
+            }
+
+            if ($type->isInstanceOf('Illuminate\Support\Collection')->yes()) {
+                return null;
+            }
         }
 
         $className = $this->resolveClassNameFromType($type);

rules/TypeDeclaration/Rector/ClassMethod/AddReturnTypeDeclarationBasedOnParentClassMethodRector.php

@@ -10,7 +10,6 @@
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
 use PHPStan\Reflection\ParametersAcceptorWithPhpDocs;
-use PHPStan\Reflection\Php\PhpMethodReflection;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
@@ -135,11 +134,9 @@ private function getReturnTypeRecursive(ClassMethod $classMethod): ?Type
                 return null;
             }
 
-            $parameterAcceptor = ParametersAcceptorSelector::selectSingle(
-                $parentMethodReflection->getVariants()
-            );
+            $parameterAcceptor = ParametersAcceptorSelector::selectSingle($parentMethodReflection->getVariants());
 
-            if (!$parameterAcceptor instanceof ParametersAcceptorWithPhpDocs) {
+            if (! $parameterAcceptor instanceof ParametersAcceptorWithPhpDocs) {
                 return null;
             }
 

stubs/Illuminate/Support/Collection.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Illuminate\Support;
+
+use Traversable;
+
+if (class_exists('Illuminate\Support\Collection')) {
+    return;
+}
+
+class Collection implements \ArrayAccess, \IteratorAggregate
+{
+    public function offsetGet(mixed $offset): mixed
+    {
+        // TODO: Implement offsetGet() method.
+    }
+
+    public function getIterator(): Traversable
+    {
+        // TODO: Implement getIterator() method.
+    }
+
+    public function offsetExists(mixed $offset): bool
+    {
+        // TODO: Implement offsetExists() method.
+    }
+
+    public function offsetSet(mixed $offset, mixed $value): void
+    {
+        // TODO: Implement offsetSet() method.
+    }
+
+    public function offsetUnset(mixed $offset): void
+    {
+        // TODO: Implement offsetUnset() method.
+    }
+}