php_vm 1.3.9 → 1.3.10

data/ext/php_vm/php_vm.c

@@ -18,14 +18,29 @@ VALUE rb_ePHPErrorReporting;
 
 // PHP Embed
 
+static VALUE php_vm_handler_b_proc(HandlerArgs *args)
+{
+	rb_proc_call(args->proc, args->args);
+	return Qnil;
+}
+
+static VALUE php_vm_handler_r_proc(HandlerArgs *args, VALUE e)
+{
+	fprintf(stderr, "Exception has occurred in php_vm handler. php_vm handler must not occur exception.\n");
+	return Qnil;
+}
+
 static int php_embed_output_handler(const char *str, unsigned int str_length TSRMLS_DC)
 {
 	VALUE proc = rb_cv_get(rb_mPHPVM, "@@output_handler");
 	if (rb_obj_is_kind_of(proc, rb_cProc)) {
 		VALUE args = rb_ary_new();
 		rb_ary_push(args, rb_str_new(str, str_length));
-		rb_proc_call(proc, args);
-		return str_length;
+
+		HandlerArgs handargs;
+		handargs.proc = proc;
+		handargs.args = args;
+		rb_rescue(php_vm_handler_b_proc, (VALUE)&handargs, php_vm_handler_r_proc, (VALUE)&handargs);
 	} else {
 		printf("%s", str);
 	}
@@ -34,18 +49,19 @@ static int php_embed_output_handler(const char *str, unsigned int str_length TSR
 
 static void php_embed_error_handler(char *message TSRMLS_DC)
 {
-	VALUE proc = rb_cv_get(rb_mPHPVM, "@@error_handler");
 	VALUE report = rb_exc_new2(rb_ePHPErrorReporting, message);
+	VALUE proc = rb_cv_get(rb_mPHPVM, "@@error_handler");
 	if (rb_obj_is_kind_of(proc, rb_cProc)) {
 		VALUE args = rb_ary_new();
 		rb_ary_push(args, report);
-		rb_proc_call(proc, args);
-	} else {
-		if (rb_iv_get(report, "error_level")==ID2SYM(rb_intern("Fatal"))) {
-			rb_exc_raise(report);
-		} else {
-			printf("%s\n", message);
-		}
+
+		HandlerArgs handargs;
+		handargs.proc = proc;
+		handargs.args = args;
+		rb_rescue(php_vm_handler_b_proc, (VALUE)&handargs, php_vm_handler_r_proc, (VALUE)&handargs);
+	}
+	if (rb_funcall(report, rb_intern("error_level"), 0)==ID2SYM(rb_intern("Fatal"))) {
+		rb_cv_set(rb_mPHPVM, "@@last_error_reporting", report);
 	}
 }
 
@@ -60,13 +76,14 @@ static void php_vm_exception_hook(zval *ex TSRMLS_DC)
 
 // PHP
 
-void php_eval_string(char *code, int code_len TSRMLS_DC)
+VALUE php_eval_string(char *code, int code_len, int use_retval TSRMLS_DC)
 {
 	int syntax_error = 0;
+	zval retval;
 
 	// eval
 	zend_try {
-		if (zend_eval_stringl(code, code_len, NULL, "php_vm" TSRMLS_CC)==FAILURE) {
+		if (zend_eval_stringl(code, code_len, (use_retval ? &retval : NULL), "php_vm" TSRMLS_CC)==FAILURE) {
 			syntax_error = 1;
 		}
 	} zend_end_try();
@@ -89,8 +106,20 @@ void php_eval_string(char *code, int code_len TSRMLS_DC)
 		int exit_status = EG(exit_status);
 		EG(exit_status) = 0;
 
-		rb_raise(rb_ePHPError, "exit status error: %d", exit_status);
+		VALUE report = rb_cv_get(rb_mPHPVM, "@@last_error_reporting");
+		rb_cv_set(rb_mPHPVM, "@@last_error_reporting", Qnil);
+		if (report!=Qnil) {
+			rb_exc_raise(report);
+		} else {
+			rb_raise(rb_ePHPError, "exit status error: %d", exit_status);
+		}
+	}
+
+	// return
+	if (use_retval) {
+		return zval_to_value(&retval);
 	}
+	return Qnil;
 }
 
 void find_zend_class_entry(char *name, int name_len, zend_class_entry ***ce TSRMLS_DC)
@@ -173,11 +202,15 @@ int new_php_object(zend_class_entry *ce, VALUE v_args, zval *retval TSRMLS_DC)
 
 		// exception
 		if (result==FAILURE) {
+			VALUE report = rb_cv_get(rb_mPHPVM, "@@last_error_reporting");
+			rb_cv_set(rb_mPHPVM, "@@last_error_reporting", Qnil);
 			if (g_exception) {
 				VALUE exception = zval_to_value(g_exception);
 				zval_ptr_dtor(&g_exception);
 				g_exception = NULL;
 				rb_exc_raise(exception);
+			} else if (report!=Qnil) {
+				rb_exc_raise(report);
 			} else {
 				rb_raise(rb_ePHPError, "Invocation of %s's constructor failed", ce->name);
 			}
@@ -390,7 +423,7 @@ int call_php_method(zend_class_entry *ce, zval *obj, zend_function *mptr, int ar
 	zval_ptr_dtor(&z_args);
 
 	// result
-	if (g_exception) {
+	if (g_exception || rb_cv_get(rb_mPHPVM, "@@last_error_reporting")!=Qnil) {
 		result = FAILURE;
 	}
 	return result;
@@ -425,11 +458,15 @@ VALUE call_php_method_bridge(zend_class_entry *ce, zval *obj, zend_function *mpt
 
 	// exception
 	if (result==FAILURE) {
+		VALUE report = rb_cv_get(rb_mPHPVM, "@@last_error_reporting");
+		rb_cv_set(rb_mPHPVM, "@@last_error_reporting", Qnil);
 		if (g_exception) {
 			VALUE exception = zval_to_value(g_exception);
 			zval_ptr_dtor(&g_exception);
 			g_exception = NULL;
 			rb_exc_raise(exception);
+		} else if (report!=Qnil) {
+			rb_exc_raise(report);
 		} else {
 			rb_raise(rb_ePHPError, "raise exception: %s", mptr->common.function_name);
 		}
@@ -600,7 +637,7 @@ VALUE rb_php_vm_set_error_handler(VALUE cls, VALUE proc)
 	return Qnil;
 }
 
-void php_vm_require(char *token, VALUE filepath TSRMLS_DC)
+VALUE php_vm_require(char *token, VALUE filepath TSRMLS_DC)
 {
 	StringValue(filepath);
 	filepath = rb_funcall(filepath, rb_intern("gsub"), 2, rb_str_new2("\\"), rb_str_new2("\\\\"));
@@ -611,41 +648,49 @@ void php_vm_require(char *token, VALUE filepath TSRMLS_DC)
 	rb_str_cat(code, RSTRING_PTR(filepath), RSTRING_LEN(filepath));
 	rb_str_cat2(code, "\";");
 
-	php_eval_string(RSTRING_PTR(code), RSTRING_LEN(code) TSRMLS_CC);
+	VALUE retval = php_eval_string(RSTRING_PTR(code), RSTRING_LEN(code), 1 TSRMLS_CC);
+	switch (TYPE(retval)) {
+		case T_TRUE:
+		case T_FALSE:
+		case T_NIL:
+			break;
+		default:{
+			retval = rb_funcall(retval, rb_intern("to_i"), 0);
+			retval = rb_funcall(retval, rb_intern(">"), 1, INT2NUM(0));
+			break;
+		}
+	}
+	return retval==Qtrue ? Qtrue : Qfalse;
 }
 
 VALUE rb_php_vm_require(VALUE cls, VALUE filepath)
 {
 	TSRMLS_FETCH();
-	php_vm_require("require", filepath TSRMLS_CC);
-	return Qtrue;
+	return php_vm_require("require", filepath TSRMLS_CC);
 }
 
 VALUE rb_php_vm_require_once(VALUE cls, VALUE filepath)
 {
 	TSRMLS_FETCH();
-	php_vm_require("require_once", filepath TSRMLS_CC);
-	return Qtrue;
+	return php_vm_require("require_once", filepath TSRMLS_CC);
 }
 
 VALUE rb_php_vm_include(VALUE cls, VALUE filepath)
 {
 	TSRMLS_FETCH();
-	php_vm_require("include", filepath TSRMLS_CC);
-	return Qnil;
+	return php_vm_require("include", filepath TSRMLS_CC);
 }
 
 VALUE rb_php_vm_include_once(VALUE cls, VALUE filepath)
 {
 	TSRMLS_FETCH();
-	php_vm_require("include_once", filepath TSRMLS_CC);
-	return Qnil;
+	return php_vm_require("include_once", filepath TSRMLS_CC);
 }
 
 VALUE rb_php_vm_exec(VALUE cls, VALUE code)
 {
 	TSRMLS_FETCH();
-	php_eval_string(RSTRING_PTR(code), RSTRING_LEN(code) TSRMLS_CC);
+	php_eval_string(RSTRING_PTR(code), RSTRING_LEN(code), 0 TSRMLS_CC);
 	return Qnil;
 }
 
@@ -673,6 +718,7 @@ VALUE define_global_constants()
 			zval_ptr_dtor(&g_exception);
 			g_exception = NULL;
 		}
+		rb_cv_set(rb_mPHPVM, "@@last_error_reporting", Qnil);
 		return Qfalse;
 	}
 
@@ -731,6 +777,7 @@ VALUE define_global_functions()
 			zval_ptr_dtor(&g_exception);
 			g_exception = NULL;
 		}
+		rb_cv_set(rb_mPHPVM, "@@last_error_reporting", Qnil);
 		return Qfalse;
 	}
 
@@ -775,6 +822,7 @@ VALUE define_global_classes()
 			zval_ptr_dtor(&g_exception);
 			g_exception = NULL;
 		}
+		rb_cv_set(rb_mPHPVM, "@@last_error_reporting", Qnil);
 		return Qfalse;
 	}
 
