php_vm 1.3.1 → 1.3.2

data/ext/php_vm/php_vm.c

@@ -48,6 +48,12 @@ static void php_embed_error_handler(char *message)
 	}
 }
 
+static void php_vm_catch_exception(zval *ex TSRMLS_DC)
+{
+	VALUE exception = zval_to_value(ex);
+	rb_exc_raise(exception);
+}
+
 
 // PHP
 
@@ -280,8 +286,6 @@ int call_php_method(zend_class_entry *ce, zval *obj, zend_function *mptr, int ar
 	// call info
 	zend_fcall_info fci;
 	zend_fcall_info_cache fcc;
-	zval *return_value;
-	ALLOC_INIT_ZVAL(return_value);
 
 	fci.size = sizeof(fci);
 	fci.function_table = NULL;
@@ -1055,6 +1059,8 @@ void Init_php_vm()
 	php_vm_module_init();
 	atexit(php_vm_module_exit);
 
+	zend_throw_exception_hook = php_vm_catch_exception;
+
 	// ini
 	zend_try {
 		zend_alter_ini_entry("display_errors", sizeof("display_errors"), "0", sizeof("0")-1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
@@ -1079,7 +1085,7 @@ void Init_php_vm()
 	rb_define_singleton_method(rb_mPHPVM, "get_class", rb_php_vm_get_class, 1);
 	rb_define_singleton_method(rb_mPHPVM, "define_global", rb_php_vm_define_global, 0);
 
-	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.3.1"));
+	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.3.2"));
 
 	rb_cv_set(rb_mPHPVM, "@@output_handler", Qnil);
 	rb_cv_set(rb_mPHPVM, "@@error_handler", Qnil);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: php_vm
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2012-12-30 00:00:00.000000000 Z
 dependencies: []
 description: php_vm is a native bridge between Ruby and PHP.
 email: