2 commits - plugins/libkolab

[Thomas Brüderli]

 plugins/libkolab/lib/kolab_storage_dataset.php |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 449b4d044a7c798fcd902f59bb398e40d15b7729
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Fri Feb 7 09:30:08 2014 +0100

    Init iterator key with 0

diff --git a/plugins/libkolab/lib/kolab_storage_dataset.php b/plugins/libkolab/lib/kolab_storage_dataset.php
index d23ba69..23dfb86 100644
--- a/plugins/libkolab/lib/kolab_storage_dataset.php
+++ b/plugins/libkolab/lib/kolab_storage_dataset.php
@@ -31,7 +31,7 @@ class kolab_storage_dataset implements Iterator, ArrayAccess, Countable
     private $buffer = false;
     private $index = array();
     private $data = array();
-    private $iteratorkey = -1;
+    private $iteratorkey = 0;
 
     /**
      * Default constructor


commit 1daa305faa06c8f9cd930a2793a08c35284d4c3d
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Fri Feb 7 09:29:11 2014 +0100

    Also implement the Countable interface for full array-like compatibility

diff --git a/plugins/libkolab/lib/kolab_storage_dataset.php b/plugins/libkolab/lib/kolab_storage_dataset.php
index 17e66de..d23ba69 100644
--- a/plugins/libkolab/lib/kolab_storage_dataset.php
+++ b/plugins/libkolab/lib/kolab_storage_dataset.php
@@ -24,7 +24,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-class kolab_storage_dataset implements Iterator, ArrayAccess
+class kolab_storage_dataset implements Iterator, ArrayAccess, Countable
 {
     private $cache;  // kolab_storage_cache instance to use for fetching data
     private $memlimit = 0;
@@ -50,6 +50,14 @@ class kolab_storage_dataset implements Iterator, ArrayAccess
     }
 
 
+    /*** Implement PHP Countable interface ***/
+
+    public function count()
+    {
+        return count($this->index);
+    }
+
+
     /*** Implement PHP ArrayAccess interface ***/
 
     public function offsetSet($offset, $value)