Regenerated builds [ci skip]

zerkella · Aug 5, 2013 · 210de47 · 210de47
1 parent b1b58cb
commit 210de47
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 48 deletions.
diff --git a/build/32bits/phalcon.c b/build/32bits/phalcon.c
@@ -32794,7 +32794,7 @@ static PHP_METHOD(Phalcon_Annotations_Adapter, getProperty){
 	if (Z_TYPE_P(class_annotations) == IS_OBJECT) {
 
 		PHALCON_INIT_VAR(properties);
-		phalcon_call_method_key(properties, class_annotations, "getpropertyannotations", 2404243672UL);
+		phalcon_call_method_key(properties, class_annotations, "getpropertiesannotations", 3353352384UL);
 		if (Z_TYPE_P(properties) == IS_ARRAY) { 
 
 			phalcon_is_iterable(properties, &ah0, &hp0, 0, 0);
@@ -98486,10 +98486,6 @@ typedef struct _phalcon_config_object {
 
 static inline phalcon_config_object* fetchPhalconConfigObject(zval* zobj TSRMLS_DC)
 {
-#ifndef PHALCON_RELEASE
-	assert(Z_TYPE_P(zobj) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zobj), phalcon_config_ce TSRMLS_CC));
-#endif
-
 	return (phalcon_config_object*)zend_objects_get_address(zobj TSRMLS_CC);
 }
 
@@ -98554,6 +98550,7 @@ static void phalcon_config_write_property(zval *object, zval *offset, zval *valu
 
 	if (obj->obj.ce->type != ZEND_INTERNAL_CLASS) {
 		zend_get_std_object_handlers()->write_property(object, offset, value ZLK_CC TSRMLS_CC);
+		return;
 	}
 
 	phalcon_config_write_internal(obj, offset, value TSRMLS_CC);
@@ -98565,6 +98562,7 @@ static void phalcon_config_write_dimension(zval *object, zval *offset, zval *val
 
 	if (obj->obj.ce->type != ZEND_INTERNAL_CLASS) {
 		zend_get_std_object_handlers()->write_dimension(object, offset, value TSRMLS_CC);
+		return;
 	}
 
 	phalcon_config_write_internal(obj, offset, value TSRMLS_CC);
@@ -98622,6 +98620,7 @@ static void phalcon_config_unset_property(zval *object, zval *member ZLK_DC TSRM
 
 	if (obj->obj.ce->type != ZEND_INTERNAL_CLASS) {
 		zend_get_std_object_handlers()->unset_property(object, member ZLK_CC TSRMLS_CC);
+		return;
 	}
 
 	phalcon_config_unset_internal(obj, member TSRMLS_CC);
@@ -98633,6 +98632,7 @@ static void phalcon_config_unset_dimension(zval *object, zval *offset TSRMLS_DC)
 
 	if (obj->obj.ce->type != ZEND_INTERNAL_CLASS) {
 		zend_get_std_object_handlers()->unset_dimension(object, offset TSRMLS_CC);
+		return;
 	}
 
 	phalcon_config_unset_internal(obj, offset TSRMLS_CC);
@@ -98644,9 +98644,7 @@ static HashTable* phalcon_config_get_properties(zval* object TSRMLS_DC)
 
 	if (!GC_G(gc_active)) {
 		phalcon_config_object* obj = fetchPhalconConfigObject(object TSRMLS_CC);
-		zval *tmp;
-
-		zend_hash_copy(props, obj->props, (copy_ctor_func_t)zval_add_ref, (void*)&tmp, sizeof(zval*));
+		zend_hash_copy(props, obj->props, (copy_ctor_func_t)zval_add_ref, NULL, sizeof(zval*));
 	}
 
 	return props;
@@ -98691,7 +98689,14 @@ static zend_object_value phalcon_config_object_ctor(zend_class_entry* ce TSRMLS_
 	phalcon_config_object* obj = ecalloc(1, sizeof(phalcon_config_object));
 	zend_object_value retval;
 
-	zend_object_std_init(&(obj->obj), ce TSRMLS_CC);
+	zend_object_std_init(&obj->obj, ce TSRMLS_CC);
+#if PHP_VERSION_ID >= 50400
+	object_properties_init(&obj->obj, ce);
+#endif
+
+	ALLOC_HASHTABLE(obj->props);
+	zend_hash_init(obj->props, 0, NULL, ZVAL_PTR_DTOR, 0);
+
 	retval.handle = zend_objects_store_put(
 		obj,
 		(zend_objects_store_dtor_t)zend_objects_destroy_object,
@@ -98736,23 +98741,16 @@ static void phalcon_config_construct_internal(zval* this_ptr, zval *array_config
 	phalcon_config_object* obj;
 
 	if (!array_config || Z_TYPE_P(array_config) == IS_NULL) {
-		obj = fetchPhalconConfigObject(getThis() TSRMLS_CC);
-		ALLOC_HASHTABLE(obj->props);
-		zend_hash_init(obj->props, 0, NULL, ZVAL_PTR_DTOR, 0);
 		return;
 	}
 
 	phalcon_is_iterable(array_config, &ah0, &hp0, 0, 0);
 
 	obj = fetchPhalconConfigObject(getThis() TSRMLS_CC);
-	ALLOC_HASHTABLE(obj->props);
-	zend_hash_init(obj->props, zend_hash_num_elements(Z_ARRVAL_P(array_config)), NULL, ZVAL_PTR_DTOR, 0);
 
 	while (zend_hash_get_current_data_ex(ah0, (void**) &hd, &hp0) == SUCCESS) {
-
 		zval key = phalcon_get_current_key_w(ah0, &hp0);
 		phalcon_config_write_internal(obj, &key, *hd TSRMLS_CC);
-
 		zend_hash_move_forward_ex(ah0, &hp0);
 	}
 }
@@ -98931,6 +98929,16 @@ static PHP_METHOD(Phalcon_Config, count)
 	RETURN_LONG(cnt);
 }
 
+static PHP_METHOD(Phalcon_Config, __wakeup)
+{
+	HashTable *props;
+	phalcon_config_object *obj;
+
+	obj   = fetchPhalconConfigObject(getThis() TSRMLS_CC);
+	props = zend_std_get_properties(getThis() TSRMLS_CC);
+	zend_hash_copy(obj->props, props, (copy_ctor_func_t)zval_add_ref, NULL, sizeof(zval*));
+}
+
 static PHP_METHOD(Phalcon_Config, __set_state){
 
 	zval *data;

diff --git a/build/32bits/phalcon.h b/build/32bits/phalcon.h
@@ -5172,6 +5172,7 @@ static PHP_METHOD(Phalcon_Config, offsetUnset);
 static PHP_METHOD(Phalcon_Config, merge);
 static PHP_METHOD(Phalcon_Config, toArray);
 static PHP_METHOD(Phalcon_Config, count);
+static PHP_METHOD(Phalcon_Config, __wakeup);
 static PHP_METHOD(Phalcon_Config, __set_state);
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config___construct, 0, 0, 0)
@@ -5210,6 +5211,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config_count, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config___wakeup, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config___set_state, 0, 0, 1)
 	ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
@@ -5224,6 +5228,7 @@ PHALCON_INIT_FUNCS(phalcon_config_method_entry){
 	PHP_ME(Phalcon_Config, merge, arginfo_phalcon_config_merge, ZEND_ACC_PUBLIC) 
 	PHP_ME(Phalcon_Config, toArray, arginfo_phalcon_config_toarray, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Config, count, arginfo_phalcon_config_count, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Config, __wakeup, arginfo_phalcon_config___wakeup, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Config, __set_state, arginfo_phalcon_config___set_state, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_MALIAS(Phalcon_Config, __get, offsetGet, arginfo_phalcon_config_offsetget, ZEND_ACC_PUBLIC)
 	PHP_MALIAS(Phalcon_Config, __set, offsetSet, arginfo_phalcon_config_offsetset, ZEND_ACC_PUBLIC)

diff --git a/build/64bits/phalcon.c b/build/64bits/phalcon.c
@@ -32794,7 +32794,7 @@ static PHP_METHOD(Phalcon_Annotations_Adapter, getProperty){
 	if (Z_TYPE_P(class_annotations) == IS_OBJECT) {
 
 		PHALCON_INIT_VAR(properties);
-		phalcon_call_method_key(properties, class_annotations, "getpropertyannotations", 996299318334707928UL);
+		phalcon_call_method_key(properties, class_annotations, "getpropertiesannotations", 13854905854129608896UL);
 		if (Z_TYPE_P(properties) == IS_ARRAY) { 
 
 			phalcon_is_iterable(properties, &ah0, &hp0, 0, 0);
@@ -98486,10 +98486,6 @@ typedef struct _phalcon_config_object {
 
 static inline phalcon_config_object* fetchPhalconConfigObject(zval* zobj TSRMLS_DC)
 {
-#ifndef PHALCON_RELEASE
-	assert(Z_TYPE_P(zobj) == IS_OBJECT && instanceof_function(Z_OBJCE_P(zobj), phalcon_config_ce TSRMLS_CC));
-#endif
-
 	return (phalcon_config_object*)zend_objects_get_address(zobj TSRMLS_CC);
 }
 
@@ -98554,6 +98550,7 @@ static void phalcon_config_write_property(zval *object, zval *offset, zval *valu
 
 	if (obj->obj.ce->type != ZEND_INTERNAL_CLASS) {
 		zend_get_std_object_handlers()->write_property(object, offset, value ZLK_CC TSRMLS_CC);
+		return;
 	}
 
 	phalcon_config_write_internal(obj, offset, value TSRMLS_CC);
@@ -98565,6 +98562,7 @@ static void phalcon_config_write_dimension(zval *object, zval *offset, zval *val
 
 	if (obj->obj.ce->type != ZEND_INTERNAL_CLASS) {
 		zend_get_std_object_handlers()->write_dimension(object, offset, value TSRMLS_CC);
+		return;
 	}
 
 	phalcon_config_write_internal(obj, offset, value TSRMLS_CC);
@@ -98622,6 +98620,7 @@ static void phalcon_config_unset_property(zval *object, zval *member ZLK_DC TSRM
 
 	if (obj->obj.ce->type != ZEND_INTERNAL_CLASS) {
 		zend_get_std_object_handlers()->unset_property(object, member ZLK_CC TSRMLS_CC);
+		return;
 	}
 
 	phalcon_config_unset_internal(obj, member TSRMLS_CC);
@@ -98633,6 +98632,7 @@ static void phalcon_config_unset_dimension(zval *object, zval *offset TSRMLS_DC)
 
 	if (obj->obj.ce->type != ZEND_INTERNAL_CLASS) {
 		zend_get_std_object_handlers()->unset_dimension(object, offset TSRMLS_CC);
+		return;
 	}
 
 	phalcon_config_unset_internal(obj, offset TSRMLS_CC);
@@ -98644,9 +98644,7 @@ static HashTable* phalcon_config_get_properties(zval* object TSRMLS_DC)
 
 	if (!GC_G(gc_active)) {
 		phalcon_config_object* obj = fetchPhalconConfigObject(object TSRMLS_CC);
-		zval *tmp;
-
-		zend_hash_copy(props, obj->props, (copy_ctor_func_t)zval_add_ref, (void*)&tmp, sizeof(zval*));
+		zend_hash_copy(props, obj->props, (copy_ctor_func_t)zval_add_ref, NULL, sizeof(zval*));
 	}
 
 	return props;
@@ -98691,7 +98689,14 @@ static zend_object_value phalcon_config_object_ctor(zend_class_entry* ce TSRMLS_
 	phalcon_config_object* obj = ecalloc(1, sizeof(phalcon_config_object));
 	zend_object_value retval;
 
-	zend_object_std_init(&(obj->obj), ce TSRMLS_CC);
+	zend_object_std_init(&obj->obj, ce TSRMLS_CC);
+#if PHP_VERSION_ID >= 50400
+	object_properties_init(&obj->obj, ce);
+#endif
+
+	ALLOC_HASHTABLE(obj->props);
+	zend_hash_init(obj->props, 0, NULL, ZVAL_PTR_DTOR, 0);
+
 	retval.handle = zend_objects_store_put(
 		obj,
 		(zend_objects_store_dtor_t)zend_objects_destroy_object,
@@ -98736,23 +98741,16 @@ static void phalcon_config_construct_internal(zval* this_ptr, zval *array_config
 	phalcon_config_object* obj;
 
 	if (!array_config || Z_TYPE_P(array_config) == IS_NULL) {
-		obj = fetchPhalconConfigObject(getThis() TSRMLS_CC);
-		ALLOC_HASHTABLE(obj->props);
-		zend_hash_init(obj->props, 0, NULL, ZVAL_PTR_DTOR, 0);
 		return;
 	}
 
 	phalcon_is_iterable(array_config, &ah0, &hp0, 0, 0);
 
 	obj = fetchPhalconConfigObject(getThis() TSRMLS_CC);
-	ALLOC_HASHTABLE(obj->props);
-	zend_hash_init(obj->props, zend_hash_num_elements(Z_ARRVAL_P(array_config)), NULL, ZVAL_PTR_DTOR, 0);
 
 	while (zend_hash_get_current_data_ex(ah0, (void**) &hd, &hp0) == SUCCESS) {
-
 		zval key = phalcon_get_current_key_w(ah0, &hp0);
 		phalcon_config_write_internal(obj, &key, *hd TSRMLS_CC);
-
 		zend_hash_move_forward_ex(ah0, &hp0);
 	}
 }
@@ -98931,6 +98929,16 @@ static PHP_METHOD(Phalcon_Config, count)
 	RETURN_LONG(cnt);
 }
 
+static PHP_METHOD(Phalcon_Config, __wakeup)
+{
+	HashTable *props;
+	phalcon_config_object *obj;
+
+	obj   = fetchPhalconConfigObject(getThis() TSRMLS_CC);
+	props = zend_std_get_properties(getThis() TSRMLS_CC);
+	zend_hash_copy(obj->props, props, (copy_ctor_func_t)zval_add_ref, NULL, sizeof(zval*));
+}
+
 static PHP_METHOD(Phalcon_Config, __set_state){
 
 	zval *data;

diff --git a/build/64bits/phalcon.h b/build/64bits/phalcon.h
@@ -5172,6 +5172,7 @@ static PHP_METHOD(Phalcon_Config, offsetUnset);
 static PHP_METHOD(Phalcon_Config, merge);
 static PHP_METHOD(Phalcon_Config, toArray);
 static PHP_METHOD(Phalcon_Config, count);
+static PHP_METHOD(Phalcon_Config, __wakeup);
 static PHP_METHOD(Phalcon_Config, __set_state);
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config___construct, 0, 0, 0)
@@ -5210,6 +5211,9 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config_count, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config___wakeup, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO_EX(arginfo_phalcon_config___set_state, 0, 0, 1)
 	ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
@@ -5224,6 +5228,7 @@ PHALCON_INIT_FUNCS(phalcon_config_method_entry){
 	PHP_ME(Phalcon_Config, merge, arginfo_phalcon_config_merge, ZEND_ACC_PUBLIC) 
 	PHP_ME(Phalcon_Config, toArray, arginfo_phalcon_config_toarray, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Config, count, arginfo_phalcon_config_count, ZEND_ACC_PUBLIC)
+	PHP_ME(Phalcon_Config, __wakeup, arginfo_phalcon_config___wakeup, ZEND_ACC_PUBLIC)
 	PHP_ME(Phalcon_Config, __set_state, arginfo_phalcon_config___set_state, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_MALIAS(Phalcon_Config, __get, offsetGet, arginfo_phalcon_config_offsetget, ZEND_ACC_PUBLIC)
 	PHP_MALIAS(Phalcon_Config, __set, offsetSet, arginfo_phalcon_config_offsetset, ZEND_ACC_PUBLIC)