瀏覽代碼

Merge branch 'php7' into php8

Stefan Siegl 2 年之前
父節點
當前提交
2b3e904dab
共有 4 個文件被更改,包括 8 次插入10 次删除
  1. 1 1
      README.md
  2. 2 2
      config.m4
  3. 4 6
      tests/timezones.phpt
  4. 1 1
      v8js_v8.cc

+ 1 - 1
README.md

@@ -21,7 +21,7 @@ Minimum requirements
 	V8 is written in C++ and is used in Google Chrome, the open source browser from Google.
 	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.
 	V8 implements ECMAScript as specified in ECMA-262, 5th edition.
 
 
-	This extension requires V8 6.9 (6.9.427.18 is known to work) or higher.
+	This extension requires V8 7.5 or higher.
 
 
     V8 releases are published rather quickly and the V8 team usually provides security support
     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).
     for the version line shipped with the Chrome browser (stable channel) and newer (only).

+ 2 - 2
config.m4

@@ -140,8 +140,8 @@ int main ()
     set $ac_cv_v8_version
     set $ac_cv_v8_version
     IFS=$ac_IFS
     IFS=$ac_IFS
     V8_API_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3`
     V8_API_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3`
-    if test "$V8_API_VERSION" -lt 6009000 ; then
-       AC_MSG_ERROR([libv8 must be version 6.9 or greater])
+    if test "$V8_API_VERSION" -lt 7005000 ; then
+       AC_MSG_ERROR([libv8 must be version 7.5 or greater])
     fi
     fi
     AC_DEFINE_UNQUOTED([PHP_V8_API_VERSION], $V8_API_VERSION, [ ])
     AC_DEFINE_UNQUOTED([PHP_V8_API_VERSION], $V8_API_VERSION, [ ])
     AC_DEFINE_UNQUOTED([PHP_V8_VERSION], "$ac_cv_v8_version", [ ])
     AC_DEFINE_UNQUOTED([PHP_V8_VERSION], "$ac_cv_v8_version", [ ])

+ 4 - 6
tests/timezones.phpt

@@ -1,8 +1,6 @@
 --TEST--
 --TEST--
 Test V8::executeString() : Check timezone handling
 Test V8::executeString() : Check timezone handling
 --SKIPIF--
 --SKIPIF--
-SKIP test currently broken, see #378
-
 <?php
 <?php
 if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
 if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
 	die('SKIP TZ not handled by v8 on Windows');
 	die('SKIP TZ not handled by v8 on Windows');
@@ -39,7 +37,7 @@ try {
 ?>
 ?>
 ===EOF===
 ===EOF===
 --EXPECT--
 --EXPECT--
-Thu Mar 20 2014 11:03:24 GMT+0200 (EET)
-Thu Mar 20 2014 05:03:24 GMT-0400 (EDT)
-Thu Mar 20 2014 11:03:24 GMT+0200 (EET)
-===EOF===
+Thu Mar 20 2014 11:03:24 GMT+0200 (Eastern European Standard Time)
+Thu Mar 20 2014 05:03:24 GMT-0400 (Eastern Daylight Time)
+Thu Mar 20 2014 11:03:24 GMT+0200 (Eastern European Standard Time)
+===EOF===

+ 1 - 1
v8js_v8.cc

@@ -148,7 +148,7 @@ void v8js_v8_call(v8js_ctx *c, zval **return_value,
 				c->tz = strdup(tz);
 				c->tz = strdup(tz);
 			}
 			}
 			else if (strcmp(c->tz, tz) != 0) {
 			else if (strcmp(c->tz, tz) != 0) {
-				c->isolate->DateTimeConfigurationChangeNotification();
+				c->isolate->DateTimeConfigurationChangeNotification(v8::Isolate::TimeZoneDetection::kRedetect);
 
 
 				free(c->tz);
 				free(c->tz);
 				c->tz = strdup(tz);
 				c->tz = strdup(tz);