Merge pull request #50 from pinepain/update-to-v8-63

Upgrade to libv8-6.3

Author: pinepain

.travis.yml

@@ -1,40 +1,22 @@
-sudo: required
 dist: trusty
+sudo: required
 
-language: php
-
-php:
-  - 7.1
-  - nightly
-
-matrix:
-  allow_failures:
-    - php: nightly
+services:
+  - docker
 
 env:
   global:
-    - NO_INTERACTION=1
-    - TEST_TIMEOUT=120
+    - V8=6.3
   matrix:
-    - V8=6.2
-    - V8=6.2 TEST_PHP_ARGS=-m
+    - TAG=xenial-v8-63-php-71
+    - TAG=xenial-v8-63-php-71 TEST_PHP_ARGS=-m
+    - TAG=xenial-v8-63-php-72
+    - TAG=xenial-v8-63-php-72 TEST_PHP_ARGS=-m
 
 before_install:
-  - sudo add-apt-repository ppa:pinepain/libv8-${V8} -y
-  - sudo apt-get update -q
-  - sudo apt-get install -y libv8-${V8}-dev
-  - php -i
-  - php-config || true
-
-before_script:
-  - echo 'variables_order = "EGPCS"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-  - phpize && ./configure && make
+  # docker on travis doesn't allow anything before FROM, let's fix that
+  - sed -i -e "s/\${TAG}/$TAG/g" Dockerfile && sed -i -e '1,2d' Dockerfile
+  - docker build -t ${TRAVIS_REPO_SLUG}:${V8}-${PHP} --build-arg TAG=${TAG} .
 
 script:
-  - sh -c "make test | tee result.txt"
-  - sh test-report.sh
-
-addons:
-  apt:
-    packages:
-      - valgrind
+  - docker run -e TEST_PHP_ARGS ${TRAVIS_REPO_SLUG}:${V8}-${PHP} bash -c "make test | tee result.txt; ./test-report.sh"

.valgrind-docker.supp

@@ -0,0 +1,11 @@
+{
+   <docker_specific_report>
+   Memcheck:Free
+   fun:free
+   fun:deallocate
+   fun:deallocate
+   fun:_M_destroy
+   fun:_M_dispose
+   fun:~basic_string
+   ...
+}

.valgrind-v8.supp

@@ -0,0 +1,6 @@
+{
+   <suppress_false_positive_warning_see_v8_issue_6566>
+   Memcheck:Cond
+   fun:_ZN2v88internal20MarkCompactCollector20EmptyMarkingWorklistEv
+   ...
+}

.valgrindrc

@@ -0,0 +1,3 @@
+--gen-suppressions=all
+--suppressions=./.valgrind-v8.supp
+--suppressions=./.valgrind-docker.supp

CMakeLists.txt

@@ -3,8 +3,8 @@ project(php-v8)
 
 # NOTE: This CMake file is just for syntax highlighting in CLion
 
-include_directories(/usr/local/opt/v8@6.2/include)
-include_directories(/usr/local/opt/v8@6.2/include/libplatform)
+include_directories(/usr/local/opt/v8@6.3/include)
+include_directories(/usr/local/opt/v8@6.3/include/libplatform)
 
 include_directories(/usr/local/include/php)
 include_directories(/usr/local/include/php/TSRM)

Dockerfile

@@ -0,0 +1,12 @@
+ARG TAG=xenial-v8-63-php-72
+
+FROM pinepain/php-v8-docker:${TAG}
+
+COPY . /root/php-v8
+COPY ./scripts/provision/.bashrc /root/.bashrc
+
+WORKDIR /root/php-v8
+
+RUN php -i && php-config || true
+
+RUN phpize && ./configure && make

README.md

@@ -48,7 +48,7 @@ $source = new \V8\StringValue($isolate, "'Hello' + ', World!'");
 $script = new \V8\Script($context, $source);
 $result = $script->run($context);
 
-echo $result->toString($context)->value(), PHP_EOL;
+echo $result->value(), PHP_EOL;
 ```
 
 which will output `Hello, World!`. See how it's shorter and more readable than [that C++ version][v8-hello-world]?
@@ -69,7 +69,7 @@ in your IDE and other code-analysis tools.
 ### Requirements
 
 #### V8
-You will need a recent v8 Google JavaScript engine version installed. At this time the extension is tested on 6.2.2.
+You will need a recent v8 Google JavaScript engine version installed. At this time v8 >= 6.3.2 required.
 
 #### PHP
 This extension is PHP7-only. It works and tested with both PHP 7.0 and PHP 7.1.
@@ -92,7 +92,7 @@ $ php --ri v8
 
 While [pinepain/php](https://launchpad.net/~pinepain/+archive/ubuntu/php) PPA targets to contain all necessary
 extensions with dependencies, you may find
-[pinepain/libv8-6.2](https://launchpad.net/~pinepain/+archive/ubuntu/libv8-6.2),
+[pinepain/libv8-6.3](https://launchpad.net/~pinepain/+archive/ubuntu/libv8-6.3),
 [pinepain/libv8-experimental](https://launchpad.net/~pinepain/+archive/ubuntu/libv8-experimental) and
 [pinepain/php-v8](https://launchpad.net/~pinepain/+archive/ubuntu/php-v8) standalone PPAs useful.
 

config.m4

@@ -19,7 +19,7 @@ if test "$PHP_V8" != "no"; then
   SEARCH_PATH="/usr/local /usr"
   SEARCH_FOR="include/v8.h"
 
-  V8_MIN_API_VERSION_STR=6.2.2
+  V8_MIN_API_VERSION_STR=6.3.2
 
   DESIRED_V8_VERSION=`echo "${V8_MIN_API_VERSION_STR}" | $AWK 'BEGIN { FS = "."; } { printf "%s.%s", [$]1, [$]2;}'`
 

scripts/provision/provision.sh

@@ -5,7 +5,7 @@ echo Provisioning...
 # Add Ondřej Surý's PPA with co-installable PHP versions:
 sudo add-apt-repository -y ppa:ondrej/php
 # Add libv8 PPA:
-sudo add-apt-repository ppa:pinepain/libv8-6.2
+sudo add-apt-repository ppa:pinepain/libv8-6.3
 
 # Let's update packages list:
 sudo apt-get update
@@ -19,7 +19,7 @@ sudo apt-get install -y git htop curl pkgconf
 
 
 # Build and development requirements
-sudo apt-get install -y libv8-6.2 libv8-6.2-dev libv8-6.2-dbg
+sudo apt-get install -y libv8-6.3 libv8-6.3-dev libv8-6.3-dbg
 sudo apt-get install -y dh-make valgrind
 sudo apt-get install -y libssl-dev openssl
 sudo apt-get install -y php7.1 php7.1-cli php7.1-dev php7.1-fpm

scripts/test_v8/hello_world.cpp

@@ -78,7 +78,7 @@ int main(int argc, char* argv[]) {
     Local<Value> result = script->Run();
 
     // Convert the result to an UTF8 string and print it.
-    String::Utf8Value utf8(result);
+    String::Utf8Value utf8(isolate, result);
     printf("%s\n", *utf8);
   }