danog/psalm
1
0
Fork 0
mirror of https://github.com/danog/psalm.git synced 2024-11-27 12:55:26 +01:00
Code Issues Projects Releases Wiki Activity

Update CachingIterator, remove newly added @template.

Browse Source 
Also update `RecursiveCachingIterator`, remove extended methods and constructor that are the same.
This commit is contained in:
Pol Dellaiera 2022-07-21 08:16:10 +02:00
parent f4da6aafaa
commit 3e0f0b6173
No known key found for this signature in database
GPG Key ID: D476DFE9C67467CA
1 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
stubs/CoreGenericIterators.phpstub
View File

@ -342,7 +342,6 @@ abstract class FilterIterator extends IteratorIterator {
* @template-covariant TKey * @template-covariant TKey
* @template-covariant TValue * @template-covariant TValue
* @template-covariant TIterator as Iterator<TKey, TValue> * @template-covariant TIterator as Iterator<TKey, TValue>
* @template TFlags of int-mask<1,2,4,8,16,256>
* *
* @template-implements OuterIterator<TKey, TValue> * @template-implements OuterIterator<TKey, TValue>
* @template-implements ArrayAccess<TKey, TValue> * @template-implements ArrayAccess<TKey, TValue>
@ -359,7 +358,7 @@ class CachingIterator extends IteratorIterator implements OuterIterator , ArrayA
/** /**
* @param TIterator $iterator * @param TIterator $iterator
* @param TFlags $flags * @param int-mask<1,2,4,8,16,256> $flags
*/ */
public function __construct(Iterator $iterator, int $flags = self::CALL_TOSTRING) {} public function __construct(Iterator $iterator, int $flags = self::CALL_TOSTRING) {}
@ -379,8 +378,6 @@ class CachingIterator extends IteratorIterator implements OuterIterator , ArrayA
public function key() {} public function key() {}
/** /**
* @psalm-if-this-is self<mixed, mixed, 256>
*
* @return array<array-key, TValue> * @return array<array-key, TValue>
*/ */
public function getCache() {} public function getCache() {}
@ -807,19 +804,6 @@ class RecursiveArrayIterator extends ArrayIterator implements RecursiveIterator
* @template-extends CachingIterator<TKey, TValue, TIterator> * @template-extends CachingIterator<TKey, TValue, TIterator>
*/ */
class RecursiveCachingIterator extends CachingIterator implements RecursiveIterator { class RecursiveCachingIterator extends CachingIterator implements RecursiveIterator {
const CALL_TOSTRING = 1 ;
const CATCH_GET_CHILD = 16 ;
const TOSTRING_USE_KEY = 2 ;
const TOSTRING_USE_CURRENT = 4 ;
const TOSTRING_USE_INNER = 8 ;
const FULL_CACHE = 256 ;
/**
* @param TIterator $iterator
* @param int-mask-of<self::*> $flags
*/
public function __construct(Iterator $iterator, int $flags = 0) {}
/** /**
* @return RecursiveCachingIterator<TKey,TValue, TIterator> * @return RecursiveCachingIterator<TKey,TValue, TIterator>
*/ */
@ -829,18 +813,6 @@ class RecursiveCachingIterator extends CachingIterator implements RecursiveItera
* @return bool * @return bool
*/ */
public function hasChildren() {} public function hasChildren() {}
/**
* @return TValue|null current value or null when iterator is drained
* @psalm-ignore-nullable-return
*/
public function current() {}
/**
* @return TKey|null current key or null when iterator is drained
* @psalm-ignore-nullable-return
*/
public function key() {}
} }
/** /**