Ignore "Factory" which is not available with system tzdata Backport various fix from 5.6 --- a/ext/date/tests/bug66985.phpt 2014-10-30 07:32:03.297693403 +0100 +++ b/ext/date/tests/bug66985.phpt 2014-10-30 07:32:45.138877977 +0100 @@ -3,7 +3,7 @@ --FILE-- 3 - [timezone] => Factory -) -DateTimeZone Object -( [timezone_type] => 3 [timezone] => GB-Eire ) From cd93b120c3cfb129bca7365f48015c46abeb0333 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 18 Apr 2015 07:47:47 +0200 Subject: [PATCH] Make date transitions tests more flexible zic in recent glibc (2.20) introduce a new transitionn so use a range to avoid failure when total number of transitions is different (243/244) --- ext/date/tests/DateTimeZone_getTransitions_basic1.phpt | 6 +++--- ext/date/tests/timezone_transitions_get_basic1.phpt | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt index f3640d1..d178080 100644 --- a/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt +++ b/ext/date/tests/DateTimeZone_getTransitions_basic1.phpt @@ -16,7 +16,7 @@ date_default_timezone_set("Europe/London"); // Create a DateTimeZone object $tz = new DateTimeZone("Europe/London"); -$tran = $tz->getTransitions(); +$tran = $tz->getTransitions(-306972000, -37241999); if (!is_array($tran)) { echo "TEST FAILED: Expected an array\n"; @@ -25,14 +25,14 @@ if (!is_array($tran)) { echo "\n-- Total number of transitions: " . count($tran). " --\n"; echo "\n-- Format a sample entry for Spring 1963 --\n"; -var_dump( $tran[97] ); +var_dump( $tran[6] ); ?> ===DONE=== --EXPECT-- *** Testing DateTimeZone::getTransitions() : basic functionality *** --- Total number of transitions: 243 -- +-- Total number of transitions: 18 -- -- Format a sample entry for Spring 1963 -- array(5) { diff --git a/ext/date/tests/timezone_transitions_get_basic1.phpt b/ext/date/tests/timezone_transitions_get_basic1.phpt index eb6cf99..97c5f0c 100644 --- a/ext/date/tests/timezone_transitions_get_basic1.phpt +++ b/ext/date/tests/timezone_transitions_get_basic1.phpt @@ -18,24 +18,24 @@ $tz = timezone_open("Europe/London"); $tran = timezone_transitions_get($tz); -echo "\n-- Get all transitions --\n"; -$tran = timezone_transitions_get($tz); +echo "\n-- Get all 60s transitions --\n"; +$tran = timezone_transitions_get($tz, -306972000, -37241999); var_dump( gettype($tran) ); echo "\n-- Total number of transitions: " . count($tran). " --\n"; echo "\n-- Format a sample entry pfor Spring 1963 --\n"; -var_dump( $tran[97] ); +var_dump( $tran[6] ); ?> ===DONE=== --EXPECT-- *** Testing timezone_transitions_get() : basic functionality *** --- Get all transitions -- +-- Get all 60s transitions -- string(5) "array" --- Total number of transitions: 243 -- +-- Total number of transitions: 18 -- -- Format a sample entry pfor Spring 1963 -- array(5) { -- 2.1.4 From 984f4b09e028b93e6ab3b738d9bde670fca6fc95 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 18 Apr 2015 09:11:39 +0200 Subject: [PATCH] relax bigbang content (new zic) --- ext/date/tests/bug48058.phpt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/date/tests/bug48058.phpt b/ext/date/tests/bug48058.phpt index 46a1918..87d2190 100644 --- a/ext/date/tests/bug48058.phpt +++ b/ext/date/tests/bug48058.phpt @@ -20,10 +20,10 @@ array(5) { ["time"]=> string(%d) "%s" ["offset"]=> - int(3600) + int(%s) ["isdst"]=> - bool(true) + bool(%s) ["abbr"]=> - string(3) "BST" + string(%d) "%s" } 10000002008-02-28T12:00:00+0000 -- 2.1.4 From 3c81e945a3c61ea3ec00eeb946e95a1f9b92b956 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 18 Apr 2015 09:28:29 +0200 Subject: [PATCH] relax test for date < INT32_MIN (new zic) --- ext/date/tests/mktime-3-64bit.phpt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ext/date/tests/mktime-3-64bit.phpt b/ext/date/tests/mktime-3-64bit.phpt index a3649cd..cbb441f 100644 --- a/ext/date/tests/mktime-3-64bit.phpt +++ b/ext/date/tests/mktime-3-64bit.phpt @@ -24,7 +24,7 @@ foreach ($tzs as $tz) { echo "\n"; } ?> ---EXPECT-- +--EXPECTF-- America/Toronto Y: 0 - January 2000-01-01T01:01:01-0500 Y: 69 - January 2069-01-01T01:01:01-0500 @@ -32,11 +32,11 @@ Y: 70 - January 1970-01-01T01:01:01-0500 Y: 71 - January 1971-01-01T01:01:01-0500 Y: 99 - January 1999-01-01T01:01:01-0500 Y: 100 - January 2000-01-01T01:01:01-0500 -Y: 101 - January 0101-01-01T01:01:01-0500 -Y: 105 - January 0105-01-01T01:01:01-0500 -Y: 110 - January 0110-01-01T01:01:01-0500 -Y: 1900 - January 1900-01-01T01:01:01-0500 -Y: 1901 - January 1901-01-01T01:01:01-0500 +Y: 101 - January 0101-01-01T01:01:01-0%d +Y: 105 - January 0105-01-01T01:01:01-0%d +Y: 110 - January 0110-01-01T01:01:01-0%d +Y: 1900 - January 1900-01-01T01:01:01-0%d +Y: 1901 - January 1901-01-01T01:01:01-0%d Y: 1902 - January 1902-01-01T01:01:01-0500 Y: 1999 - January 1999-01-01T01:01:01-0500 Y: 2000 - January 2000-01-01T01:01:01-0500 @@ -49,11 +49,11 @@ Y: 70 - January 1970-01-01T01:01:01+0100 Y: 71 - January 1971-01-01T01:01:01+0100 Y: 99 - January 1999-01-01T01:01:01+0100 Y: 100 - January 2000-01-01T01:01:01+0100 -Y: 101 - January 0101-01-01T01:01:01+0100 -Y: 105 - January 0105-01-01T01:01:01+0100 -Y: 110 - January 0110-01-01T01:01:01+0100 -Y: 1900 - January 1900-01-01T01:01:01+0100 -Y: 1901 - January 1901-01-01T01:01:01+0100 +Y: 101 - January 0101-01-01T01:01:01+0%d +Y: 105 - January 0105-01-01T01:01:01+0%d +Y: 110 - January 0110-01-01T01:01:01+0%d +Y: 1900 - January 1900-01-01T01:01:01+0%d +Y: 1901 - January 1901-01-01T01:01:01+0%d Y: 1902 - January 1902-01-01T01:01:01+0100 Y: 1999 - January 1999-01-01T01:01:01+0100 Y: 2000 - January 2000-01-01T01:01:01+0100 -- 2.1.4 From 3bbfb96e1a1eef0a6cf6891532f9ac419c95dbd8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 18 Apr 2015 09:37:06 +0200 Subject: [PATCH] ignore second value for huge timestamp test (new zic) --- ext/date/tests/getdate_variation7.phpt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/date/tests/getdate_variation7.phpt b/ext/date/tests/getdate_variation7.phpt index 2088fa1..c757ac7 100644 --- a/ext/date/tests/getdate_variation7.phpt +++ b/ext/date/tests/getdate_variation7.phpt @@ -27,7 +27,7 @@ var_dump( getdate($timestamp) ); -- Testing getdate\(\) function by passing float 12.3456789000e10 value to timestamp -- array\(11\) { \["seconds"\]=> - int\((36|0)\) + int\((.+)\) \["minutes"\]=> int\((43|0)\) \["hours"\]=> @@ -53,7 +53,7 @@ array\(11\) { -- Testing getdate\(\) function by passing float -12.3456789000e10 value to timestamp -- array\(11\) { \["seconds"\]=> - int\((44|12|20)\) + int\((.+)\) \["minutes"\]=> int\((39|23)\) \["hours"\]=> -- 2.1.4 From 1302eb7f7275c3f0b2b3af964dde91c44b769bbc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Sat, 18 Apr 2015 10:00:15 +0200 Subject: [PATCH] relax tests with huge year (new zic) --- ext/date/tests/DateTime_add-massive.phpt | 6 +++--- ext/date/tests/DateTime_diff-massive.phpt | 6 +++--- ext/date/tests/DateTime_sub-massive.phpt | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/date/tests/DateTime_add-massive.phpt b/ext/date/tests/DateTime_add-massive.phpt index ca5bef9..6093d05 100644 --- a/ext/date/tests/DateTime_add-massive.phpt +++ b/ext/date/tests/DateTime_add-massive.phpt @@ -10,6 +10,6 @@ define('PHPT_DATETIME_SHOW', PHPT_DATETIME_SHOW_ADD); require 'DateTime_data-massive.inc'; ?> ---EXPECT-- -test_massive_positive: ADD: -333333-01-01 16:18:02 EST + P+666666Y0M0DT0H0M0S = **333333-01-01 16:18:02 EST** -test_massive_negative: ADD: 333333-01-01 16:18:02 EST + P-666666Y0M0DT0H0M0S = **-333333-01-01 16:18:02 EST** +--EXPECTF-- +test_massive_positive: ADD: -333333-01-01 16:18:02 %s + P+666666Y0M0DT0H0M0S = **333333-01-01 16:18:02 %s** +test_massive_negative: ADD: 333333-01-01 16:18:02 %s + P-666666Y0M0DT0H0M0S = **-333333-01-01 16:18:02 %s** diff --git a/ext/date/tests/DateTime_diff-massive.phpt b/ext/date/tests/DateTime_diff-massive.phpt index 2199f84..12a7d0f 100644 --- a/ext/date/tests/DateTime_diff-massive.phpt +++ b/ext/date/tests/DateTime_diff-massive.phpt @@ -10,6 +10,6 @@ define('PHPT_DATETIME_SHOW', PHPT_DATETIME_SHOW_DIFF); require 'DateTime_data-massive.inc'; ?> ---EXPECT-- -test_massive_positive: DIFF: 333333-01-01 16:18:02 EST - -333333-01-01 16:18:02 EST = **P+666666Y0M0DT0H0M0S** -test_massive_negative: DIFF: -333333-01-01 16:18:02 EST - 333333-01-01 16:18:02 EST = **P-666666Y0M0DT0H0M0S** +--EXPECTF-- +test_massive_positive: DIFF: 333333-01-01 16:18:02 %s - -333333-01-01 16:18:02 %s = **P+666666Y0M0DT0H%s** +test_massive_negative: DIFF: -333333-01-01 16:18:02 %s - 333333-01-01 16:18:02 %s = **P-666666Y0M0DT0H%s** diff --git a/ext/date/tests/DateTime_sub-massive.phpt b/ext/date/tests/DateTime_sub-massive.phpt index a0520ec..e143056 100644 --- a/ext/date/tests/DateTime_sub-massive.phpt +++ b/ext/date/tests/DateTime_sub-massive.phpt @@ -10,6 +10,6 @@ define('PHPT_DATETIME_SHOW', PHPT_DATETIME_SHOW_SUB); require 'DateTime_data-massive.inc'; ?> ---EXPECT-- -test_massive_positive: SUB: 333333-01-01 16:18:02 EST - P+666666Y0M0DT0H0M0S = **-333333-01-01 16:18:02 EST** -test_massive_negative: SUB: -333333-01-01 16:18:02 EST - P-666666Y0M0DT0H0M0S = **333333-01-01 16:18:02 EST** +--EXPECTF-- +test_massive_positive: SUB: 333333-01-01 16:18:02 %s - P+666666Y0M0DT0H0M0S = **-333333-01-01 16:18:02 %s** +test_massive_negative: SUB: -333333-01-01 16:18:02 %s - P-666666Y0M0DT0H0M0S = **333333-01-01 16:18:02 %s** -- 2.1.4 From 7cbd8f8b8a662c1e74cb1c97dac6f606f8f477c9 Mon Sep 17 00:00:00 2001 From: krakjoe Date: Thu, 21 Aug 2014 10:03:48 +0100 Subject: [PATCH] remove bogus locale use from test --- ext/standard/tests/strings/setlocale_variation2.phpt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ext/standard/tests/strings/setlocale_variation2.phpt b/ext/standard/tests/strings/setlocale_variation2.phpt index 038ba58..10ae22f 100644 --- a/ext/standard/tests/strings/setlocale_variation2.phpt +++ b/ext/standard/tests/strings/setlocale_variation2.phpt @@ -18,8 +18,11 @@ if (substr(PHP_OS, 0, 3) == 'WIN') { /* setlocale() to set all available locales in the system and check the success count */ echo "*** Testing setlocale() : usage variations ***\n"; -function good_locale($locale) { - return $locale !== 'tt_RU@iqtelif.UTF-8'; +function good_locale($locale) { + /** + * Note: no_NO is a bogus locale and should not be used, see https://bugzilla.redhat.com/show_bug.cgi?id=532487 + **/ + return $locale !== 'tt_RU@iqtelif.UTF-8' && substr($locale, 0, 5) !== "no_NO"; } /* Prototype : array list_system_locales( void ) From 3e6f17673338034724c8b637c214b53a51a9db14 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Oct 2014 10:14:14 +0200 Subject: [PATCH] only no_NO.ISO-8859-1 have to be ignored --- ext/standard/tests/strings/setlocale_variation2.phpt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/standard/tests/strings/setlocale_variation2.phpt b/ext/standard/tests/strings/setlocale_variation2.phpt index 10ae22f..5ebdfe8 100644 --- a/ext/standard/tests/strings/setlocale_variation2.phpt +++ b/ext/standard/tests/strings/setlocale_variation2.phpt @@ -20,9 +20,9 @@ echo "*** Testing setlocale() : usage variations ***\n"; function good_locale($locale) { /** - * Note: no_NO is a bogus locale and should not be used, see https://bugzilla.redhat.com/show_bug.cgi?id=532487 + * Note: no_NO is a bogus locale and should not be used, see https://bugzilla.redhat.com/971416 **/ - return $locale !== 'tt_RU@iqtelif.UTF-8' && substr($locale, 0, 5) !== "no_NO"; + return $locale !== 'tt_RU@iqtelif.UTF-8' && $locale !== 'no_NO.ISO-8859-1'; } /* Prototype : array list_system_locales( void )