Merge pull request #57 from stesie/call-object_properties_init

More fixes on handling of derived V8Js objects and property export

tests/derived_class_properties.phpt

@@ -0,0 +1,23 @@
+--TEST--
+Test V8::executeString() : Properties on derived class
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
+--FILE--
+<?php
+
+class V8Wrapper extends V8Js {
+    public $testing;
+
+    public function __construct() {
+        parent::__construct();
+        $this->testing = 23;
+    }
+}
+
+$v8 = new V8Wrapper();
+$v8->executeString('print("foo\n");');
+?>
+===EOF===
+--EXPECT--
+foo
+===EOF===

tests/derived_class_properties_extra.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Test V8::executeString() : Extra properties on derived class
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
+--FILE--
+<?php
+
+class V8Wrapper extends V8Js {
+    protected $testing;
+
+    public function __construct() {
+        parent::__construct();
+        $this->testing = 23;
+        $this->extraTesting = 42;
+    }
+}
+
+$v8 = new V8Wrapper();
+$v8->executeString('print(PHP.testing + "\n");');
+$v8->executeString('print(PHP.extraTesting + "\n");');
+?>
+===EOF===
+--EXPECT--
+undefined
+42
+===EOF===

tests/derived_class_properties_init.phpt

@@ -0,0 +1,26 @@
+--TEST--
+Test V8::executeString() : Initialized properties on derived class
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
+--FILE--
+<?php
+
+class V8Wrapper extends V8Js {
+    public $testing = 23;
+    protected $protectedVar = 42;
+    private $privateVar = 42;
+}
+
+$v8 = new V8Wrapper();
+echo($v8->testing."\n");
+$v8->executeString('print(PHP.testing + "\n");');
+$v8->executeString('print(PHP.protectedVar + "\n");');
+$v8->executeString('print(PHP.privateVar + "\n");');
+?>
+===EOF===
+--EXPECT--
+23
+23
+undefined
+undefined
+===EOF===

tests/derived_class_properties_protected.phpt

@@ -0,0 +1,27 @@
+--TEST--
+Test V8::executeString() : Protected and private properties on derived class
+--SKIPIF--
+<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
+--FILE--
+<?php
+
+class V8Wrapper extends V8Js {
+    protected $testing;
+    private $privTesting;
+
+    public function __construct() {
+        parent::__construct();
+        $this->testing = 23;
+        $this->privTesting = 42;
+    }
+}
+
+$v8 = new V8Wrapper();
+$v8->executeString('print(PHP.testing + "\n");');
+$v8->executeString('print(PHP.privTesting + "\n");');
+?>
+===EOF===
+--EXPECT--
+undefined
+undefined
+===EOF===

v8js.cc

@@ -536,6 +536,10 @@ static zend_object_value php_v8js_new(zend_class_entry *ce TSRMLS_DC) /* {{{ */
 	zend_object_std_init(&c->std, ce TSRMLS_CC);
 #if PHP_VERSION_ID >= 50400
 	object_properties_init(&c->std, ce);
+#else
+	zval *tmp;
+	zend_hash_copy(c->std.properties, &ce->default_properties,
+				   (copy_ctor_func_t) zval_add_ref, (void *) &tmp, sizeof(zval *));
 #endif
 
 	retval.handle = zend_objects_store_put(c, NULL, (zend_objects_free_object_storage_t) php_v8js_free_storage, NULL TSRMLS_CC);
@@ -762,7 +766,35 @@ static PHP_METHOD(V8Js, __construct)
 	c->object_name.Reset(c->isolate, object_name_js);
 
 	/* Add the PHP object into global object */
-	V8JS_GLOBAL->Set(object_name_js, php_obj_t->InstanceTemplate()->NewInstance(), v8::ReadOnly);
+	v8::Local<v8::Object> php_obj = php_obj_t->InstanceTemplate()->NewInstance();
+	V8JS_GLOBAL->Set(object_name_js, php_obj, v8::ReadOnly);
+
+	/* Export public property values */
+	HashTable *properties = zend_std_get_properties(getThis());
+	HashPosition pos;
+	zval **value;
+	ulong index;
+	char *member;
+	uint member_len;
+
+	for(zend_hash_internal_pointer_reset_ex(properties, &pos);
+		zend_hash_get_current_data_ex(properties, (void **) &value, &pos) == SUCCESS;
+		zend_hash_move_forward_ex(properties, &pos)) {
+		if(zend_hash_get_current_key_ex(properties, &member, &member_len, &index, 0, &pos) != HASH_KEY_IS_STRING) {
+			continue;
+		}
+
+		zval zmember;
+		ZVAL_STRING(&zmember, member, 0);
+
+		zend_property_info *property_info = zend_get_property_info(c->std.ce, &zmember, 1 TSRMLS_CC);
+		if(property_info && property_info->flags & ZEND_ACC_PUBLIC) {
+			/* Write value to PHP JS object */
+			php_obj->ForceSet(V8JS_SYML(member, member_len - 1), zval_to_v8js(*value, c->isolate TSRMLS_CC), v8::ReadOnly);
+		}
+	}
+
+
 }
 /* }}} */
 
@@ -1296,12 +1328,16 @@ static void php_v8js_write_property(zval *object, zval *member, zval *value ZEND
 {
 	V8JS_BEGIN_CTX(c, object)
 
-	/* Global PHP JS object */
-	v8::Local<v8::String> object_name_js = v8::Local<v8::String>::New(c->isolate, c->object_name);
-	v8::Local<v8::Object> jsobj = V8JS_GLOBAL->Get(object_name_js)->ToObject();
+	/* Check whether member is public, if so, export to V8. */
+	zend_property_info *property_info = zend_get_property_info(c->std.ce, member, 1 TSRMLS_CC);
+	if(property_info->flags & ZEND_ACC_PUBLIC) {
+		/* Global PHP JS object */
+		v8::Local<v8::String> object_name_js = v8::Local<v8::String>::New(c->isolate, c->object_name);
+		v8::Local<v8::Object> jsobj = V8JS_GLOBAL->Get(object_name_js)->ToObject();
 
-	/* Write value to PHP JS object */
-	jsobj->ForceSet(V8JS_SYML(Z_STRVAL_P(member), Z_STRLEN_P(member)), zval_to_v8js(value, c->isolate TSRMLS_CC), v8::ReadOnly);
+		/* Write value to PHP JS object */
+		jsobj->ForceSet(V8JS_SYML(Z_STRVAL_P(member), Z_STRLEN_P(member)), zval_to_v8js(value, c->isolate TSRMLS_CC), v8::ReadOnly);
+	}
 
 	/* Write value to PHP object */
 	std_object_handlers.write_property(object, member, value ZEND_HASH_KEY_CC TSRMLS_CC);