[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/date/tests/timezone-configuration.phpt branches/PHP_5_4/ext/date/tests/timezone-configuration.phpt trunk/ext/date/tests/timezone-configuration.phpt

[Pierre Joye]

pajoye                                   Tue, 13 Sep 2011 13:58:03 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=316634

Log:
- skip on win, runtime TZ via putenv is not supported with ext/date

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/date/tests/timezone-configuration.phpt
    U   php/php-src/branches/PHP_5_4/ext/date/tests/timezone-configuration.phpt
    U   php/php-src/trunk/ext/date/tests/timezone-configuration.phpt

Modified: 
php/php-src/branches/PHP_5_3/ext/date/tests/timezone-configuration.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/date/tests/timezone-configuration.phpt     
2011-09-13 13:51:47 UTC (rev 316633)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/timezone-configuration.phpt     
2011-09-13 13:58:03 UTC (rev 316634)
@@ -5,9 +5,18 @@
 --FILE--
 <?php
        putenv('TZ=Europe/Oslo');
+       if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+               date_default_timezone_set('Europe/Oslo');
+       } else {
+               putenv('TZ=Europe/Oslo');
+       }
        echo strtotime("2005-06-18 22:15:44"), "\n";

-       putenv('TZ=Europe/London');
+       if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+               date_default_timezone_set('Europe/London');
+       } else {
+               putenv('TZ=Europe/London');
+       }
        echo strtotime("2005-06-18 22:15:44"), "\n";

        date_default_timezone_set('Europe/Oslo');

Modified: 
php/php-src/branches/PHP_5_4/ext/date/tests/timezone-configuration.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/date/tests/timezone-configuration.phpt     
2011-09-13 13:51:47 UTC (rev 316633)
+++ php/php-src/branches/PHP_5_4/ext/date/tests/timezone-configuration.phpt     
2011-09-13 13:58:03 UTC (rev 316634)
@@ -5,9 +5,18 @@
 --FILE--
 <?php
        putenv('TZ=Europe/Oslo');
+       if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+               date_default_timezone_set('Europe/Oslo');
+       } else {
+               putenv('TZ=Europe/Oslo');
+       }
        echo strtotime("2005-06-18 22:15:44"), "\n";

-       putenv('TZ=Europe/London');
+       if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+               date_default_timezone_set('Europe/London');
+       } else {
+               putenv('TZ=Europe/London');
+       }
        echo strtotime("2005-06-18 22:15:44"), "\n";

        date_default_timezone_set('Europe/Oslo');

Modified: php/php-src/trunk/ext/date/tests/timezone-configuration.phpt
===================================================================
--- php/php-src/trunk/ext/date/tests/timezone-configuration.phpt        
2011-09-13 13:51:47 UTC (rev 316633)
+++ php/php-src/trunk/ext/date/tests/timezone-configuration.phpt        
2011-09-13 13:58:03 UTC (rev 316634)
@@ -5,9 +5,18 @@
 --FILE--
 <?php
        putenv('TZ=Europe/Oslo');
+       if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+               date_default_timezone_set('Europe/Oslo');
+       } else {
+               putenv('TZ=Europe/Oslo');
+       }
        echo strtotime("2005-06-18 22:15:44"), "\n";

-       putenv('TZ=Europe/London');
+       if (defined('PHP_WINDOWS_VERSION_MAJOR')) {
+               date_default_timezone_set('Europe/London');
+       } else {
+               putenv('TZ=Europe/London');
+       }
        echo strtotime("2005-06-18 22:15:44"), "\n";

        date_default_timezone_set('Europe/Oslo');


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php