php_vm 1.3.2 → 1.3.3

data/ext/php_vm/php_vm.c

@@ -48,7 +48,7 @@ static void php_embed_error_handler(char *message)
 	}
 }
 
-static void php_vm_catch_exception(zval *ex TSRMLS_DC)
+static void php_vm_exception_hook(zval *ex TSRMLS_DC)
 {
 	VALUE exception = zval_to_value(ex);
 	rb_exc_raise(exception);
@@ -154,6 +154,13 @@ void find_zend_function(zend_class_entry *ce, char *name, int name_len, zend_fun
 	free(lcname);
 }
 
+int has_zend_function(zend_class_entry *ce, VALUE method_name)
+{
+	zend_function *mptr;
+	find_zend_function(ce, RSTRING_PTR(method_name), RSTRING_LEN(method_name), &mptr);
+	return mptr!=NULL;
+}
+
 int new_php_object(zend_class_entry *ce, VALUE v_args, zval *retval)
 {
 	int result = FAILURE;
@@ -240,10 +247,6 @@ void define_php_methods(VALUE v_obj, zend_class_entry *ce, int is_static)
 	// TODO: access scope
 	// TODO: __toString
 	// TODO: __clone
-	// TODO: __call
-	// TODO: __callStatic
-	// TODO: __get
-	// TODO: __set
 	// TODO: __isset
 
 	HashPosition pos;
@@ -254,24 +257,49 @@ void define_php_methods(VALUE v_obj, zend_class_entry *ce, int is_static)
 	while (zend_hash_get_current_data_ex(&ce->function_table, (void **)&mptr, &pos) == SUCCESS) {
 		int flag = mptr->common.fn_flags;
 		const char *fname = mptr->common.function_name;
+		int is_pass_define = 0;
 
 		if (is_static) {
 			// class method
-			if (strcmp("new", fname)==0) {
-				// new => no define
+			if (0<(flag & ZEND_ACC_STATIC)) {
+				if (strcmp("new", fname)==0) {
+					// new => no define
+					is_pass_define = 1;
 
-			} else if (0<(flag & ZEND_ACC_STATIC)) {
-				// other method
-				rb_define_singleton_method(v_obj, fname, rb_php_class_call, -1);
+				} else if (strcmp("__callStatic", fname)==0) {
+					// __callStatic => method_missing
+					rb_define_singleton_method(v_obj, "method_missing", rb_php_class_call_method_missing, -1);
+				}
+
+				// define
+				if (!is_pass_define) {
+					rb_define_singleton_method(v_obj, fname, rb_php_class_call, -1);
+				}
 			}
 		} else {
 			// instance method
-			if (strcmp("__construct", fname)==0 || strcmp(ce->name, fname)==0) {
-				// __construct => no define
+			if (0==(flag & ZEND_ACC_STATIC)) {
+				if (strcmp("__construct", fname)==0 || strcmp(ce->name, fname)==0) {
+					// __construct => no define
+					is_pass_define = 1;
+
+				} else if (strcmp("__call", fname)==0) {
+					// __call => method_missing
+					rb_define_singleton_method(v_obj, "method_missing", rb_php_object_call_method_missing, -1);
+
+				} else if (strcmp("__get", fname)==0) {
+					// __get => method_missing
+					rb_define_singleton_method(v_obj, "method_missing", rb_php_object_call_method_missing, -1);
+
+				} else if (strcmp("__set", fname)==0) {
+					// __set => method_missing
+					rb_define_singleton_method(v_obj, "method_missing", rb_php_object_call_method_missing, -1);
+				}
 
-			} else if (0==(flag & ZEND_ACC_STATIC)) {
 				// other method
-				rb_define_singleton_method(v_obj, fname, rb_php_object_call, -1);
+				if (!is_pass_define) {
+					rb_define_singleton_method(v_obj, fname, rb_php_object_call, -1);
+				}
 			}
 		}
 
@@ -619,7 +647,8 @@ VALUE define_global_constants()
 			case HASH_KEY_IS_STRING:{
 				if (0x61<=string_key[0] && string_key[0]<=0x7a) {
 					// lower case
-					char *string_key2 = malloc(strlen(string_key));
+					char *string_key2 = malloc(strlen(string_key)+1);
+					memcpy(string_key2, string_key, strlen(string_key));
 					string_key2[0] = string_key2[0]-32;
 					if (!rb_const_defined(rb_mPHPGlobal, rb_intern(string_key2))) {
 						rb_define_const(rb_mPHPGlobal, string_key2, zval_to_value(*data));
@@ -699,11 +728,22 @@ VALUE define_global_classes()
 
 	HashTable* ht = Z_ARRVAL_P(z_val);
 	HashPosition pos;
-	zval** data;
+	zval** z_classname;
 
 	zend_hash_internal_pointer_reset_ex(ht, &pos);
-	while (SUCCESS == zend_hash_get_current_data_ex(ht, (void **)&data, &pos)) {
-		rb_define_module_function(rb_mPHPGlobal, Z_STRVAL_P(*data), rb_php_global_class_call, 0);
+	while (SUCCESS == zend_hash_get_current_data_ex(ht, (void **)&z_classname, &pos)) {
+		char *classname = Z_STRVAL_P(*z_classname);
+		int classname_len = Z_STRLEN_P(*z_classname);
+		if (0x41<=classname[0] && classname[0]<=0x5a) {
+			// define class as const if class name is uppercase
+			if (!rb_const_defined(rb_mPHPGlobal, rb_intern(classname))) {
+				VALUE class = rb_php_class_get(rb_cPHPClass, rb_str_new(classname, classname_len));
+				rb_define_const(rb_mPHPGlobal, classname, class);
+			}
+		} else {
+			// define class as module function if class name is lowercase
+			rb_define_module_function(rb_mPHPGlobal, classname, rb_php_global_class_call, 0);
+		}
 		zend_hash_move_forward_ex(ht, &pos);
 	}
 	return Qtrue;
@@ -914,6 +954,17 @@ VALUE rb_php_class_call(int argc, VALUE *argv, VALUE self)
 	return call_php_method_bridge(ce, NULL, callee, argc, argv);
 }
 
+VALUE rb_php_class_call_method_missing(int argc, VALUE *argv, VALUE self)
+{
+	zend_class_entry *ce = get_zend_class_entry(self);
+
+	VALUE name, args;
+	rb_scan_args(argc, argv, "1*", &name, &args);
+	VALUE argv2[2] = {name, args};
+
+	return call_php_method_bridge(ce, NULL, rb_str_new2("__callStatic"), 2, argv2);
+}
+
 
 // class PHPVM::PHPObject
 
@@ -967,6 +1018,40 @@ VALUE rb_php_object_call(int argc, VALUE *argv, VALUE self)
 	return call_php_method_bridge(ce, zobj, callee, argc, argv);
 }
 
+VALUE rb_php_object_call_method_missing(int argc, VALUE *argv, VALUE self)
+{
+	zend_class_entry *ce = get_zend_class_entry(self);
+	zval *zobj = get_zval(self);
+
+	VALUE call_method = rb_str_new2("__call");
+	if (has_zend_function(ce, call_method)) {
+		// __call
+		VALUE name, args;
+		rb_scan_args(argc, argv, "1*", &name, &args);
+		name = rb_str_new2(rb_id2name(SYM2ID(name)));
+		VALUE argv2[2] = {name, args};
+
+		return call_php_method_bridge(ce, zobj, call_method, 2, argv2);
+	} else {
+		// accessor
+		VALUE name, val;
+		rb_scan_args(argc, argv, "11", &name, &val);
+		name = rb_str_new2(rb_id2name(SYM2ID(name)));
+		VALUE argv2[2] = {name, val};
+
+		VALUE is_setter = rb_funcall(name, rb_intern("end_with?"), 1, rb_str_new2("="));
+		if (is_setter) {
+			// __set
+			rb_funcall(name, rb_intern("gsub!"), 2, rb_str_new2("="), rb_str_new2(""));
+			return call_php_method_bridge(ce, zobj, rb_str_new2("__set"), 2, argv2);
+		} else {
+			// __get
+			return call_php_method_bridge(ce, zobj, rb_str_new2("__get"), 1, argv2);
+		}
+	}
+	return Qnil;
+}
+
 
 // class PHPVM::PHPExceptionObject
 
@@ -976,6 +1061,7 @@ VALUE rb_php_exception_object_initialize(int argc, VALUE *argv, VALUE self)
 	return self;
 }
 
+
 // class PHPVM::PHPErrorReporting
 
 VALUE rb_php_error_reporting_initialize(int argc, VALUE *argv, VALUE self)
@@ -988,7 +1074,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);
@@ -1059,11 +1145,11 @@ void Init_php_vm()
 	php_vm_module_init();
 	atexit(php_vm_module_exit);
 
-	zend_throw_exception_hook = php_vm_catch_exception;
+	zend_throw_exception_hook = php_vm_exception_hook;
 
 	// ini
 	zend_try {
-		zend_alter_ini_entry("display_errors", sizeof("display_errors"), "0", 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();
@@ -1085,7 +1171,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.2"));
+	rb_define_const(rb_mPHPVM, "VERSION", rb_str_new2("1.3.3"));
 
 	rb_cv_set(rb_mPHPVM, "@@output_handler", Qnil);
 	rb_cv_set(rb_mPHPVM, "@@error_handler", Qnil);
@@ -1099,8 +1185,6 @@ void Init_php_vm()
 	rb_define_module_function(rb_mPHPGlobal, "print", rb_php_global_print, 1);
 	rb_define_module_function(rb_mPHPGlobal, "array", rb_php_global_array, -1);
 
-	rb_php_vm_define_global(rb_mPHPVM);
-
 	// class PHPVM::PHPClass
 	rb_cPHPClass = rb_define_class_under(rb_mPHPVM, "PHPClass", rb_cObject);
 	rb_define_class_variable(rb_cPHPClass, "@@classes", rb_obj_alloc(rb_cHash));
@@ -1135,4 +1219,6 @@ void Init_php_vm()
 	rb_define_method(rb_ePHPErrorReporting, "error_level", rb_php_error_reporting_error_level, 0);
 	rb_define_method(rb_ePHPErrorReporting, "file", rb_php_error_reporting_file, 0);
 	rb_define_method(rb_ePHPErrorReporting, "line", rb_php_error_reporting_line, 0);
+
+	rb_php_vm_define_global(rb_mPHPVM);
 }

data/ext/php_vm/php_vm.h

@@ -77,6 +77,7 @@ extern VALUE rb_php_class_new(int argc, VALUE *argv, VALUE self);
 extern VALUE rb_php_class_getter(VALUE self);
 extern VALUE rb_php_class_setter(VALUE self, VALUE value);
 extern VALUE rb_php_class_call(int argc, VALUE *argv, VALUE self);
+extern VALUE rb_php_class_call_method_missing(int argc, VALUE *argv, VALUE self);
 
 // class PHPVM::PHPObject
 extern VALUE rb_php_object_initialize(VALUE self, VALUE class, VALUE arg_arr);
@@ -84,6 +85,7 @@ extern VALUE rb_php_object_php_class(VALUE self);
 extern VALUE rb_php_object_getter(VALUE self);
 extern VALUE rb_php_object_setter(VALUE self, VALUE value);
 extern VALUE rb_php_object_call(int argc, VALUE *argv, VALUE self);
+extern VALUE rb_php_object_call_method_missing(int argc, VALUE *argv, VALUE self);
 
 // module
 extern void php_vm_module_init();

metadata

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