Skip to content

Commit 2b3e904

Browse files
committed
Merge branch 'php7' into php8
2 parents 748310c + acd9431 commit 2b3e904

File tree

4 files changed

+8
-10
lines changed

4 files changed

+8
-10
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Minimum requirements
2121
V8 is written in C++ and is used in Google Chrome, the open source browser from Google.
2222
V8 implements ECMAScript as specified in ECMA-262, 5th edition.
2323

24-
This extension requires V8 6.9 (6.9.427.18 is known to work) or higher.
24+
This extension requires V8 7.5 or higher.
2525

2626
V8 releases are published rather quickly and the V8 team usually provides security support
2727
for the version line shipped with the Chrome browser (stable channel) and newer (only).

config.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ int main ()
140140
set $ac_cv_v8_version
141141
IFS=$ac_IFS
142142
V8_API_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3`
143-
if test "$V8_API_VERSION" -lt 6009000 ; then
144-
AC_MSG_ERROR([libv8 must be version 6.9 or greater])
143+
if test "$V8_API_VERSION" -lt 7005000 ; then
144+
AC_MSG_ERROR([libv8 must be version 7.5 or greater])
145145
fi
146146
AC_DEFINE_UNQUOTED([PHP_V8_API_VERSION], $V8_API_VERSION, [ ])
147147
AC_DEFINE_UNQUOTED([PHP_V8_VERSION], "$ac_cv_v8_version", [ ])

tests/timezones.phpt

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
--TEST--
22
Test V8::executeString() : Check timezone handling
33
--SKIPIF--
4-
SKIP test currently broken, see #378
5-
64
<?php
75
if(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
86
die('SKIP TZ not handled by v8 on Windows');
@@ -39,7 +37,7 @@ try {
3937
?>
4038
===EOF===
4139
--EXPECT--
42-
Thu Mar 20 2014 11:03:24 GMT+0200 (EET)
43-
Thu Mar 20 2014 05:03:24 GMT-0400 (EDT)
44-
Thu Mar 20 2014 11:03:24 GMT+0200 (EET)
45-
===EOF===
40+
Thu Mar 20 2014 11:03:24 GMT+0200 (Eastern European Standard Time)
41+
Thu Mar 20 2014 05:03:24 GMT-0400 (Eastern Daylight Time)
42+
Thu Mar 20 2014 11:03:24 GMT+0200 (Eastern European Standard Time)
43+
===EOF===

v8js_v8.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ void v8js_v8_call(v8js_ctx *c, zval **return_value,
148148
c->tz = strdup(tz);
149149
}
150150
else if (strcmp(c->tz, tz) != 0) {
151-
c->isolate->DateTimeConfigurationChangeNotification();
151+
c->isolate->DateTimeConfigurationChangeNotification(v8::Isolate::TimeZoneDetection::kRedetect);
152152

153153
free(c->tz);
154154
c->tz = strdup(tz);

0 commit comments

Comments
 (0)