Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use @psalm-template annotation to avoid clashes #186

Merged
merged 1 commit into from
Mar 25, 2019
Merged

Use @psalm-template annotation to avoid clashes #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/Doctrine/Common/Collections/AbstractLazyCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
/**
* Lazy collection that is backed by a concrete collection
*
* @template TKey of array-key
* @template T
* @psalm-template TKey of array-key
* @psalm-template T
* @template-implements Collection<TKey,T>
*/
abstract class AbstractLazyCollection implements Collection
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/Common/Collections/ArrayCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
* serialize a collection use {@link toArray()} and reconstruct the collection
* manually.
*
* @template TKey of array-key
* @template T
* @psalm-template TKey of array-key
* @psalm-template T
* @template-implements Collection<TKey,T>
* @template-implements Selectable<TKey,T>
*/
Expand Down
6 changes: 3 additions & 3 deletions lib/Doctrine/Common/Collections/Collection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
* position unless you explicitly positioned it before. Prefer iteration with
* external iterators.
*
* @template TKey of array-key
* @template T
* @psalm-template TKey of array-key
* @psalm-template T
* @template-extends IteratorAggregate<TKey, T>
* @template-extends ArrayAccess<TKey|null, T>
*/
Expand Down Expand Up @@ -243,7 +243,7 @@ public function forAll(Closure $p);
*
* @return Collection
*
* @template U
* @psalm-template U
* @psalm-param Closure(T=):U $func
* @psalm-return Collection<TKey, U>
*/
Expand Down
4 changes: 2 additions & 2 deletions lib/Doctrine/Common/Collections/Selectable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* this API can implement efficient database access without having to ask the
* EntityManager or Repositories.
*
* @template TKey as array-key
* @template T
* @psalm-template TKey as array-key
* @psalm-template T
*/
interface Selectable
{
Expand Down