mirrors/phpv8
mirrors/phpv8
0
0
Fork 0
mirror of https://github.com/phpv8/v8js.git synced 2025-01-03 13:21:52 +00:00
Code Releases Activity

PHP 5.3 compatibility fixes.

Browse Source
This commit is contained in:
C. Scott Ananian 2013-10-25 17:40:20 -04:00
parent f6a6d1e4b5
commit c341511b36
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
php_v8js_macros.h
View File

@ -63,9 +63,19 @@ extern "C" {
#if ZEND_MODULE_API_NO >= 20100409 #if ZEND_MODULE_API_NO >= 20100409
# define ZEND_HASH_KEY_DC , const zend_literal *key # define ZEND_HASH_KEY_DC , const zend_literal *key
# define ZEND_HASH_KEY_CC , key # define ZEND_HASH_KEY_CC , key
# define ZEND_HASH_KEY_NULL , NULL
#else #else
# define ZEND_HASH_KEY_DC # define ZEND_HASH_KEY_DC
# define ZEND_HASH_KEY_CC # define ZEND_HASH_KEY_CC
# define ZEND_HASH_KEY_NULL
#endif
/* method signatures of zend_update_property and zend_read_property were
* declared as 'char *' instead of 'const char *' before PHP 5.4 */
#if ZEND_MODULE_API_NO >= 20100525
# define V8JS_CONST
#else
# define V8JS_CONST (char *)
#endif #endif
/* Global flags */ /* Global flags */

14
v8js_convert.cc
View File

@ -461,8 +461,8 @@ static void php_v8js_fake_call_impl(const v8::FunctionCallbackInfo<v8::Value>& i
// okay, look up the method name and manually invoke it. // okay, look up the method name and manually invoke it.
const zend_object_handlers *h = Z_OBJ_HT_P(object); const zend_object_handlers *h = Z_OBJ_HT_P(object);
zend_function *method_ptr = zend_function *method_ptr =
h->get_method(&object, (char*)method_name, method_name_len, h->get_method(&object, (char*)method_name, method_name_len
NULL TSRMLS_DC); ZEND_HASH_KEY_NULL TSRMLS_DC);
if (method_ptr == NULL || if (method_ptr == NULL ||
(method_ptr->common.fn_flags & ZEND_ACC_PUBLIC) == 0 || (method_ptr->common.fn_flags & ZEND_ACC_PUBLIC) == 0 ||
(method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) != 0) { (method_ptr->common.fn_flags & (ZEND_ACC_CTOR|ZEND_ACC_DTOR|ZEND_ACC_CLONE)) != 0) {
@ -590,7 +590,7 @@ static inline v8::Local<v8::Value> php_v8js_named_property_callback(v8::Local<v8
} }
if (callback_type == V8JS_PROP_GETTER) { if (callback_type == V8JS_PROP_GETTER) {
/* Nope, not a method -- must be a (case-sensitive) property */ /* Nope, not a method -- must be a (case-sensitive) property */
php_value = zend_read_property(scope, object, name, name_len, true); php_value = zend_read_property(scope, object, V8JS_CONST name, name_len, true);
// special case 'NULL' and return an empty value (indicating that // special case 'NULL' and return an empty value (indicating that
// we don't intercept this property) if the property doesn't // we don't intercept this property) if the property doesn't
// exist. // exist.
@ -599,7 +599,7 @@ static inline v8::Local<v8::Value> php_v8js_named_property_callback(v8::Local<v8
zval *prop; zval *prop;
MAKE_STD_ZVAL(prop); MAKE_STD_ZVAL(prop);
ZVAL_STRINGL(prop, name, name_len, 1); ZVAL_STRINGL(prop, name, name_len, 1);
if (!h->has_property(object, prop, 2, NULL TSRMLS_CC)) if (!h->has_property(object, prop, 2 ZEND_HASH_KEY_NULL TSRMLS_CC))
ret_value = v8::Handle<v8::Value>(); ret_value = v8::Handle<v8::Value>();
else { else {
ret_value = V8JS_NULL; ret_value = V8JS_NULL;
@ -614,7 +614,7 @@ static inline v8::Local<v8::Value> php_v8js_named_property_callback(v8::Local<v8
} else if (callback_type == V8JS_PROP_SETTER) { } else if (callback_type == V8JS_PROP_SETTER) {
MAKE_STD_ZVAL(php_value); MAKE_STD_ZVAL(php_value);
if (v8js_to_zval(set_value, php_value, 0, isolate) == SUCCESS) { if (v8js_to_zval(set_value, php_value, 0, isolate) == SUCCESS) {
zend_update_property(scope, object, name, name_len, php_value); zend_update_property(scope, object, V8JS_CONST name, name_len, php_value);
ret_value = set_value; ret_value = set_value;
} else { } else {
ret_value = v8::Handle<v8::Value>(); ret_value = v8::Handle<v8::Value>();
@ -626,13 +626,13 @@ static inline v8::Local<v8::Value> php_v8js_named_property_callback(v8::Local<v8
MAKE_STD_ZVAL(prop); MAKE_STD_ZVAL(prop);
ZVAL_STRINGL(prop, name, name_len, 1); ZVAL_STRINGL(prop, name, name_len, 1);
if (callback_type == V8JS_PROP_QUERY) { if (callback_type == V8JS_PROP_QUERY) {
if (h->has_property(object, prop, 0, NULL TSRMLS_CC)) { if (h->has_property(object, prop, 0 ZEND_HASH_KEY_NULL TSRMLS_CC)) {
ret_value = v8::Integer::NewFromUnsigned(v8::None); ret_value = v8::Integer::NewFromUnsigned(v8::None);
} else { } else {
ret_value = v8::Handle<v8::Value>(); // empty handle ret_value = v8::Handle<v8::Value>(); // empty handle
} }
} else { } else {
h->unset_property(object, prop, NULL TSRMLS_CC); h->unset_property(object, prop ZEND_HASH_KEY_NULL TSRMLS_CC);
ret_value = V8JS_BOOL(true); ret_value = V8JS_BOOL(true);
} }
zval_ptr_dtor(&prop); zval_ptr_dtor(&prop);