@@ -807,7 +855,7 @@ VALUE rb_php_vm_define_global(VALUE cls)
 	VALUE res1 = define_global_constants();
 	VALUE res2 = define_global_functions();
 	VALUE res3 = define_global_classes();
-	return res1==Qtrue && res2==Qtrue && res3==Qtrue;
+	return (res1==Qtrue && res2==Qtrue && res3==Qtrue) ? Qtrue : Qfalse;
 }
 
 
@@ -828,35 +876,31 @@ VALUE rb_php_global_class_call(VALUE self)
 static VALUE php_global_require_b_proc(RequireArgs *args)
 {
 	TSRMLS_FETCH();
-	php_vm_require(args->token, args->filepath TSRMLS_CC);
-	return Qnil;
+	return php_vm_require(args->token, args->filepath TSRMLS_CC);
 }
 
 static VALUE php_global_require_r_proc(RequireArgs *args, VALUE e)
 {
-	rb_funcall(Qnil, rb_intern("require"), 1, args->filepath);
-	return Qnil;
+	return rb_funcall(Qnil, rb_intern("require"), 1, args->filepath);
 }
 
-void php_global_require(char *token, VALUE filepath)
+VALUE php_global_require(char *token, VALUE filepath)
 {
 	RequireArgs args;
 	args.token = token;
 	args.filepath = filepath;
 
-	rb_rescue(php_global_require_b_proc, (VALUE)&args, php_global_require_r_proc, (VALUE)&args);
+	return rb_rescue(php_global_require_b_proc, (VALUE)&args, php_global_require_r_proc, (VALUE)&args);
 }
 
 VALUE rb_php_global_require(VALUE cls, VALUE filepath)
 {
-	php_global_require("require", filepath);
-	return Qtrue;
+	return php_global_require("require", filepath);
 }
 
 VALUE rb_php_global_require_once(VALUE cls, VALUE filepath)
 {
-	php_global_require("require_once", filepath);
-	return Qtrue;
+	return php_global_require("require_once", filepath);
 }
 
 VALUE rb_php_global_echo(int argc, VALUE *argv, VALUE cls)
