cakephp · dereuromark · Sep 4, 2025 · Aug 9, 2025 · Aug 9, 2025 · Aug 9, 2025
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -6,6 +6,12 @@ parameters:
 			count: 1
 			path: src/Cache/Engine/MemcachedEngine.php
 
+		-
+			message: '#^Parameter \#1 \$value of function count expects array\|Countable, TValue\|false given\.$#'
+			identifier: argument.type
+			count: 1
+			path: src/Collection/Collection.php
+
 		-
 			message: '#^Unsafe usage of new static\(\)\.$#'
 			identifier: new.static
@@ -114,6 +120,126 @@ parameters:
 			count: 1
 			path: src/Datasource/QueryInterface.php
 
+		-
+			message: '#^Class Cake\\Collection\\Collection specifies template type TKey of interface Cake\\Collection\\CollectionInterface as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Class Cake\\Collection\\Collection specifies template type TKey of interface Iterator as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Class Cake\\Collection\\Collection specifies template type TKey of interface Traversable as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Class Cake\\Collection\\Collection specifies template type TValue of interface Cake\\Collection\\CollectionInterface as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Class Cake\\Collection\\Collection specifies template type TValue of interface Iterator as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Class Cake\\Collection\\Collection specifies template type TValue of interface Traversable as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Class IteratorIterator specifies template type TKey of interface Iterator as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 2
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Class IteratorIterator specifies template type TKey of interface Traversable as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 2
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Class IteratorIterator specifies template type TValue of interface Iterator as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 2
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Class IteratorIterator specifies template type TValue of interface Traversable as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 2
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Interface Cake\\Collection\\CollectionInterface specifies template type TKey of interface Iterator as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Interface Cake\\Collection\\CollectionInterface specifies template type TKey of interface Traversable as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Interface Cake\\Collection\\CollectionInterface specifies template type TValue of interface Iterator as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Interface Cake\\Collection\\CollectionInterface specifies template type TValue of interface Traversable as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Interface Iterator specifies template type TKey of interface Traversable as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 7
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Interface Iterator specifies template type TValue of interface Traversable as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 7
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Interface OuterIterator specifies template type TKey of interface Iterator as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 3
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Interface OuterIterator specifies template type TKey of interface Traversable as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 3
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Interface OuterIterator specifies template type TValue of interface Iterator as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 3
+			path: src/Datasource/ResultSetDecorator.php
+
+		-
+			message: '#^Interface OuterIterator specifies template type TValue of interface Traversable as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 3
+			path: src/Datasource/ResultSetDecorator.php
+
 		-
 			message: '#^Constructor of class Cake\\Error\\Renderer\\ConsoleExceptionRenderer has an unused parameter \$request\.$#'
 			identifier: constructor.unusedParameter
@@ -258,6 +384,126 @@ parameters:
 			count: 1
 			path: src/ORM/Query/SelectQuery.php
 
+		-
+			message: '#^Class Cake\\Collection\\Collection specifies template type TKey of interface Cake\\Collection\\CollectionInterface as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Class Cake\\Collection\\Collection specifies template type TKey of interface Iterator as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Class Cake\\Collection\\Collection specifies template type TKey of interface Traversable as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Class Cake\\Collection\\Collection specifies template type TValue of interface Cake\\Collection\\CollectionInterface as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Class Cake\\Collection\\Collection specifies template type TValue of interface Iterator as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Class Cake\\Collection\\Collection specifies template type TValue of interface Traversable as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Class IteratorIterator specifies template type TKey of interface Iterator as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 2
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Class IteratorIterator specifies template type TKey of interface Traversable as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 2
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Class IteratorIterator specifies template type TValue of interface Iterator as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 2
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Class IteratorIterator specifies template type TValue of interface Traversable as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 2
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Interface Cake\\Collection\\CollectionInterface specifies template type TKey of interface Iterator as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Interface Cake\\Collection\\CollectionInterface specifies template type TKey of interface Traversable as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Interface Cake\\Collection\\CollectionInterface specifies template type TValue of interface Iterator as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Interface Cake\\Collection\\CollectionInterface specifies template type TValue of interface Traversable as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 1
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Interface Iterator specifies template type TKey of interface Traversable as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 7
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Interface Iterator specifies template type TValue of interface Traversable as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 7
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Interface OuterIterator specifies template type TKey of interface Iterator as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 3
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Interface OuterIterator specifies template type TKey of interface Traversable as TKey but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 3
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Interface OuterIterator specifies template type TValue of interface Iterator as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 3
+			path: src/ORM/ResultSet.php
+
+		-
+			message: '#^Interface OuterIterator specifies template type TValue of interface Traversable as TValue but it''s already specified as mixed\.$#'
+			identifier: generics.interfaceConflict
+			count: 3
+			path: src/ORM/ResultSet.php
+
 		-
 			message: '#^Call to function method_exists\(\) with Cake\\Datasource\\EntityInterface and ''patch'' will always evaluate to true\.$#'
 			identifier: function.alreadyNarrowedType

