zval tmp;
RETVAL_ZVAL(zend_read_property(Z_OBJCE_P(zsym), Z_OBJ_P(zsym), ZEND_STRL("value"), 0, &tmp), 1, 0);
}
-static ZEND_FUNCTION(ion_Symbol_Table_System)
+static ZEND_METHOD(ion_Symbol_System, asTable)
{
ZEND_PARSE_PARAMETERS_NONE();
php_ion_symbol_table_ctor(obj);
ion_symbol_table_lock(obj->tab);
}
-static ZEND_FUNCTION(ion_Symbol_Table_PHP)
+static ZEND_METHOD(ion_Symbol_PHP, asTable)
{
ZEND_PARSE_PARAMETERS_NONE();
zend_long precision;
zend_object *precision_obj = NULL, *format_obj = NULL;
- zend_string *fmt = NULL, *dt = NULL;
- zval *tz = NULL;
+ zend_string *fmt = NULL, *dt = NULL, *tz = NULL;
+ zend_object *tz_obj = NULL;
+ zval z_tz_tmp, *z_tz_ptr = NULL;
ZEND_PARSE_PARAMETERS_START(1, 4)
Z_PARAM_OBJ_OF_CLASS_OR_LONG(precision_obj, ce_Timestamp_Precision, precision)
Z_PARAM_OPTIONAL
Z_PARAM_OBJ_OF_CLASS_OR_STR_OR_NULL(format_obj, ce_Timestamp_Format, fmt)
Z_PARAM_STR_OR_NULL(dt)
- Z_PARAM_ZVAL(tz)
+ Z_PARAM_OBJ_OF_CLASS_OR_STR_OR_NULL(tz_obj, php_date_get_timezone_ce(), tz)
ZEND_PARSE_PARAMETERS_END();
if (precision_obj) {
if (format_obj) {
fmt = Z_STR_P(zend_enum_fetch_case_value(format_obj));
}
- php_ion_timestamp_ctor(obj, precision, fmt, dt, tz);
+ if (tz_obj) {
+ ZVAL_OBJ(z_tz_ptr = &z_tz_tmp, tz_obj);
+ } else if (tz) {
+ // there's no public API, so call timezone_open
+ zend_function *tz_open = zend_fetch_function_str(ZEND_STRL("timezone_open"));
+ if (tz_open) {
+ zval z_arg;
+ ZVAL_STR(&z_arg, tz);
+ zend_call_known_function(tz_open, NULL, NULL, z_tz_ptr = &z_tz_tmp, 1, &z_arg, NULL);
+ }
+ }
+ php_ion_timestamp_ctor(obj, precision, fmt, dt, z_tz_ptr);
+ if (tz && z_tz_ptr) {
+ zval_ptr_dtor(z_tz_ptr);
+ }
}
static ZEND_METHOD(ion_Timestamp, __toString)
{
RETURN_RES(obj->stream.ptr->res);
}
+#define Z_PARAM_OBJ_OF_CLASS_OR_NAMED_OR_NULL(obj_dest, iface_ce, impl_ce, arr_dest) \
+ Z_PARAM_PROLOGUE(0,0) \
+ if (!zend_parse_arg_obj(_arg, &(obj_dest), iface_ce, true)) { \
+ if (UNEXPECTED(!zend_parse_arg_array(_arg, &(arr_dest), true, 0))) { \
+ _error = (iface_ce)->name->val; \
+ _error_code = ZPP_ERROR_WRONG_CLASS_OR_NULL; \
+ break; \
+ } \
+ zval tmp; \
+ object_init_ex(&tmp, impl_ce); \
+ *(&(obj_dest)) = Z_OBJ(tmp); \
+ zend_call_known_function((impl_ce)->constructor, obj_dest, impl_ce, \
+ NULL, 0, NULL, Z_ARRVAL_P(arr_dest)); \
+ if (EG(exception)) { \
+ OBJ_RELEASE(obj_dest); \
+ return; \
+ } \
+ }
+
static ZEND_METHOD(ion_Serializer_PHP, __construct)
{
php_ion_serializer_php *obj = php_ion_obj(serializer_php, Z_OBJ_P(ZEND_THIS));
obj->serializer.call_magic = true;
+ zval *za_opt = NULL;
ZEND_PARSE_PARAMETERS_START(0, 4)
Z_PARAM_OPTIONAL
- Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->opt, ce_Writer_Options)
+ Z_PARAM_OBJ_OF_CLASS_OR_NAMED_OR_NULL(obj->opt, ce_Writer_Options, ce_Writer_Options, za_opt)
Z_PARAM_BOOL(obj->serializer.multi_seq)
Z_PARAM_BOOL(obj->serializer.call_magic)
Z_PARAM_STR_OR_NULL(obj->serializer.call_custom)
ZEND_PARSE_PARAMETERS_END();
php_ion_serializer_php_ctor(obj);
+ if (za_opt) {
+ OBJ_RELEASE(obj->opt);
+ }
}
static ZEND_METHOD(ion_Serializer_PHP, serialize)
{
}
static ZEND_FUNCTION(ion_serialize)
{
- zval *data;
+ zval *data, *za_ser = NULL;
zend_object *zo_ser = NULL;
ZEND_PARSE_PARAMETERS_START(1, 2)
Z_PARAM_ZVAL(data)
Z_PARAM_OPTIONAL
- Z_PARAM_OBJ_OF_CLASS_OR_NULL(zo_ser, ce_Serializer)
+ Z_PARAM_OBJ_OF_CLASS_OR_NAMED_OR_NULL(zo_ser, ce_Serializer, ce_Serializer_PHP, za_ser)
ZEND_PARSE_PARAMETERS_END();
if (!zo_ser || zo_ser->ce == ce_Serializer_PHP) {
} else {
zend_call_method_with_1_params(zo_ser, NULL, NULL, "serialize", return_value, data);
}
+
+ if (za_ser) {
+ OBJ_RELEASE(zo_ser);
+ }
}
static ZEND_METHOD(ion_Unserializer_PHP, __construct)
obj->unserializer.call_magic = true;
+ zval *za_opt = NULL;
ZEND_PARSE_PARAMETERS_START(0, 4)
Z_PARAM_OPTIONAL
- Z_PARAM_OBJ_OF_CLASS_OR_NULL(obj->opt, ce_Reader_Options)
+ Z_PARAM_OBJ_OF_CLASS_OR_NAMED_OR_NULL(obj->opt, ce_Reader_Options, ce_Reader_Options, za_opt)
Z_PARAM_BOOL(obj->unserializer.multi_seq)
Z_PARAM_BOOL(obj->unserializer.call_magic)
Z_PARAM_STR_OR_NULL(obj->unserializer.call_custom)
ZEND_PARSE_PARAMETERS_END();
php_ion_unserializer_php_ctor(obj);
+ if (za_opt) {
+ OBJ_RELEASE(obj->opt);
+ }
}
static ZEND_METHOD(ion_Unserializer_PHP, unserialize)
{
}
static ZEND_FUNCTION(ion_unserialize)
{
- zval *data;
+ zval *data, *za_ser = NULL;
zend_object *zo_ser = NULL;
ZEND_PARSE_PARAMETERS_START(1, 2)
Z_PARAM_ZVAL(data)
Z_PARAM_OPTIONAL
- Z_PARAM_OBJ_OF_CLASS_OR_NULL(zo_ser, ce_Unserializer)
+ Z_PARAM_OBJ_OF_CLASS_OR_NAMED_OR_NULL(zo_ser, ce_Unserializer, ce_Unserializer_PHP, za_ser)
ZEND_PARSE_PARAMETERS_END();
if (!zo_ser || zo_ser->ce == ce_Unserializer_PHP) {
php_ion_unserializer *ser = zo_ser ? &php_ion_obj(unserializer_php, zo_ser)->unserializer : NULL;
php_ion_unserialize(ser, data, return_value);
} else {
- zend_call_method_with_1_params(zo_ser, NULL, NULL, "__invoke", return_value, data);
+ zend_call_method_with_1_params(zo_ser, NULL, NULL, "unserialize", return_value, data);
+ }
+
+ if (za_ser) {
+ OBJ_RELEASE(zo_ser);
}
}
php_ion_register(decimal_ctx, Decimal_Context);
ce_Decimal_Context_Rounding = register_class_ion_Decimal_Context_Rounding();
+ // Exception
+ ce_Exception = register_class_ion_Exception(zend_ce_exception);
+
// LOB
ce_LOB = register_class_ion_LOB();
ce_Symbol_Table_Shared = register_class_ion_Symbol_Table_Shared(ce_Symbol_Table);
ce_Symbol_Table_Shared->create_object = create_ion_Symbol_Table;
ce_Symbol_Enum = register_class_ion_Symbol_Enum();
- ce_Symbol_Table_System = register_class_ion_Symbol_Table_System(ce_Symbol_Enum);
- ce_Symbol_Table_PHP = register_class_ion_Symbol_Table_PHP(ce_Symbol_Enum);
+ ce_Symbol_Table_System = register_class_ion_Symbol_System(ce_Symbol_Enum);
+ ce_Symbol_Table_PHP = register_class_ion_Symbol_PHP(ce_Symbol_Enum);
// Timestamp
ce_Timestamp = register_class_ion_Timestamp(php_date_get_date_ce());
projects / awesomized / ext-ion / blobdiff