@@ -1101,11 +1145,15 @@ VALUE rb_php_object_call_magic_clone(VALUE self)
 	Z_SET_REFCOUNT_P(retval, 0);
 	Z_SET_ISREF_P(retval);
 
+	VALUE report = rb_cv_get(rb_mPHPVM, "@@last_error_reporting");
+	rb_cv_set(rb_mPHPVM, "@@last_error_reporting", Qnil);
 	if (g_exception) {
 		VALUE exception = zval_to_value(g_exception);
 		zval_ptr_dtor(&g_exception);
 		g_exception = NULL;
 		rb_exc_raise(exception);
+	} else if (report!=Qnil) {
+		rb_exc_raise(report);
 	}
 
 	return zval_to_value(retval);
@@ -1130,11 +1178,15 @@ VALUE rb_php_object_call_magic___get(VALUE self, VALUE name)
 
 	zval_ptr_dtor(&member);
 
+	VALUE report = rb_cv_get(rb_mPHPVM, "@@last_error_reporting");
+	rb_cv_set(rb_mPHPVM, "@@last_error_reporting", Qnil);
 	if (g_exception) {
 		VALUE exception = zval_to_value(g_exception);
 		zval_ptr_dtor(&g_exception);
 		g_exception = NULL;
 		rb_exc_raise(exception);
+	} else if (report!=Qnil) {
+		rb_exc_raise(report);
 	}
 
 	return zval_to_value(retval);
