Merge open PRs into php7

Author: stesie

.gitignore

@@ -20,6 +20,7 @@ config.status
 config.sub
 configure
 configure.in
+configure.ac
 *~
 install-sh
 libtool

.travis.yml

@@ -5,11 +5,11 @@ services:
   - docker
 
 env:
-  - V8VER=6.6
+  - V8VER=7.1
     PHPVER=7.0
-  - V8VER=6.6
+  - V8VER=7.1
     PHPVER=7.1
-  - V8VER=6.6
+  - V8VER=7.1
     PHPVER=7.2
 
 script: make -f Makefile.travis test

Dockerfile.travis

@@ -9,7 +9,7 @@ RUN apt-get update -q
 RUN apt-get install -y software-properties-common
 
 RUN add-apt-repository ppa:ondrej/php
-RUN add-apt-repository ppa:pinepain/php -y
+RUN add-apt-repository ppa:stesie/libv8 -y
 RUN apt-get update -q
 
 RUN apt-get install -y php$PHPVER-dev libv8-$V8VER-dev

Makefile.travis

@@ -1,5 +1,5 @@
 # Configure and build scripts for travis CI system
-V8VER ?= 6.6
+V8VER ?= 7.1
 
 IMAGENAME ?= v8js-test
 

README.md

@@ -26,7 +26,7 @@ Minimum requirements
 	V8 is written in C++ and is used in Google Chrome, the open source browser from Google.
 	V8 implements ECMAScript as specified in ECMA-262, 5th edition.
 
-	This extension requires V8 4.6.76 or higher.
+	This extension requires V8 6.9 (6.9.427.18 is known to work) or higher.
 
     V8 releases are published rather quickly and the V8 team usually provides security support
     for the version line shipped with the Chrome browser (stable channel) and newer (only).
