Merge pull request #486

Author: jmikola

php_phongo.c

@@ -1677,182 +1677,6 @@ void php_phongo_new_regex_from_regex_and_options(zval *object, const char *patte
 	intern->flags = estrndup(flags, intern->flags_len);
 } /* }}} */
 
-static void php_phongo_cursor_free_current(php_phongo_cursor_t *cursor) /* {{{ */
-{
-	if (!Z_ISUNDEF(cursor->visitor_data.zchild)) {
-		zval_ptr_dtor(&cursor->visitor_data.zchild);
-#if PHP_VERSION_ID >= 70000
-		ZVAL_UNDEF(&cursor->visitor_data.zchild);
-#else
-		cursor->visitor_data.zchild = NULL;
-#endif
-	}
-} /* }}} */
-
-void php_phongo_cursor_free(php_phongo_cursor_t *cursor) /* {{{ */
-{
-	if (cursor->cursor) {
-		mongoc_cursor_destroy(cursor->cursor);
-		cursor->cursor = NULL;
-	}
-
-	php_phongo_cursor_free_current(cursor);
-} /* }}} */
-
-/* {{{ Iterator */
-static void php_phongo_cursor_iterator_dtor(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
-{
-	php_phongo_cursor_iterator *cursor_it = (php_phongo_cursor_iterator *)iter;
-
-	if (!Z_ISUNDEF(cursor_it->intern.data)) {
-#if PHP_VERSION_ID >= 70000
-		zval_ptr_dtor(&cursor_it->intern.data);
-#else
-		zval_ptr_dtor((zval**)&cursor_it->intern.data);
-		cursor_it->intern.data = NULL;
-#endif
-	}
-
-#if PHP_VERSION_ID < 70000
-	efree(cursor_it);
-#endif
-} /* }}} */
-
-static int php_phongo_cursor_iterator_valid(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
-{
-	php_phongo_cursor_t *cursor = ((php_phongo_cursor_iterator *)iter)->cursor;
-
-	if (!Z_ISUNDEF(cursor->visitor_data.zchild)) {
-		return SUCCESS;
-	}
-
-	return FAILURE;
-} /* }}} */
-
-#if PHP_VERSION_ID < 50500
-static int php_phongo_cursor_iterator_get_current_key(zend_object_iterator *iter, char **str_key, uint *str_key_len, ulong *int_key TSRMLS_DC) /* {{{ */
-{
-	php_phongo_cursor_t *cursor = ((php_phongo_cursor_iterator *)iter)->cursor;
-
-	*int_key = (ulong) cursor->current;
-	return HASH_KEY_IS_LONG;
-} /* }}} */
-#else
-static void php_phongo_cursor_iterator_get_current_key(zend_object_iterator *iter, zval *key TSRMLS_DC) /* {{{ */
-{
-	php_phongo_cursor_t *cursor = ((php_phongo_cursor_iterator *)iter)->cursor;
-
-	ZVAL_LONG(key, cursor->current);
-} /* }}} */
-#endif
-
-#if PHP_VERSION_ID < 70000
-static void php_phongo_cursor_iterator_get_current_data(zend_object_iterator *iter, zval ***data TSRMLS_DC) /* {{{ */
-{
-	php_phongo_cursor_t *cursor = ((php_phongo_cursor_iterator *)iter)->cursor;
-
-	*data = &cursor->visitor_data.zchild;
-} /* }}} */
-#else
-static zval* php_phongo_cursor_iterator_get_current_data(zend_object_iterator *iter) /* {{{ */
-{
-	php_phongo_cursor_t *cursor = ((php_phongo_cursor_iterator *)iter)->cursor;
-
-	return &cursor->visitor_data.zchild;
-} /* }}} */
-#endif
-
-static void php_phongo_cursor_iterator_move_forward(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
-{
-	php_phongo_cursor_iterator *cursor_it = (php_phongo_cursor_iterator *)iter;
-	php_phongo_cursor_t        *cursor = cursor_it->cursor;
-	const bson_t               *doc;
-
-	php_phongo_cursor_free_current(cursor);
-	cursor->current++;
-
-	if (mongoc_cursor_next(cursor->cursor, &doc)) {
-		phongo_bson_to_zval_ex(bson_get_data(doc), doc->len, &cursor->visitor_data);
-	} else {
-		bson_error_t error;
-
-		if (mongoc_cursor_error(cursor->cursor, &error)) {
-			/* Intentionally not destroying the cursor as it will happen
-			 * naturally now that there are no more results */
-			phongo_throw_exception_from_bson_error_t(&error TSRMLS_CC);
-		}
-	}
-} /* }}} */
-
-static void php_phongo_cursor_iterator_rewind(zend_object_iterator *iter TSRMLS_DC) /* {{{ */
-{
-	php_phongo_cursor_iterator *cursor_it = (php_phongo_cursor_iterator *)iter;
-	php_phongo_cursor_t        *cursor = cursor_it->cursor;
-	const bson_t               *doc;
-
-	if (cursor->current > 0) {
-		phongo_throw_exception(PHONGO_ERROR_LOGIC TSRMLS_CC, "Cursors cannot rewind after starting iteration");
-		return;
-	}
-
-	php_phongo_cursor_free_current(cursor);
-
-	doc = mongoc_cursor_current(cursor->cursor);
-
-	if (doc) {
-		phongo_bson_to_zval_ex(bson_get_data(doc), doc->len, &cursor->visitor_data);
-	}
-} /* }}} */
-
-/* iterator handler table */
-zend_object_iterator_funcs php_phongo_cursor_iterator_funcs = {
-	php_phongo_cursor_iterator_dtor,
-	php_phongo_cursor_iterator_valid,
-	php_phongo_cursor_iterator_get_current_data,
-	php_phongo_cursor_iterator_get_current_key,
-	php_phongo_cursor_iterator_move_forward,
-	php_phongo_cursor_iterator_rewind,
-	NULL /* invalidate_current is not used */
-};
-
-zend_object_iterator *php_phongo_cursor_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC) /* {{{ */
-{
-	php_phongo_cursor_iterator *cursor_it = NULL;
-	php_phongo_cursor_t *cursor = Z_CURSOR_OBJ_P(object);
-
-	if (by_ref) {
-		zend_error(E_ERROR, "An iterator cannot be used with foreach by reference");
-	}
-
-	if (cursor->got_iterator) {
-		phongo_throw_exception(PHONGO_ERROR_LOGIC TSRMLS_CC, "Cursors cannot yield multiple iterators");
-		return NULL;
-	}
-
-	cursor->got_iterator = 1;
-
-	cursor_it = ecalloc(1, sizeof(php_phongo_cursor_iterator));
-#if PHP_VERSION_ID >= 70000
-	zend_iterator_init(&cursor_it->intern);
-#endif
-
-#if PHP_VERSION_ID >= 70000
-	ZVAL_COPY(&cursor_it->intern.data, object);
-#else
-	Z_ADDREF_P(object);
-	cursor_it->intern.data  = (void*)object;
-#endif
-	cursor_it->intern.funcs = &php_phongo_cursor_iterator_funcs;
-	cursor_it->cursor = cursor;
-	/* cursor_it->current should already be allocated to zero */
-
-	php_phongo_cursor_free_current(cursor_it->cursor);
-
-	return &cursor_it->intern;
-} /* }}} */
-/* }}} */
-
-
 /* {{{ Memory allocation wrappers */
 static void* php_phongo_malloc(size_t num_bytes) /* {{{ */
 {

php_phongo.h

@@ -154,9 +154,6 @@ void php_phongo_new_regex_from_regex_and_options(zval *object, const char *patte
 zend_bool phongo_writeerror_init(zval *return_value, bson_t *bson TSRMLS_DC);
 zend_bool phongo_writeconcernerror_init(zval *return_value, bson_t *bson TSRMLS_DC);
 
-void php_phongo_cursor_free(php_phongo_cursor_t *cursor);
-zend_object_iterator* php_phongo_cursor_get_iterator(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC);
-
 #if PHP_VERSION_ID >= 70000
 #define PHONGO_CE_FINAL(ce) do {    \
 	ce->ce_flags |= ZEND_ACC_FINAL; \