@@ -1162,11 +1214,15 @@ VALUE rb_php_object_call_magic___set(VALUE self, VALUE name, VALUE arg)
 	zval_ptr_dtor(&member);
 	zval_ptr_dtor(&z_arg);
 
+	VALUE report = rb_cv_get(rb_mPHPVM, "@@last_error_reporting");
+	rb_cv_set(rb_mPHPVM, "@@last_error_reporting", Qnil);
 	if (g_exception) {
 		VALUE exception = zval_to_value(g_exception);
 		zval_ptr_dtor(&g_exception);
 		g_exception = NULL;
 		rb_exc_raise(exception);
+	} else if (report!=Qnil) {
+		rb_exc_raise(report);
 	}
 
 	return Qnil;
@@ -1190,11 +1246,15 @@ VALUE rb_php_object_call_magic___unset(VALUE self, VALUE name)
 
 	zval_ptr_dtor(&member);
 
+	VALUE report = rb_cv_get(rb_mPHPVM, "@@last_error_reporting");
+	rb_cv_set(rb_mPHPVM, "@@last_error_reporting", Qnil);
 	if (g_exception) {
 		VALUE exception = zval_to_value(g_exception);
 		zval_ptr_dtor(&g_exception);
 		g_exception = NULL;
 		rb_exc_raise(exception);
+	} else if (report!=Qnil) {
+		rb_exc_raise(report);
 	}
 
 	return Qnil;
@@ -1219,11 +1279,15 @@ VALUE rb_php_object_call_magic___isset(VALUE self, VALUE name)
 
 	zval_ptr_dtor(&member);
 
+	VALUE report = rb_cv_get(rb_mPHPVM, "@@last_error_reporting");
+	rb_cv_set(rb_mPHPVM, "@@last_error_reporting", Qnil);
 	if (g_exception) {
 		VALUE exception = zval_to_value(g_exception);
 		zval_ptr_dtor(&g_exception);
 		g_exception = NULL;
 		rb_exc_raise(exception);
+	} else if (report!=Qnil) {
+		rb_exc_raise(report);
 	}
 
 	return has ? Qtrue : Qfalse;