@@ -44,7 +44,9 @@ For some very first steps, instead of compiling manually you might want to try o
 image](https://registry.hub.docker.com/u/stesie/v8js/).  It has v8, v8js and php-cli pre-installed
 so you can give it a try with PHP in "interactive mode".  There is no Apache, etc. running however.
 
-For Ubuntu @pinepain has PPAs for [various versions of V8](https://launchpad.net/~pinepain).
+For Ubuntu @stesie has a PPA, based on prior work by @pinepain.
+[See here](https://launchpad.net/~stesie/+archive/ubuntu/libv8/), packaging sources are available
+[from ppa-packaging repository](https://github.com/phpv8/ppa-packaging/tree/stesie/) (*stesie* branch).
 You might want to install these and compile V8Js based on them.
 
 There also is a Heroku extension pack that has recent V8Js versions for PHP 7.x, see
@@ -81,7 +83,6 @@ class V8Js
 
     /**
      * Initializes and starts V8 engine and returns new V8Js object with it's own V8 context.
-     * Snapshots are supported by V8 4.3.7 and higher.
      * @param string $object_name
      * @param array $variables
      * @param array $extensions

Vagrantfile

@@ -19,7 +19,7 @@ Vagrant.configure("2") do |config|
   #
   # mass-define "generic" Ubuntu boxes
   #
-  %w{6.3 6.4 6.5}.each { |version|
+  %w{7.1}.each { |version|
     config.vm.define "v8-#{version}" do |i|
       i.vm.synced_folder ".", "/data/v8js"
 
@@ -31,7 +31,7 @@ Vagrant.configure("2") do |config|
       apt-get install -y software-properties-common gdb tmux git tig curl apache2-utils lcov
 
       add-apt-repository ppa:ondrej/php
-      add-apt-repository ppa:pinepain/libv8-#{version}
+      add-apt-repository ppa:stesie/libv8
       apt-get update
       apt-get install -y php7.1-dev libv8-#{version}-dbg libv8-#{version}-dev
     SHELL

appveyor.yml

@@ -2,22 +2,22 @@ environment:
   matrix:
   - ARTIFACT_NAME: v8js_vc15_php-7.3_%Platform%_ts.zip
     OUTDIR: Release_TS
-    V8_ASSETS: V8-5.8.283.31-%Platform%.zip
-    PHP_VERSION: 7.3.0alpha3
+    V8_ASSETS: V8-7.0.276.11-vc15-%Platform%.zip
+    PHP_VERSION: 7.3.0RC1
   - ARTIFACT_NAME: v8js_vc15_php-7.3_%Platform%_nts.zip
     OUTDIR: Release
     CONFIGURE_EXTRA: --disable-zts
-    V8_ASSETS: V8-5.8.283.31-%Platform%.zip
-    PHP_VERSION: 7.3.0alpha3
+    V8_ASSETS: V8-7.0.276.11-vc15-%Platform%.zip
+    PHP_VERSION: 7.3.0RC1
   - ARTIFACT_NAME: v8js_vc15_php-7.2_%Platform%_ts.zip
     OUTDIR: Release_TS
-    V8_ASSETS: V8-5.8.283.31-%Platform%.zip
-    PHP_VERSION: 7.2.7
+    V8_ASSETS: V8-7.0.276.11-vc15-%Platform%.zip
+    PHP_VERSION: 7.2.10
   - ARTIFACT_NAME: v8js_vc15_php-7.2_%Platform%_nts.zip
     OUTDIR: Release
     CONFIGURE_EXTRA: --disable-zts
-    V8_ASSETS: V8-5.8.283.31-%Platform%.zip
-    PHP_VERSION: 7.2.7
+    V8_ASSETS: V8-7.0.276.11-vc15-%Platform%.zip
+    PHP_VERSION: 7.2.10
 
   PHP_SDK: c:\projects\php-sdk
 
@@ -30,20 +30,21 @@ platform:
 
 install:
   - cd %PHP_SDK%
-  - curl -fSL -o php-sdk-2.1.7beta1.zip "https://github.com/Microsoft/php-sdk-binary-tools/archive/php-sdk-2.1.7beta1.zip"
-  - 7z.exe x php-sdk-2.1.7beta1.zip
-  - move /y php-sdk-binary-tools-php-sdk-2.1.7beta1\* .
-  - for /R /D %%f in (php-sdk-binary-tools-php-sdk-2.1.7beta1\*) do move /y %%f .
+  - curl -fSL -o php-sdk-2.1.9beta1.zip "https://github.com/Microsoft/php-sdk-binary-tools/archive/php-sdk-2.1.9beta1.zip"
+  - 7z.exe x php-sdk-2.1.9beta1.zip
+  - move /y php-sdk-binary-tools-php-sdk-2.1.9beta1\* .
+  - for /R /D %%f in (php-sdk-binary-tools-php-sdk-2.1.9beta1\*) do move /y %%f .
   - call bin\phpsdk_setvars.bat
   - call bin\phpsdk_buildtree.bat v8js-ci
   - cd v8js-ci\vc15\%Platform%
   - md deps
   - cd deps
-  - curl -fSL -o %V8_ASSETS% "https://s3.amazonaws.com/win-phpv8/%V8_ASSETS%"
+  - curl -fSL -o %V8_ASSETS% "https://phpdev.toolsforresearch.com/%V8_ASSETS%"
   - 7z.exe x %V8_ASSETS%
-  - curl -fSL -o libiconv.zip "https://windows.php.net/downloads/php-sdk/deps/vc14/%Platform%/libiconv-1.15-vc14-%Platform%.zip"
+  - dir
+  - curl -fSL -o libiconv.zip "https://windows.php.net/downloads/php-sdk/deps/vc15/%Platform%/libiconv-1.15-3-vc15-%Platform%.zip"
   - 7z.exe x libiconv.zip -y
-  - curl -fSL -o libxml2.zip "https://windows.php.net/downloads/php-sdk/deps/vc14/%Platform%/libxml2-2.9.8-vc14-%Platform%.zip"
+  - curl -fSL -o libxml2.zip "https://windows.php.net/downloads/php-sdk/deps/vc15/%Platform%/libxml2-2.9.8-vc15-%Platform%.zip"
   - 7z.exe x libxml2.zip -y
   - cd ..
   - curl -fSL -o "php-%PHP_VERSION%.tar.gz" "https://github.com/php/php-src/archive/php-%PHP_VERSION%.tar.gz"

config.m4

@@ -43,7 +43,7 @@ if test "$PHP_V8JS" != "no"; then
     old_CPPFLAGS=$CPPFLAGS
     AC_LANG_PUSH([C++])
     CPPFLAGS="-std="$ac_cv_v8_cstd
-    AC_TRY_RUN([int main() { return 0; }],[],[ac_cv_v8_cstd="c++0x"],[])
+    AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])],[],[ac_cv_v8_cstd="c++0x"],[])
     AC_LANG_POP([C++])
     CPPFLAGS=$old_CPPFLAGS
   ]);
@@ -53,27 +53,27 @@ if test "$PHP_V8JS" != "no"; then
     old_CXXFLAGS=$CXXFLAGS
     AC_LANG_PUSH([C++])
     CXXFLAGS="-std="$ac_cv_v8_cstd
-    AC_TRY_RUN([int main() {
+    AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() {
         struct { unsigned int x; } foo = {-1};
         (void) foo;
         return 0;
-    }], [ ac_cv_v8_narrowing="" ], [
+    }]])],[ac_cv_v8_narrowing=""],[
         CXXFLAGS="-Wno-c++11-narrowing -std="$ac_cv_v8_cstd
-        AC_TRY_RUN([int main() {
+        AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() {
             struct { unsigned int x; } foo = {-1};
             (void) foo;
             return 0;
-        }], [ ac_cv_v8_narrowing="-Wno-c++11-narrowing" ], [
+        }]])],[ac_cv_v8_narrowing="-Wno-c++11-narrowing"],[
             CXXFLAGS="-Wno-narrowing -std="$ac_cv_v8_cstd
-            AC_TRY_RUN([int main() {
+            AC_RUN_IFELSE([AC_LANG_SOURCE([[int main() {
                 struct { unsigned int x; } foo = {-1};
                 (void) foo;
                 return 0;
-            }], [ ac_cv_v8_narrowing="-Wno-narrowing" ], [
+            }]])],[ac_cv_v8_narrowing="-Wno-narrowing"],[
                 AC_MSG_ERROR([cannot compile with narrowing])
-            ], [])
-        ], [])
-    ], [])
+            ],[])
+        ],[])
+    ],[])
     AC_LANG_POP([C++])
     CXXFLAGS=$old_CXXFLAGS
   ]);
@@ -83,8 +83,7 @@ if test "$PHP_V8JS" != "no"; then
   old_LDFLAGS=$LDFLAGS
   old_CPPFLAGS=$CPPFLAGS
 
-  AC_LANG_SAVE
-  AC_LANG_CPLUSPLUS
+  AC_LANG_PUSH([C++])
 
   CPPFLAGS="$CPPFLAGS -I$V8_DIR/include -std=$ac_cv_v8_cstd"
   LDFLAGS="$LDFLAGS -L$V8_DIR/$PHP_LIBDIR"
@@ -117,7 +116,7 @@ if test "$PHP_V8JS" != "no"; then
   dnl
   LIBS="$LIBS $V8JS_SHARED_LIBADD"
   AC_CACHE_CHECK(for V8 version, ac_cv_v8_version, [
-AC_TRY_RUN([#include <v8.h>
+AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <v8.h>
 #include <iostream>
 #include <fstream>
 using namespace std;
@@ -132,7 +131,7 @@ int main ()
 		return 0;
 	}
 	return 1;
-}], [ac_cv_v8_version=`cat ./conftestval|awk '{print $1}'`], [ac_cv_v8_version=NONE], [ac_cv_v8_version=NONE])
+}]])],[ac_cv_v8_version=`cat ./conftestval|awk '{print $1}'`],[ac_cv_v8_version=NONE],[ac_cv_v8_version=NONE])
 ])
 
   if test "$ac_cv_v8_version" != "NONE"; then
@@ -197,7 +196,7 @@ int main ()
               [Define unless v8::ArrayBuffer::Allocator::NewDefaultAllocator is usable.])
   fi
 
-  AC_LANG_RESTORE
+  AC_LANG_POP([C++])
   LIBS=$old_LIBS
   LDFLAGS="$old_LDFLAGS"
   CPPFLAGS=$old_CPPFLAGS

config.w32

@@ -15,10 +15,10 @@ if (PHP_V8JS != "no") {
 		ADD_FLAG("CFLAGS_V8JS", "/D __STDC_LIMIT_MACROS");
 
 		// defaults
-		var v8major = 5;
-		var v8minor = 8;
-		var v8build = 301;
-		var v8patch = 0;
+		var v8major = 7;
+		var v8minor = 0;
+		var v8build = 276;
+		var v8patch = 11;
 		var v8pinc = search_paths("v8-version.h", php_usual_include_suspects, null);
 		if (typeof(v8pinc) == "string") {
 			var v8versionh = file_get_contents(v8pinc + '\\v8-version.h');

php_v8js_macros.h

@@ -65,10 +65,6 @@ extern "C" {
 /* V8Js Version */
 #define PHP_V8JS_VERSION "2.1.0"
 
-/* Helper macros */
-#define V8JS_GET_CLASS_NAME(var, obj) \
-	v8::String::Utf8Value var(obj->GetConstructorName());
-
 /* Options */
 #define V8JS_FLAG_NONE			(1<<0)
 #define V8JS_FLAG_FORCE_ARRAY	(1<<1)

tests/timezones.phpt

@@ -1,6 +1,8 @@
 --TEST--
 Test V8::executeString() : Check timezone handling
 --SKIPIF--
+SKIP test currently broken, see #378
+
 <?php
 if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
 	die('SKIP TZ not handled by v8 on Windows');

v8js_array_access.cc

@@ -210,20 +210,22 @@ void v8js_array_access_enumerator(const v8::PropertyCallbackInfo<v8::Array>& inf
 
 	for(int j = 0; j < length; j ++) {
 		if(v8js_array_access_isset_p(object, j)) {
-			result->Set(i ++, V8JS_INT(j));
+			result->Set(isolate->GetEnteredContext(), i ++, V8JS_INT(j));
 		}
 	}
 
-	result->Set(V8JS_STR("length"), V8JS_INT(i));
+	result->Set(isolate->GetEnteredContext(), V8JS_SYM("length"), V8JS_INT(i));
 	info.GetReturnValue().Set(result);
 }
 /* }}} */
 
 
 
-void v8js_array_access_named_getter(v8::Local<v8::String> property, const v8::PropertyCallbackInfo<v8::Value> &info) /* {{{ */
+void v8js_array_access_named_getter(v8::Local<v8::Name> property_name, const v8::PropertyCallbackInfo<v8::Value> &info) /* {{{ */
 {
-	v8::String::Utf8Value cstr(property);
+	v8::Local<v8::String> property = v8::Local<v8::String>::Cast(property_name);
+	v8::Isolate *isolate = info.GetIsolate();
+	v8::String::Utf8Value cstr(isolate, property);
 	const char *name = ToCString(cstr);
 
 	if(strcmp(name, "length") == 0) {
@@ -234,7 +236,6 @@ void v8js_array_access_named_getter(v8::Local<v8::String> property, const v8::Pr
 	v8::Local<v8::Value> ret_value = v8js_named_property_callback(property, info, V8JS_PROP_GETTER);
 
 	if(ret_value.IsEmpty()) {
-		v8::Isolate *isolate = info.GetIsolate();
 		v8::Local<v8::Array> arr = v8::Array::New(isolate);
 		v8::Local<v8::Value> prototype = arr->GetPrototype();
 
@@ -243,7 +244,13 @@ void v8js_array_access_named_getter(v8::Local<v8::String> property, const v8::Pr
 			info.GetReturnValue().Set(ret_value);
 		}
 
-		ret_value = prototype->ToObject()->Get(property);
+		v8::Local<v8::Object> prototype_object;
+		if(!prototype->ToObject(isolate->GetEnteredContext()).ToLocal(&prototype_object)) {
+			/* ehh?  Array.prototype not an object? strange, stop. */
+			info.GetReturnValue().Set(ret_value);
+		}
+
+		prototype_object->Get(isolate->GetEnteredContext(), property).ToLocal(&ret_value);
 	}
 
 	info.GetReturnValue().Set(ret_value);

v8js_array_access.h

@@ -25,7 +25,7 @@ void v8js_array_access_query(uint32_t index,
 				 const v8::PropertyCallbackInfo<v8::Integer>& info);
 
 /* Named Property Handlers */
-void v8js_array_access_named_getter(v8::Local<v8::String> property,
+void v8js_array_access_named_getter(v8::Local<v8::Name> property,
 					const v8::PropertyCallbackInfo<v8::Value> &info);
 
 #endif /* V8JS_ARRAY_ACCESS_H */