diff options
| author | David Soria Parra <dsp@php.net> | 2013-09-18 15:06:51 +0200 |
|---|---|---|
| committer | David Soria Parra <dsp@php.net> | 2013-09-18 15:06:51 +0200 |
| commit | 94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf (patch) | |
| tree | 346f8b0ce00a53ab2f52c132d2e081f38efa6a56 /ext/spl/internal/emptyiterator.inc | |
| parent | 2eb566188625162644a186bcb6757f22978c54f9 (diff) | |
| parent | 7a24ee13ec74bf3e85970e59dd69db8034ff434c (diff) | |
| download | php-git-94e4c4df86719dbdf265b9d7ccfd1db8cfd32fdf.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Revert "EmptyIterator now implements Countable; fixes bug 60577"
Diffstat (limited to 'ext/spl/internal/emptyiterator.inc')
| -rw-r--r-- | ext/spl/internal/emptyiterator.inc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/ext/spl/internal/emptyiterator.inc b/ext/spl/internal/emptyiterator.inc index d02b15b999..ac80e79581 100644 --- a/ext/spl/internal/emptyiterator.inc +++ b/ext/spl/internal/emptyiterator.inc @@ -15,7 +15,7 @@ * @version 1.0 * @since PHP 5.1 */ -class EmptyIterator implements Iterator, Countable +class EmptyIterator implements Iterator { /** No operation. * @return void @@ -57,15 +57,6 @@ class EmptyIterator implements Iterator, Countable { // nothing to do } - - /** - * @return int - */ - function count() - { - return 0; - } - } -?> +?>
\ No newline at end of file |