Upgrade to libv8-6.2

Author: pinepain

.gitignore

@@ -22,6 +22,7 @@ config.status
 config.sub
 configure
 configure.in
+configure.ac
 /include
 install-sh
 libtool

.travis.yml

@@ -17,8 +17,8 @@ env:
     - NO_INTERACTION=1
     - TEST_TIMEOUT=120
   matrix:
-    - V8=6.1
-    - V8=6.1 TEST_PHP_ARGS=-m
+    - V8=6.2
+    - V8=6.2 TEST_PHP_ARGS=-m
 
 before_install:
   - sudo add-apt-repository ppa:pinepain/libv8-${V8} -y

CMakeLists.txt

@@ -1,10 +1,10 @@
 cmake_minimum_required(VERSION 3.1)
-project(php_v8)
+project(php-v8)
 
 # NOTE: This CMake file is just for syntax highlighting in CLion
 
-include_directories(/usr/local/opt/v8@6.1/include)
-include_directories(/usr/local/opt/v8@6.1/include/libplatform)
+include_directories(/usr/local/opt/v8@6.2/include)
+include_directories(/usr/local/opt/v8@6.2/include/libplatform)
 
 include_directories(/usr/local/include/php)
 include_directories(/usr/local/include/php/TSRM)

README.md

@@ -73,7 +73,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.1.170.
+You will need a recent v8 Google JavaScript engine version installed. At this time the extension is tested on 6.2.2.
 
 #### PHP
 This extension is PHP7-only. It works and tested with both PHP 7.0 and PHP 7.1.
@@ -96,7 +96,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.1](https://launchpad.net/~pinepain/+archive/ubuntu/libv8-6.1),
+[pinepain/libv8-6.2](https://launchpad.net/~pinepain/+archive/ubuntu/libv8-6.2),
 [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

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

scripts/replace_expect.php

@@ -81,6 +81,10 @@
         }
 
         foreach (array_combine($expectf_search[1], $expectf_replace[1]) as $search => $replace) {
+            $replace = str_replace('\\\\n', '!!(ಠ_ಠ)!!', $replace);
+            $replace = str_replace('\\n', "\n", $replace);
+            $replace = str_replace('!!(ಠ_ಠ)!!', '\\\\n', $replace);
+
             $result = preg_replace($search, $replace, $result);
         }
 

scripts/test_v8/hello_world_build.sh

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

scripts/test_v8/hello_world_build_deb.sh

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

scripts/test_v8/hello_world_build_osx.sh

@@ -70,6 +70,9 @@ $res = $v8_helper->CompileRun($context, $source);
 $helper->line();
 
 $v8_helper->run_checks($res);
+
+// EXPECTF: ---/\["script_id":"V8\\ScriptOrigin":private\]=>\n      int\(\d+\)/
+// EXPECTF: +++["script_id":"V8\ScriptOrigin":private]=>\n      int(%d)
 ?>
 EOF
 --EXPECTF--
@@ -104,7 +107,7 @@ V8\Message->GetScriptOrigin():
         bool(false)
       }
       ["script_id":"V8\ScriptOrigin":private]=>
-      int(19)
+      int(%d)
       ["source_map_url":"V8\ScriptOrigin":private]=>
       string(0) ""
     }
@@ -142,7 +145,7 @@ V8\Message->GetScriptOrigin():
         bool(false)
       }
       ["script_id":"V8\ScriptOrigin":private]=>
-      int(19)
+      int(%d)
       ["source_map_url":"V8\ScriptOrigin":private]=>
       string(0) ""
     }

tests/V8Exception_CreateMessage.phpt

@@ -88,8 +88,10 @@ $isolate->SetCaptureStackTraceForUncaughtExceptions($stack_trace_generation_allo
 $res = $v8_helper->CompileRun($context, $source);
 
 
+// EXPECTF: ---/\["script_id":"V8\\StackFrame":private\]=>\n        int\(\d+\)/
+// EXPECTF: +++["script_id":"V8\StackFrame":private]=>\n        int(%d)
 ?>
---EXPECT--
+--EXPECTF--
 Can get stack trace when out of context: ok
 
 exception: 'Error: test'
@@ -118,7 +120,7 @@ V8\StackTrace->getFrames():
         ["column":"V8\StackFrame":private]=>
         int(15)
         ["script_id":"V8\StackFrame":private]=>
-        int(19)
+        int(%d)
         ["script_name":"V8\StackFrame":private]=>
         string(7) "test.js"
         ["script_name_or_source_url":"V8\StackFrame":private]=>

tests/V8Exception_GetStackTrace.phpt

@@ -62,8 +62,10 @@ $new_script = $unbound->BindToContext($context);
 $helper->dump($new_script->Run($context)->Value());
 $helper->space();
 
+// EXPECTF: ---/V8\\UnboundScript->GetId\(\): int\(\d+\)/
+// EXPECTF: +++V8\UnboundScript->GetId(): int(%d)
 ?>
---EXPECT--
+--EXPECTF--
 UnboundScript representation:
 -----------------------------
 object(V8\UnboundScript)#6 (1) {
@@ -82,7 +84,7 @@ Accessors:
 ----------
 V8\UnboundScript::GetIsolate() matches expected value
 V8\UnboundScript::BindToContext() result is instance of V8\Script
-V8\UnboundScript->GetId(): int(19)
+V8\UnboundScript->GetId(): int(%d)
 V8\UnboundScript->GetScriptName(): V8\StringValue->Value(): string(7) "test.js"
 V8\UnboundScript->GetSourceURL(): V8\UndefinedValue->IsUndefined(): bool(true)
 V8\UnboundScript->GetSourceMappingURL(): V8\StringValue->Value(): string(0) ""