diff --git a/tests/object_method_call.diff b/tests/object_method_call.diff deleted file mode 100644 index c9a29c3..0000000 --- a/tests/object_method_call.diff +++ /dev/null @@ -1,4 +0,0 @@ -037+ Mon Sep 08 1975 09:00:00 GMT-0700 (PDT) -037- Mon Sep 08 1975 09:00:00 GMT+0200 (EET) -046+ string(6) "-07:00" -046- string(6) "+02:00" \ No newline at end of file diff --git a/tests/object_method_call.exp b/tests/object_method_call.exp deleted file mode 100644 index fae460a..0000000 --- a/tests/object_method_call.exp +++ /dev/null @@ -1,85 +0,0 @@ -array(2) { - [0]=> - string(4) "arg1" - [1]=> - string(4) "arg2" -} -array(3) { - [0]=> - bool(true) - [1]=> - bool(false) - [2]=> - int(1234567890) -} -array(3) { - [0]=> - float(3.14) - [1]=> - int(42) - [2]=> - NULL -} -test4.js:1: TypeError: Testing::mytest() expects at least 2 parameters, 0 given -array(4) { - [0]=> - string(4) "arg1" - [1]=> - string(4) "arg2" - [2]=> - string(4) "arg3" - [3]=> - string(9) "extra_arg" -} - -TEST: Javascript Date -> PHP DateTime -====================================== -Mon Sep 08 1975 09:00:00 GMT+0200 (EET) -array(2) { - [0]=> - object(DateTime)#4 (3) { - ["date"]=> - string(19) "1975-09-08 09:00:00" - ["timezone_type"]=> - int(1) - ["timezone"]=> - string(6) "+02:00" - } - [1]=> - string(3) "foo" -} -array(3) { - [0]=> - object(V8Object)#4 (2) { - ["mytest"]=> - object(V8Function)#6 (0) { - } - ["foo"]=> - string(8) "ORIGINAL" - } - [1]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - [2]=> - array(3) { - [0]=> - string(3) "foo" - [1]=> - string(3) "bar" - [2]=> - object(V8Object)#5 (2) { - ["mytest"]=> - object(V8Function)#6 (0) { - } - ["foo"]=> - string(8) "ORIGINAL" - } - } -} -===EOF=== \ No newline at end of file diff --git a/tests/object_method_call.log b/tests/object_method_call.log deleted file mode 100644 index 22c6a63..0000000 --- a/tests/object_method_call.log +++ /dev/null @@ -1,174 +0,0 @@ - ----- EXPECTED OUTPUT -array(2) { - [0]=> - string(4) "arg1" - [1]=> - string(4) "arg2" -} -array(3) { - [0]=> - bool(true) - [1]=> - bool(false) - [2]=> - int(1234567890) -} -array(3) { - [0]=> - float(3.14) - [1]=> - int(42) - [2]=> - NULL -} -test4.js:1: TypeError: Testing::mytest() expects at least 2 parameters, 0 given -array(4) { - [0]=> - string(4) "arg1" - [1]=> - string(4) "arg2" - [2]=> - string(4) "arg3" - [3]=> - string(9) "extra_arg" -} - -TEST: Javascript Date -> PHP DateTime -====================================== -Mon Sep 08 1975 09:00:00 GMT+0200 (EET) -array(2) { - [0]=> - object(DateTime)#4 (3) { - ["date"]=> - string(19) "1975-09-08 09:00:00" - ["timezone_type"]=> - int(1) - ["timezone"]=> - string(6) "+02:00" - } - [1]=> - string(3) "foo" -} -array(3) { - [0]=> - object(V8Object)#4 (2) { - ["mytest"]=> - object(V8Function)#6 (0) { - } - ["foo"]=> - string(8) "ORIGINAL" - } - [1]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - [2]=> - array(3) { - [0]=> - string(3) "foo" - [1]=> - string(3) "bar" - [2]=> - object(V8Object)#5 (2) { - ["mytest"]=> - object(V8Function)#6 (0) { - } - ["foo"]=> - string(8) "ORIGINAL" - } - } -} -===EOF=== ----- ACTUAL OUTPUT -array(2) { - [0]=> - string(4) "arg1" - [1]=> - string(4) "arg2" -} -array(3) { - [0]=> - bool(true) - [1]=> - bool(false) - [2]=> - int(1234567890) -} -array(3) { - [0]=> - float(3.14) - [1]=> - int(42) - [2]=> - NULL -} -test4.js:1: TypeError: Testing::mytest() expects at least 2 parameters, 0 given -array(4) { - [0]=> - string(4) "arg1" - [1]=> - string(4) "arg2" - [2]=> - string(4) "arg3" - [3]=> - string(9) "extra_arg" -} - -TEST: Javascript Date -> PHP DateTime -====================================== -Mon Sep 08 1975 09:00:00 GMT-0700 (PDT) -array(2) { - [0]=> - object(DateTime)#4 (3) { - ["date"]=> - string(19) "1975-09-08 09:00:00" - ["timezone_type"]=> - int(1) - ["timezone"]=> - string(6) "-07:00" - } - [1]=> - string(3) "foo" -} -array(3) { - [0]=> - object(V8Object)#4 (2) { - ["mytest"]=> - object(V8Function)#6 (0) { - } - ["foo"]=> - string(8) "ORIGINAL" - } - [1]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - [2]=> - array(3) { - [0]=> - string(3) "foo" - [1]=> - string(3) "bar" - [2]=> - object(V8Object)#5 (2) { - ["mytest"]=> - object(V8Function)#6 (0) { - } - ["foo"]=> - string(8) "ORIGINAL" - } - } -} -===EOF=== ----- FAILED diff --git a/tests/object_method_call.out b/tests/object_method_call.out deleted file mode 100644 index c9a794a..0000000 --- a/tests/object_method_call.out +++ /dev/null @@ -1,85 +0,0 @@ -array(2) { - [0]=> - string(4) "arg1" - [1]=> - string(4) "arg2" -} -array(3) { - [0]=> - bool(true) - [1]=> - bool(false) - [2]=> - int(1234567890) -} -array(3) { - [0]=> - float(3.14) - [1]=> - int(42) - [2]=> - NULL -} -test4.js:1: TypeError: Testing::mytest() expects at least 2 parameters, 0 given -array(4) { - [0]=> - string(4) "arg1" - [1]=> - string(4) "arg2" - [2]=> - string(4) "arg3" - [3]=> - string(9) "extra_arg" -} - -TEST: Javascript Date -> PHP DateTime -====================================== -Mon Sep 08 1975 09:00:00 GMT-0700 (PDT) -array(2) { - [0]=> - object(DateTime)#4 (3) { - ["date"]=> - string(19) "1975-09-08 09:00:00" - ["timezone_type"]=> - int(1) - ["timezone"]=> - string(6) "-07:00" - } - [1]=> - string(3) "foo" -} -array(3) { - [0]=> - object(V8Object)#4 (2) { - ["mytest"]=> - object(V8Function)#6 (0) { - } - ["foo"]=> - string(8) "ORIGINAL" - } - [1]=> - array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) - } - [2]=> - array(3) { - [0]=> - string(3) "foo" - [1]=> - string(3) "bar" - [2]=> - object(V8Object)#5 (2) { - ["mytest"]=> - object(V8Function)#6 (0) { - } - ["foo"]=> - string(8) "ORIGINAL" - } - } -} -===EOF=== \ No newline at end of file diff --git a/tests/object_method_call.php b/tests/object_method_call.php deleted file mode 100644 index 8aa4bd5..0000000 --- a/tests/object_method_call.php +++ /dev/null @@ -1,53 +0,0 @@ -myobj = new Testing(); - -$a->executeString("PHP.myobj.mytest('arg1', 'arg2');", "test1.js"); -$a->executeString("PHP.myobj.mytest(true, false, 1234567890);", "test2.js"); -$a->executeString("PHP.myobj.mytest(3.14, 42, null);", "test3.js"); - -// Invalid parameters -try { - $a->executeString("PHP.myobj.mytest();", "test4.js"); -} catch (V8JsException $e) { - echo $e->getMessage(), "\n"; -} - -try { - $a->executeString("PHP.myobj.mytest('arg1', 'arg2', 'arg3', 'extra_arg');", "test5.js"); -} catch (V8JsException $e) { - echo $e->getMessage(), "\n"; -} - -try { - date_default_timezone_set("UTC"); - echo "\nTEST: Javascript Date -> PHP DateTime\n"; - echo "======================================\n"; - $a->executeString("date = new Date('September 8, 1975 09:00:00'); print(date + '\\n'); PHP.myobj.mytest(date, 'foo');", "test6.js"); -} catch (V8JsException $e) { - echo $e->getMessage(), "\n"; -} - -// Array / Object -try { - $a->executeString("PHP.myobj.mytest(PHP.myobj, new Array(1,2,3), new Array('foo', 'bar', PHP.myobj));", "test7.js"); -} catch (V8JsException $e) { - var_dump($e); -} - -?> -===EOF=== diff --git a/tests/object_method_call.phpt b/tests/object_method_call.phpt index 186d4a3..c103bed 100644 --- a/tests/object_method_call.phpt +++ b/tests/object_method_call.phpt @@ -2,6 +2,8 @@ Test V8::executeString() : Calling methods of object passed from PHP --SKIPIF-- +--INI-- +date.timezone=UTC --FILE-- setTimeZone(new DateTimeZone(ini_get('date.timezone'))); + echo $date->format(DateTime::RFC1123), "\n"; + var_dump($b); + } } $a = new V8Js(); @@ -39,10 +47,9 @@ try { } try { - date_default_timezone_set("UTC"); echo "\nTEST: Javascript Date -> PHP DateTime\n"; echo "======================================\n"; - $a->executeString("date = new Date('September 8, 1975 09:00:00'); print(date + '\\n'); PHP.myobj.mytest(date, 'foo');", "test6.js"); + $a->executeString("date = new Date('September 8, 1975 09:00:00 GMT'); print(date.toUTCString() + '\\n'); PHP.myobj.mydatetest(date, 'foo');", "test6.js"); } catch (V8JsException $e) { echo $e->getMessage(), "\n"; } @@ -93,26 +100,18 @@ array(4) { TEST: Javascript Date -> PHP DateTime ====================================== -Mon Sep 08 1975 09:00:00 GMT+0200 (EET) -array(2) { - [0]=> - object(DateTime)#4 (3) { - ["date"]=> - string(19) "1975-09-08 09:00:00" - ["timezone_type"]=> - int(1) - ["timezone"]=> - string(6) "+02:00" - } - [1]=> - string(3) "foo" -} +Mon, 08 Sep 1975 09:00:00 GMT +Mon, 08 Sep 1975 09:00:00 +0000 +string(3) "foo" array(3) { [0]=> - object(V8Object)#4 (2) { + object(V8Object)#4 (3) { ["mytest"]=> object(V8Function)#6 (0) { } + ["mydatetest"]=> + object(V8Function)#7 (0) { + } ["foo"]=> string(8) "ORIGINAL" } @@ -132,8 +131,11 @@ array(3) { [1]=> string(3) "bar" [2]=> - object(V8Object)#5 (2) { + object(V8Object)#5 (3) { ["mytest"]=> + object(V8Function)#7 (0) { + } + ["mydatetest"]=> object(V8Function)#6 (0) { } ["foo"]=> diff --git a/tests/return_value.diff b/tests/return_value.diff deleted file mode 100644 index 020c796..0000000 --- a/tests/return_value.diff +++ /dev/null @@ -1,2 +0,0 @@ -035+ string(6) "-07:00" -035- string(6) "+02:00" \ No newline at end of file diff --git a/tests/return_value.exp b/tests/return_value.exp deleted file mode 100644 index f039dd0..0000000 --- a/tests/return_value.exp +++ /dev/null @@ -1,42 +0,0 @@ -NULL -object(V8Object)#3 (2) { - ["mytest"]=> - object(V8Function)#4 (0) { - } - ["foo"]=> - string(8) "ORIGINAL" -} -array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) -} -array(2) { - [0]=> - string(3) "foo" - [1]=> - string(3) "bar" -} -array(2) { - [0]=> - string(3) "foo" - [1]=> - string(3) "bar" -} -object(DateTime)#3 (3) { - ["date"]=> - string(19) "1975-09-08 09:00:00" - ["timezone_type"]=> - int(1) - ["timezone"]=> - string(6) "+02:00" -} -int(1234567890) -float(123.456789) -string(11) "some string" -bool(true) -bool(false) -===EOF=== \ No newline at end of file diff --git a/tests/return_value.log b/tests/return_value.log deleted file mode 100644 index 7fe13c6..0000000 --- a/tests/return_value.log +++ /dev/null @@ -1,88 +0,0 @@ - ----- EXPECTED OUTPUT -NULL -object(V8Object)#3 (2) { - ["mytest"]=> - object(V8Function)#4 (0) { - } - ["foo"]=> - string(8) "ORIGINAL" -} -array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) -} -array(2) { - [0]=> - string(3) "foo" - [1]=> - string(3) "bar" -} -array(2) { - [0]=> - string(3) "foo" - [1]=> - string(3) "bar" -} -object(DateTime)#3 (3) { - ["date"]=> - string(19) "1975-09-08 09:00:00" - ["timezone_type"]=> - int(1) - ["timezone"]=> - string(6) "+02:00" -} -int(1234567890) -float(123.456789) -string(11) "some string" -bool(true) -bool(false) -===EOF=== ----- ACTUAL OUTPUT -NULL -object(V8Object)#3 (2) { - ["mytest"]=> - object(V8Function)#4 (0) { - } - ["foo"]=> - string(8) "ORIGINAL" -} -array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) -} -array(2) { - [0]=> - string(3) "foo" - [1]=> - string(3) "bar" -} -array(2) { - [0]=> - string(3) "foo" - [1]=> - string(3) "bar" -} -object(DateTime)#3 (3) { - ["date"]=> - string(19) "1975-09-08 09:00:00" - ["timezone_type"]=> - int(1) - ["timezone"]=> - string(6) "-07:00" -} -int(1234567890) -float(123.456789) -string(11) "some string" -bool(true) -bool(false) -===EOF=== ----- FAILED diff --git a/tests/return_value.out b/tests/return_value.out deleted file mode 100644 index 8ca7b75..0000000 --- a/tests/return_value.out +++ /dev/null @@ -1,42 +0,0 @@ -NULL -object(V8Object)#3 (2) { - ["mytest"]=> - object(V8Function)#4 (0) { - } - ["foo"]=> - string(8) "ORIGINAL" -} -array(3) { - [0]=> - int(1) - [1]=> - int(2) - [2]=> - int(3) -} -array(2) { - [0]=> - string(3) "foo" - [1]=> - string(3) "bar" -} -array(2) { - [0]=> - string(3) "foo" - [1]=> - string(3) "bar" -} -object(DateTime)#3 (3) { - ["date"]=> - string(19) "1975-09-08 09:00:00" - ["timezone_type"]=> - int(1) - ["timezone"]=> - string(6) "-07:00" -} -int(1234567890) -float(123.456789) -string(11) "some string" -bool(true) -bool(false) -===EOF=== \ No newline at end of file diff --git a/tests/return_value.php b/tests/return_value.php deleted file mode 100644 index f83de1d..0000000 --- a/tests/return_value.php +++ /dev/null @@ -1,34 +0,0 @@ -myobj = new Testing(); -var_dump($a->executeString($JS, "test.js")); -var_dump($a->executeString("test(PHP.myobj);", "test1.js")); -var_dump($a->executeString("test(new Array(1,2,3));", "test2.js")); -var_dump($a->executeString("test(new Array('foo', 'bar'));", "test3.js")); -var_dump($a->executeString("test(new Array('foo', 'bar'));", "test3.js")); -var_dump($a->executeString("test(new Date('September 8, 1975 09:00:00'));", "test4.js")); -var_dump($a->executeString("test(1234567890);", "test5.js")); -var_dump($a->executeString("test(123.456789);", "test6.js")); -var_dump($a->executeString("test('some string');", "test7.js")); -var_dump($a->executeString("test(true);", "test8.js")); -var_dump($a->executeString("test(false);", "test9.js")); -?> -===EOF=== diff --git a/tests/return_value.phpt b/tests/return_value.phpt index 0cffac3..910cf88 100644 --- a/tests/return_value.phpt +++ b/tests/return_value.phpt @@ -2,6 +2,8 @@ Test V8::executeString() : Return values --SKIPIF-- +--INI-- +date.timezone=UTC --FILE-- executeString("test(PHP.myobj);", "test1.js")); var_dump($a->executeString("test(new Array(1,2,3));", "test2.js")); var_dump($a->executeString("test(new Array('foo', 'bar'));", "test3.js")); var_dump($a->executeString("test(new Array('foo', 'bar'));", "test3.js")); -var_dump($a->executeString("test(new Date('September 8, 1975 09:00:00'));", "test4.js")); +$date = $a->executeString("test(new Date('September 8, 1975 09:00:00 GMT'));", "test4.js"); +$date->setTimeZone(new DateTimeZone('GMT')); +echo $date->format(DateTime::RFC1123), "\n"; var_dump($a->executeString("test(1234567890);", "test5.js")); var_dump($a->executeString("test(123.456789);", "test6.js")); var_dump($a->executeString("test('some string');", "test7.js")); @@ -66,14 +70,7 @@ array(2) { [1]=> string(3) "bar" } -object(DateTime)#3 (3) { - ["date"]=> - string(19) "1975-09-08 09:00:00" - ["timezone_type"]=> - int(1) - ["timezone"]=> - string(6) "+02:00" -} +Mon, 08 Sep 1975 09:00:00 +0000 int(1234567890) float(123.456789) string(11) "some string"