diff --git a/src/Collection/Collection.php b/src/Collection/Collection.php
@@ -24,7 +24,10 @@
  * A collection is an immutable list of elements with a handful of functions to
  * iterate, group, transform and extract information from it.
  *
- * @template-extends \IteratorIterator<mixed, mixed, \Traversable<mixed>>
+ * @template TKey
+ * @template TValue
+ * @extends \IteratorIterator<TKey, TValue, \Traversable<TKey, TValue>>
+ * @implements \Cake\Collection\CollectionInterface<TKey, TValue>
  */
 class Collection extends IteratorIterator implements CollectionInterface
 {

diff --git a/src/Collection/CollectionInterface.php b/src/Collection/CollectionInterface.php
@@ -26,7 +26,9 @@
  * list of elements exposing a number of traversing and extracting method for
  * generating other collections.
  *
- * @template-extends \Iterator<mixed>
+ * @template TKey
+ * @template-covariant TValue
+ * @template-extends \Iterator<TKey, TValue>
  */
 interface CollectionInterface extends Iterator, JsonSerializable, Countable
 {
@@ -641,21 +643,21 @@ public function match(array $conditions): CollectionInterface;
      * a property path as accepted by `Collection::extract`, and the value the
      * condition against with each element will be matched
      * @see \Cake\Collection\CollectionInterface::match()
-     * @return mixed
+     * @return TValue|null
      */
     public function firstMatch(array $conditions): mixed;
 
     /**
      * Returns the first result in this collection
      *
-     * @return mixed The first value in the collection will be returned.
+     * @return TValue|null The first value in the collection will be returned.
      */
     public function first(): mixed;
 
     /**
      * Returns the last result in this collection
      *
-     * @return mixed The last value in the collection will be returned.
+     * @return TValue|null The last value in the collection will be returned.
      */
     public function last(): mixed;
 
@@ -802,15 +804,16 @@ public function insert(string $path, mixed $values): CollectionInterface;
      * collection as the array keys. Keep in mind that it is valid for iterators
      * to return the same key for different elements, setting this value to false
      * can help getting all items if keys are not important in the result.
-     * @return array
+     * @phpstan-return ($keepKeys is true ? array<TKey, TValue> : array<int, TValue>)
+     * @return array<TKey, TValue>|array<int, TValue>
      */
     public function toArray(bool $keepKeys = true): array;
 
     /**
      * Returns an numerically-indexed array representation of the results.
      * This is equivalent to calling `toArray(false)`
      *
-     * @return array
+     * @return array<int, TValue>
      */
     public function toList(): array;
 

diff --git a/src/Datasource/Paging/PaginatedInterface.php b/src/Datasource/Paging/PaginatedInterface.php
@@ -22,7 +22,9 @@
 /**
  * This interface describes the methods for pagination instance.
  *
- * @template-extends \Traversable<mixed>
+ * @template TKey
+ * @template-covariant TValue
+ * @template-extends \Traversable<TKey, TValue>
  * @method array<mixed> toArray() Get the paginated items as an array
  */
 interface PaginatedInterface extends Countable, Traversable
@@ -72,7 +74,7 @@ public function hasNextPage(): bool;
     /**
      * Get paginated items.
      *
-     * @return iterable
+     * @return iterable<TKey, TValue>
      */
     public function items(): iterable;