@@ -1304,7 +1368,7 @@ VALUE rb_php_error_reporting_initialize(int argc, VALUE *argv, VALUE self)
 
 	if (argc==1 && TYPE(argv[0])==T_STRING) {
 		log_message = argv[0];
-		VALUE re_str = rb_str_new2("^PHP ([^:]+?)(?: error)?: {0,2}(.+) in (.+) on line (\\d+)$");
+		VALUE re_str = rb_str_new2("^(?:PHP )?([^:]+?)(?: error)?: {0,2}(.+) in (.+) on line (\\d+)$");
 		VALUE re_option = rb_const_get(rb_cRegexp, rb_intern("MULTILINE"));
 		VALUE report_re = rb_funcall(rb_cRegexp, rb_intern("new"), 2, re_str, re_option);
 		VALUE m = rb_funcall(argv[0], rb_intern("match"), 1, report_re);
@@ -1381,7 +1445,7 @@ void Init_php_vm()
 
 	// ini
 	zend_try {
-		zend_alter_ini_entry("display_errors", sizeof("display_errors"), "1", sizeof("0")-1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
+		//zend_alter_ini_entry("display_errors", sizeof("display_errors"), "1", sizeof("0")-1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
 		zend_alter_ini_entry("log_errors", sizeof("log_errors"), "1", sizeof("1")-1, PHP_INI_SYSTEM, PHP_INI_STAGE_RUNTIME);
 	} zend_catch {
 	} zend_end_try();
@@ -1403,10 +1467,11 @@ 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.9"));
+	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.3.10"));
 
 	rb_cv_set(rb_mPHPVM, "@@output_handler", Qnil);
 	rb_cv_set(rb_mPHPVM, "@@error_handler", Qnil);
+	rb_cv_set(rb_mPHPVM, "@@last_error_reporting", Qnil);
 
 	// module PHPVM::PHPGlobal
 	rb_mPHPGlobal = rb_define_module_under(rb_mPHPVM, "PHPGlobal");

data/ext/php_vm/php_vm.h

@@ -19,6 +19,11 @@ typedef struct {
 	zval *zobj;
 } PHPNativeResource;
 
+typedef struct {
+	VALUE proc;
+	VALUE args;
+} HandlerArgs;
+
 typedef struct {
 	char *token;
 	VALUE filepath;
@@ -26,7 +31,7 @@ typedef struct {
 
 
 // PHP
-extern void php_eval_string(char *code, int code_len TSRMLS_DC);
+extern VALUE php_eval_string(char *code, int code_len, int use_retval TSRMLS_DC);
 extern void find_zend_class_entry(char *name, int name_len, zend_class_entry ***ce TSRMLS_DC);
 extern int is_exception_zend_class_entry(zend_class_entry *ce TSRMLS_DC);
 extern int is_exception_zval(zval *z TSRMLS_DC);
@@ -53,7 +58,7 @@ extern VALUE rb_php_vm_get_output_handler(VALUE cls);
 extern VALUE rb_php_vm_set_output_handler(VALUE cls, VALUE proc);
 extern VALUE rb_php_vm_get_error_handler(VALUE cls);
 extern VALUE rb_php_vm_set_error_handler(VALUE cls, VALUE proc);
-extern void php_vm_require(char *token, VALUE filepath TSRMLS_DC);
+extern VALUE php_vm_require(char *token, VALUE filepath TSRMLS_DC);
 extern VALUE rb_php_vm_require(VALUE cls, VALUE filepath);
 extern VALUE rb_php_vm_require_once(VALUE cls, VALUE filepath);
 extern VALUE rb_php_vm_include(VALUE cls, VALUE filepath);
@@ -68,7 +73,7 @@ extern VALUE rb_php_vm_define_global(VALUE cls);
 // module PHPVM::PHPGlobal
 extern VALUE rb_php_global_function_call(int argc, VALUE *argv, VALUE self);
 extern VALUE rb_php_global_class_call(VALUE self);
-extern void php_global_require(char *token, VALUE filepath);
+extern VALUE php_global_require(char *token, VALUE filepath);
 extern VALUE rb_php_global_require(VALUE cls, VALUE filepath);
 extern VALUE rb_php_global_require_once(VALUE cls, VALUE filepath);
 extern VALUE rb_php_global_echo(int argc, VALUE *argv, VALUE cls);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: php_vm
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.3.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies: []
 description: php_vm is a native bridge between Ruby and PHP.
 email: