skip it

Author: TomasVotruba

rules-tests/TypedCollections/Rector/NullsafeMethodCall/RemoveNullsafeOnCollectionRector/Fixture/include_mix_of_docblock.php.inc

@@ -0,0 +1,41 @@
+<?php
+
+namespace Rector\Doctrine\Tests\TypedCollections\Rector\NullsafeMethodCall\RemoveNullsafeOnCollectionRector\Fixture;
+
+use Doctrine\Common\Collections\Collection;
+
+final class IncludeMixOfDocblock
+{
+    /**
+     * @var Collection<string>|null
+     */
+    public Collection $items;
+
+    public function someMethod()
+    {
+        $values = $this->items?->count();
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Doctrine\Tests\TypedCollections\Rector\NullsafeMethodCall\RemoveNullsafeOnCollectionRector\Fixture;
+
+use Doctrine\Common\Collections\Collection;
+
+final class IncludeMixOfDocblock
+{
+    /**
+     * @var Collection<string>|null
+     */
+    public Collection $items;
+
+    public function someMethod()
+    {
+        $values = $this->items->count();
+    }
+}
+
+?>

rules/TypedCollections/TypeAnalyzer/CollectionTypeDetector.php

@@ -23,13 +23,13 @@ public function __construct(
     public function isCollectionNonNullableType(Expr $expr): bool
     {
         $exprType = $this->nodeTypeResolver->getType($expr);
+
         return $this->isCollectionObjectType($exprType);
     }
 
     public function isCollectionType(Expr $expr): bool
     {
         $exprType = $this->nodeTypeResolver->getType($expr);
-
         if ($exprType instanceof IntersectionType) {
             foreach ($exprType->getTypes() as $intersectionedType) {
                 if ($this->isCollectionObjectType($intersectionedType)) {
@@ -48,6 +48,14 @@ public function isCollectionType(Expr $expr): bool
 
     private function isCollectionObjectType(Type $exprType): bool
     {
+        if ($exprType instanceof IntersectionType) {
+            foreach ($exprType->getTypes() as $intersectionedType) {
+                if ($this->isCollectionObjectType($intersectionedType)) {
+                    return true;
+                }
+            }
+        }
+
         if (! $exprType instanceof ObjectType) {
             return false;
         }

stubs/Common/Collections/Collection.php

@@ -8,6 +8,28 @@
     return;
 }
 
-interface Collection
+/**
+ * The missing (SPL) Collection/Array/OrderedMap interface.
+ *
+ * A Collection resembles the nature of a regular PHP array. That is,
+ * it is essentially an <b>ordered map</b> that can also be used
+ * like a list.
+ *
+ * A Collection has an internal iterator just like a PHP array. In addition,
+ * a Collection can be iterated with external iterators, which is preferable.
+ * To use an external iterator simply use the foreach language construct to
+ * iterate over the collection (which calls {@link getIterator()} internally) or
+ * explicitly retrieve an iterator though {@link getIterator()} which can then be
+ * used to iterate over the collection.
+ * You can not rely on the internal iterator of the collection being at a certain
+ * position unless you explicitly positioned it before. Prefer iteration with
+ * external iterators.
+ *
+ * @psalm-template TKey of array-key
+ * @psalm-template T
+ * @template-extends ReadableCollection<TKey, T>
+ * @template-extends ArrayAccess<TKey, T>
+ */
+interface Collection extends ReadableCollection, \ArrayAccess
 {
 }