Merge remote-tracking branch 'origin/master' into php7

stesie · stesie · commit c459acd1efd4 · 2016-07-02T22:59:33.000+02:00
diff --git a/README.Linux.md b/README.Linux.md
@@ -31,6 +31,9 @@ Compile latest V8
 
 
 ```
+# Install `build-essential` if you haven't already:
+sudo apt-get install build-essential
+
 # Install `libicu-dev` if you haven't already:
 sudo apt-get install libicu-dev
 
diff --git a/package.xml b/package.xml
@@ -700,5 +700,20 @@ Code Cleanup
 - Removed old examples and pre-phpt test script
    </notes>
   </release>
+  <release>
+   <version>
+    <release>0.6.4</release>
+    <api>0.6.4</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <date>2016-07-02</date>
+   <license uri="http://www.php.net/license">The MIT License (MIT)</license>
+   <notes>
+Fix build against V8 5.3.337 (and higher)
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/php_v8js.h b/php_v8js.h
@@ -25,6 +25,7 @@ extern zend_module_entry v8js_module_entry;
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/php_v8js_macros.h b/php_v8js_macros.h
@@ -172,6 +172,7 @@ void v8js_register_methods(v8::Handle<v8::ObjectTemplate>, v8js_ctx *c);
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js.cc b/v8js.cc
@@ -279,6 +279,7 @@ zend_module_entry v8js_module_entry = {
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_array_access.cc b/v8js_array_access.cc
@@ -255,6 +255,7 @@ void v8js_array_access_named_getter(v8::Local<v8::String> property, const v8::Pr
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_array_access.h b/v8js_array_access.h
@@ -29,3 +29,13 @@ void v8js_array_access_named_getter(v8::Local<v8::String> property,
 					const v8::PropertyCallbackInfo<v8::Value> &info);
 
 #endif /* V8JS_ARRAY_ACCESS_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/v8js_class.cc b/v8js_class.cc
@@ -1266,6 +1266,7 @@ PHP_MINIT_FUNCTION(v8js_class) /* {{{ */
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_class.h b/v8js_class.h
@@ -103,6 +103,7 @@ PHP_MINIT_FUNCTION(v8js_class);
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_commonjs.cc b/v8js_commonjs.cc
@@ -108,3 +108,13 @@ void v8js_commonjs_normalise_identifier(const char *base, const char *identifier
         efree(term);
     }
 }
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/v8js_commonjs.h b/v8js_commonjs.h
@@ -16,3 +16,13 @@
 void v8js_commonjs_normalise_identifier(const char *base, const char *identifier, char *normalised_path, char *module_name);
 
 #endif /* V8JS_COMMONJS_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/v8js_convert.cc b/v8js_convert.cc
@@ -227,7 +227,7 @@ int v8js_to_zval(v8::Handle<v8::Value> jsValue, zval *return_value, int flags, v
 		v8::Local<v8::Object> self = jsValue->ToObject();
 
 		// if this is a wrapped PHP object, then just unwrap it.
-		if (self->InternalFieldCount()) {
+		if (self->InternalFieldCount() == 2) {
 			zend_object *object = reinterpret_cast<zend_object *>(self->GetAlignedPointerFromInternalField(1));
 			zval zval_object;
 			ZVAL_OBJ(&zval_object, object);
@@ -256,6 +256,7 @@ int v8js_to_zval(v8::Handle<v8::Value> jsValue, zval *return_value, int flags, v
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_exceptions.cc b/v8js_exceptions.cc
@@ -81,7 +81,7 @@ void v8js_create_script_exception(zval *return_value, v8::Isolate *isolate, v8::
 			PHPV8_EXPROP(_string, JsTrace, stacktrace_string);
 		}
 
-		if(try_catch->Exception()->IsObject() && try_catch->Exception()->ToObject()->InternalFieldCount()) {
+		if(try_catch->Exception()->IsObject() && try_catch->Exception()->ToObject()->InternalFieldCount() == 2) {
 			zend_object *php_exception = reinterpret_cast<zend_object *>(try_catch->Exception()->ToObject()->GetAlignedPointerFromInternalField(1));
 
 			zend_class_entry *exception_ce = zend_exception_get_default(TSRMLS_C);
@@ -245,6 +245,7 @@ PHP_MINIT_FUNCTION(v8js_exceptions) /* {{{ */
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_exceptions.h b/v8js_exceptions.h
@@ -31,6 +31,7 @@ PHP_MINIT_FUNCTION(v8js_exceptions);
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_methods.cc b/v8js_methods.cc
@@ -512,6 +512,7 @@ void v8js_register_methods(v8::Handle<v8::ObjectTemplate> global, v8js_ctx *c) /
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_object_export.cc b/v8js_object_export.cc
@@ -89,7 +89,7 @@ static void v8js_call_php_func(zend_object *object, zend_function *method_ptr, v
 	if (argc) {
 		fci.params = (zval *) safe_emalloc(argc, sizeof(zval), 0);
 		for (i = 0; i < argc; i++) {
-			if (info[i]->IsObject() && info[i]->ToObject()->InternalFieldCount()) {
+			if (info[i]->IsObject() && info[i]->ToObject()->InternalFieldCount() == 2) {
 				/* This is a PHP object, passed to JS and back. */
 				zend_object *object = reinterpret_cast<zend_object *>(info[i]->ToObject()->GetAlignedPointerFromInternalField(1));
 				ZVAL_OBJ(&fci.params[i], object);
@@ -964,6 +964,7 @@ v8::Handle<v8::Value> v8js_hash_to_jsobj(zval *value, v8::Isolate *isolate TSRML
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_object_export.h b/v8js_object_export.h
@@ -33,3 +33,13 @@ v8::Local<v8::Value> v8js_named_property_callback(v8::Local<v8::String> property
 void v8js_php_callback(const v8::FunctionCallbackInfo<v8::Value>& info);
 
 #endif /* V8JS_OBJECT_EXPORT_H */
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * indent-tabs-mode: t
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */
diff --git a/v8js_timer.cc b/v8js_timer.cc
@@ -151,6 +151,7 @@ void v8js_timer_push(long time_limit, long memory_limit, v8js_ctx *c TSRMLS_DC)
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_timer.h b/v8js_timer.h
@@ -33,6 +33,7 @@ void v8js_timer_push(long time_limit, long memory_limit, v8js_ctx *c TSRMLS_DC);
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_v8.cc b/v8js_v8.cc
@@ -274,7 +274,7 @@ int v8js_get_properties_hash(v8::Handle<v8::Value> jsValue, HashTable *retval, i
 			zval value;
 			ZVAL_UNDEF(&value);
 
-			if (jsVal->IsObject() && jsVal->ToObject()->InternalFieldCount()) {
+			if (jsVal->IsObject() && jsVal->ToObject()->InternalFieldCount() == 2) {
 				/* This is a PHP object, passed to JS and back. */
 				zend_object *object = reinterpret_cast<zend_object *>(jsVal->ToObject()->GetAlignedPointerFromInternalField(1));
 				ZVAL_OBJ(&value, object);
@@ -308,6 +308,7 @@ int v8js_get_properties_hash(v8::Handle<v8::Value> jsValue, HashTable *retval, i
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_v8.h b/v8js_v8.h
@@ -82,6 +82,7 @@ int v8js_get_properties_hash(v8::Handle<v8::Value> jsValue, HashTable *retval, i
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_v8object_class.cc b/v8js_v8object_class.cc
@@ -784,6 +784,7 @@ PHP_MINIT_FUNCTION(v8js_v8object_class) /* {{{ */
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_v8object_class.h b/v8js_v8object_class.h
@@ -65,6 +65,7 @@ PHP_MINIT_FUNCTION(v8js_v8object_class);
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4
diff --git a/v8js_variables.cc b/v8js_variables.cc
@@ -84,6 +84,7 @@ void v8js_register_accessors(std::vector<v8js_accessor_ctx*> *accessor_list, v8:
  * Local variables:
  * tab-width: 4
  * c-basic-offset: 4
+ * indent-tabs-mode: t
  * End:
  * vim600: noet sw=4 ts=4 fdm=marker
  * vim<600: noet sw=4 ts=4

Original file line number	Diff line number	Diff line change
`@@ -108,3 +108,13 @@ void v8js_commonjs_normalise_identifier(const char base, const char identifier`
`108`	`108`	`efree(term);`
`109`	`109`	`}`
`110`	`110`	`}`
	`111`	`+`
	`112`	`+/*`
	`113`	`+ * Local variables:`
	`114`	`+ * tab-width: 4`
	`115`	`+ * c-basic-offset: 4`
	`116`	`+ * indent-tabs-mode: t`
	`117`	`+ * End:`
	`118`	`+ * vim600: noet sw=4 ts=4 fdm=marker`
	`119`	`+ * vim<600: noet sw=4 ts=4`
	`120`	`+ */`