Bump required v8 version to 6.6.313, closes #93

Author: pinepain

.travis.yml

@@ -6,7 +6,7 @@ services:
 
 env:
   global:
-    - V8=6.5.144
+    - V8=6.6.313
   matrix:
     - PHP=7.2
     - PHP=7.2 TEST_PHP_ARGS=-m

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.5/include)
-include_directories(/usr/local/opt/v8@6.5/include/libplatform)
+include_directories(/usr/local/opt/v8@6.6/include)
+include_directories(/usr/local/opt/v8@6.6/include/libplatform)
 
 include_directories(/usr/local/include/php)
 include_directories(/usr/local/include/php/TSRM)

README.md

@@ -100,7 +100,7 @@ on top of php-v8 extension and makes embedding JavaScript in PHP easier.
 ### Requirements
 
 #### V8
-You will need a recent v8 Google JavaScript engine version installed. At this time v8 >= 6.5.144 required.
+You will need a recent v8 Google JavaScript engine version installed. At this time v8 >= 6.6.275 required.
 
 #### PHP
 This extension is PHP7-only. It works and tested with both PHP 7.0 and PHP 7.1.

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.5.144
+  V8_MIN_API_VERSION_STR=6.6.275
 
   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.5
+sudo add-apt-repository ppa:pinepain/libv8-6.6
 
 # 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.5 libv8-6.5-dev libv8-6.5-dbg
+sudo apt-get install -y libv8-6.6 libv8-6.6-dev libv8-6.6-dbg
 sudo apt-get install -y dh-make valgrind
 sudo apt-get install -y libssl-dev openssl
 sudo apt-get install -y php7.2 php7.2-cli php7.2-dev php7.2-fpm

scripts/test_v8/hello_world.cpp

@@ -6,15 +6,9 @@
 
 using namespace v8;
 
-void weak_callback(const v8::WeakCallbackInfo<v8::Persistent<v8::String>>& data) {
-  printf("Weak callback called\n");
-  data.GetParameter()->Reset();
-//  data.GetIsolate()->AdjustAmountOfExternalAllocatedMemory(-(1024*1024*1024));
-}
-
 int main(int argc, char* argv[]) {
   // Initialize V8.
-  v8::V8::InitializeICU();
+  //v8::V8::InitializeICU();
 
   std::unique_ptr<v8::Platform> platform = v8::platform::NewDefaultPlatform();
   v8::V8::InitializePlatform(platform.get());

scripts/test_v8/hello_world_build_deb.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ROOT=/opt/libv8-6.5
+ROOT=/opt/libv8-6.6
 LIB_DIR=$ROOT/lib/
 
 SRC_DIR=$ROOT

scripts/test_v8/hello_world_build_osx.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-ROOT=/usr/local/opt/v8@6.5
+ROOT=/usr/local/opt/v8@6.6
 LIB_DIR=$ROOT/lib/
 
 SRC_DIR=$ROOT

src/php_v8_exceptions.h

@@ -81,8 +81,15 @@ extern void php_v8_throw_try_catch_exception(php_v8_context_t *php_v8_context, v
         return; \
     }
 
+#define PHP_V8_THROW_EXCEPTION_WHEN_UNDEFINED_CE(value, message, ce) \
+    if ((value)->IsUndefined()) { \
+        PHP_V8_THROW_EXCEPTION_CE(message, ce); \
+        return; \
+    }
+
 #define PHP_V8_THROW_VALUE_EXCEPTION_WHEN_NOTHING(value, message) PHP_V8_THROW_EXCEPTION_WHEN_NOTHING_CE((value), (message), php_v8_value_exception_class_entry)
 #define PHP_V8_THROW_VALUE_EXCEPTION_WHEN_EMPTY(value, message) PHP_V8_THROW_EXCEPTION_WHEN_EMPTY_CE((value), (message), php_v8_value_exception_class_entry)
+#define PHP_V8_THROW_VALUE_EXCEPTION_WHEN_UNDEFINED(value, message) PHP_V8_THROW_EXCEPTION_WHEN_UNDEFINED_CE((value), (message), php_v8_value_exception_class_entry)
 
 
 #define PHP_V8_THROW_EXCEPTION_WHEN_NOTHING(value, message) \
@@ -97,6 +104,7 @@ extern void php_v8_throw_try_catch_exception(php_v8_context_t *php_v8_context, v
         return; \
     }
 
+
 #define PHP_V8_THROW_EXCEPTION_WHEN_LIMITS_HIT(php_v8_context) \
     if ((php_v8_context)->php_v8_isolate->limits.time_limit_hit || (php_v8_context)->php_v8_isolate->limits.memory_limit_hit) { \
         php_v8_throw_try_catch_exception((php_v8_context), NULL); \

src/php_v8_proxy.cc

@@ -67,7 +67,13 @@ static PHP_METHOD(Proxy, getTarget) {
     PHP_V8_ENTER_STORED_ISOLATE(php_v8_value);
     PHP_V8_ENTER_STORED_CONTEXT(php_v8_value);
 
-    v8::Local<v8::Object> local_target = php_v8_value_get_local_as<v8::Proxy>(php_v8_value)->GetTarget();
+    v8::Local<v8::Value> local_target = php_v8_value_get_local_as<v8::Proxy>(php_v8_value)->GetTarget();
+
+    PHP_V8_THROW_VALUE_EXCEPTION_WHEN_UNDEFINED(local_target, "Failed to get Proxy target"); // this should never happen
+
+    if (local_target->IsNull()) {
+        RETURN_NULL();
+    }
 
     php_v8_get_or_create_value(return_value, local_target, php_v8_value->php_v8_isolate);
 }
@@ -83,7 +89,10 @@ static PHP_METHOD(Proxy, getHandler) {
 
     v8::Local<v8::Value> local_handler = php_v8_value_get_local_as<v8::Proxy>(php_v8_value)->GetHandler();
 
-    if (local_handler->IsUndefined()) {
+    // this should never happen
+    PHP_V8_THROW_VALUE_EXCEPTION_WHEN_UNDEFINED(local_handler, "Failed to get Proxy handler"); // this should never happen
+
+    if (local_handler->IsNull()) {
         RETURN_NULL();
     }
 
@@ -121,10 +130,10 @@ PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 2)
                 ZEND_ARG_OBJ_INFO(0, handler, V8\\ObjectValue, 0)
 ZEND_END_ARG_INFO()
 
-PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getTarget, ZEND_RETURN_VALUE, 0, V8\\ObjectValue, 0)
+PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getTarget, ZEND_RETURN_VALUE, 0, V8\\ObjectValue, 1)
 ZEND_END_ARG_INFO()
 
-PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getHandler, ZEND_RETURN_VALUE, 0, V8\\Value, 0)
+PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getHandler, ZEND_RETURN_VALUE, 0, V8\\ObjectValue, 1)
 ZEND_END_ARG_INFO()
 
 PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_isRevoked, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0)