fixed ValueIterator to compile on php 5.3 and php 5.4, fixed post increment operator for ValueIterator

2 files changed, 64 insertions, 3 deletions

diff --git a/include/valueiterator.h b/include/valueiterator.h
index 11c412e..037f061 100644
--- a/include/valueiterator.h
+++ b/include/valueiterator.h
@@ -36,21 +36,59 @@ public:
     ValueIterator(struct _hashtable *hashtable, bool first);
     
     /**
+     *  Copy constructor
+     *  @param  that
+     */
+    ValueIterator(const ValueIterator &that);
+    
+    /**
      *  Destructor
      */
     virtual ~ValueIterator() {}
 
     /**
-     *  Increment position
+     *  Increment position (pre-increment)
      *  @return ValueIterator
      */
     ValueIterator &operator++();
     
     /**
-     *  Decrement position
+     *  Increment position (post-increment)
+     *  @return ValueIterator
+     */
+    ValueIterator operator++(int)
+    {
+        // make a copy
+        ValueIterator copy(*this);
+        
+        // increment current object
+        ++(*this);
+        
+        // and return the unchanged original
+        return copy;
+    }
+    
+    /**
+     *  Decrement position (pre-decrement)
      *  @return ValueIterator
      */
     ValueIterator &operator--();
+
+    /**
+     *  Increment position (post-decrement)
+     *  @return ValueIterator
+     */
+    ValueIterator operator--(int)
+    {
+        // make a copy
+        ValueIterator copy(*this);
+        
+        // decrement current object
+        --(*this);
+        
+        // and return the unchanged original
+        return copy;
+    }
     
     /**
      *  Compare with other iterator
diff --git a/src/valueiterator.cpp b/src/valueiterator.cpp
index a40ff81..08520d5 100644
--- a/src/valueiterator.cpp
+++ b/src/valueiterator.cpp
@@ -91,13 +91,36 @@ ValueIterator &ValueIterator::read()
 {
     // zval to read the current key in
     Value key;
-    
+
+#if PHP_VERSION_ID >= 50500
+
     // read in the current key
     zend_hash_get_current_key_zval_ex(_table, key._val, &_position);
     
     // if the key is set to NULL, it means that the object is not at a valid position
     if (key.isNull()) return invalidate();
     
+#else
+
+    // php 5.3 and php 5.4 need a different implementation because the function
+    // zend_hash_get_current_key_zval_ex is missing in php 5.3, declare variables
+    // we need for storing the key in
+    char *string_key;
+    unsigned int str_len;
+    unsigned long num_key;
+    
+    // get the current key
+    int type = zend_hash_get_current_key_ex(_table, &string_key, &str_len, &num_key, 0, &_position);
+    
+    // if key is not found, the iterator is at an invalid position
+    if (type == HASH_KEY_NON_EXISTANT) return invalidate();
+
+    // numeric keys are the easiest ones
+    if (type == HASH_KEY_NON_EXISTANT) key = (int64_t)num_key;
+    else key = string_key;
+
+#endif
+
     // iterator is at a valid position, go fetch the data
     // this is the variable we need for fetching the data
     zval **value;