Add support for DateTime in datefmt_format

diff --git a/ext/intl/dateformat/dateformat_format.c b/ext/intl/dateformat/dateformat_format.c
index e41b38beb13117090998eb56b5bdf5d65466aa1e..79a679ed6ba64ef3a9a26de193aa407476756d95 100755 (executable)
--- a/ext/intl/dateformat/dateformat_format.c
+++ b/ext/intl/dateformat/dateformat_format.c
@@ -27,6 +27,7 @@
 #include "dateformat_class.h"
 #include "dateformat_format.h"
 #include "dateformat_data.h"
+#include "ext/date/php_date.h"
 
 /* {{{ 
  * Internal function which calls the udat_format
@@ -158,9 +159,30 @@ PHP_FUNCTION(datefmt_format)
                        timestamp = internal_get_timestamp(dfo, hash_arr TSRMLS_CC);
                        INTL_METHOD_CHECK_STATUS( dfo, "datefmt_format: Date formatting failed" )
                        break;
+               case IS_OBJECT: {
+                       zend_class_entry *date_ce = php_date_get_date_ce();
+                       zval retval;
+                       zval *zfuncname;
+                       if(!instanceof_function(Z_OBJCE_P(zarg), date_ce TSRMLS_CC)) {
+                               intl_errors_set(INTL_DATA_ERROR_P(dfo), U_ILLEGAL_ARGUMENT_ERROR, "datefmt_format: object must be an instance of DateTime", 0 TSRMLS_CC );
+                               RETURN_FALSE;
+                       }
+                       INIT_ZVAL(retval);
+                       MAKE_STD_ZVAL(zfuncname);
+                       ZVAL_STRING(zfuncname, "getTimestamp", 1);
+                       if(call_user_function(NULL, &zarg, zfuncname, &retval, 0, NULL) != SUCCESS || Z_TYPE(retval) != IS_LONG) {
+                               intl_errors_set(INTL_DATA_ERROR_P(dfo), U_ILLEGAL_ARGUMENT_ERROR, "datefmt_format: cannot get timestamp", 0 TSRMLS_CC );
+                               zval_ptr_dtor(&zfuncname);
+                               RETURN_FALSE;
+                       }
+                       zval_ptr_dtor(&zfuncname);
+                       p_timestamp = Z_LVAL(retval);
+                       timestamp = p_timestamp*1000;
+               }
+                       break;
                default:
-                       intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-                               "datefmt_format: takes either an array  or an integer timestamp value ", 0 TSRMLS_CC );
+                       intl_errors_set( INTL_DATA_ERROR_P(dfo), U_ILLEGAL_ARGUMENT_ERROR,
+                               "datefmt_format: takes either an array or an integer timestamp value or a DateTime object", 0 TSRMLS_CC );
                        RETURN_FALSE;
        }
 

diff --git a/ext/intl/tests/dateformat_format.phpt b/ext/intl/tests/dateformat_format.phpt
index c4fed041d9b1dbac34bc8113aaf4f856817f3398..e5548196d10316eeab7e9d69cb20e52cb6e735eb 100755 (executable)
--- a/ext/intl/tests/dateformat_format.phpt
+++ b/ext/intl/tests/dateformat_format.phpt
@@ -33,8 +33,8 @@ function ut_main()
                0,
                -1200000,
                1200000,
-               2200000000,
-               -2200000000,
+               2200000000.0,
+               -2200000000.0,
                90099999,
                3600,
                -3600
@@ -70,6 +70,15 @@ function ut_main()
                $localtime_arr2,
                $localtime_arr3
        );
+       
+       $d1 = new DateTime("2010-01-01 01:02:03", new DateTimeZone("UTC"));
+       $d2 = new DateTime("2000-12-31 03:04:05", new DateTimeZone("UTC"));
+       $d2->setTimezone(new DateTimeZone("PDT"));
+       $dates = array(
+               $d1, 
+               $d2,
+               new StdClass(),
+       );
 
        //Test format with input as a timestamp : integer
        foreach( $time_arr as $timestamp_entry){
@@ -111,6 +120,24 @@ function ut_main()
        }
        }
 
+       foreach($dates as $date_entry) {
+               foreach( $locale_arr as $locale_entry ){
+                       foreach( $datetype_arr as $datetype_entry ) {
+                               $res_str .= "\n------------";
+                               $res_str .= "\nDate is: ".var_export($date_entry, true);
+                               $res_str .= "\n------------";
+                               
+                               $fmt = ut_datefmt_create( $locale_entry , $datetype_entry ,$datetype_entry, $timezone, IntlDateFormatter::GREGORIAN );
+                               $formatted1 = ut_datefmt_format( $fmt , $date_entry);
+                               if( intl_get_error_code() == U_ZERO_ERROR){
+                                       $res_str .= "\nFormatted DateTime is : $formatted1";
+                               }else{
+                                       $res_str .= "\nError while formatting as: '".intl_get_error_message()."'";
+                               }
+                       }
+               }
+       }
+
        return $res_str;
 
 }
@@ -285,4 +312,109 @@ Formatted localtime_array is : Dec 17, 1895 12:13:11 AM
 IntlDateFormatter locale= en_US ,datetype = 3 ,timetype =3 
 Formatted localtime_array is : 12/17/95 12:13 AM
 IntlDateFormatter locale= en_US ,datetype = -1 ,timetype =-1 
-Formatted localtime_array is : 18951217 12:13 AM
\ No newline at end of file
+Formatted localtime_array is : 18951217 12:13 AM
+------------
+Date is: DateTime::__set_state(array(
+   'date' => '2010-01-01 01:02:03',
+   'timezone_type' => 3,
+   'timezone' => 'UTC',
+))
+------------
+Formatted DateTime is : Thursday, December 31, 2009 3:02:03 PM GMT-10:00
+------------
+Date is: DateTime::__set_state(array(
+   'date' => '2010-01-01 01:02:03',
+   'timezone_type' => 3,
+   'timezone' => 'UTC',
+))
+------------
+Formatted DateTime is : December 31, 2009 3:02:03 PM GMT-10:00
+------------
+Date is: DateTime::__set_state(array(
+   'date' => '2010-01-01 01:02:03',
+   'timezone_type' => 3,
+   'timezone' => 'UTC',
+))
+------------
+Formatted DateTime is : Dec 31, 2009 3:02:03 PM
+------------
+Date is: DateTime::__set_state(array(
+   'date' => '2010-01-01 01:02:03',
+   'timezone_type' => 3,
+   'timezone' => 'UTC',
+))
+------------
+Formatted DateTime is : 12/31/09 3:02 PM
+------------
+Date is: DateTime::__set_state(array(
+   'date' => '2010-01-01 01:02:03',
+   'timezone_type' => 3,
+   'timezone' => 'UTC',
+))
+------------
+Formatted DateTime is : 20091231 03:02 PM
+------------
+Date is: DateTime::__set_state(array(
+   'date' => '2000-12-30 19:04:05',
+   'timezone_type' => 3,
+   'timezone' => 'America/Los_Angeles',
+))
+------------
+Formatted DateTime is : Saturday, December 30, 2000 5:04:05 PM GMT-10:00
+------------
+Date is: DateTime::__set_state(array(
+   'date' => '2000-12-30 19:04:05',
+   'timezone_type' => 3,
+   'timezone' => 'America/Los_Angeles',
+))
+------------
+Formatted DateTime is : December 30, 2000 5:04:05 PM GMT-10:00
+------------
+Date is: DateTime::__set_state(array(
+   'date' => '2000-12-30 19:04:05',
+   'timezone_type' => 3,
+   'timezone' => 'America/Los_Angeles',
+))
+------------
+Formatted DateTime is : Dec 30, 2000 5:04:05 PM
+------------
+Date is: DateTime::__set_state(array(
+   'date' => '2000-12-30 19:04:05',
+   'timezone_type' => 3,
+   'timezone' => 'America/Los_Angeles',
+))
+------------
+Formatted DateTime is : 12/30/00 5:04 PM
+------------
+Date is: DateTime::__set_state(array(
+   'date' => '2000-12-30 19:04:05',
+   'timezone_type' => 3,
+   'timezone' => 'America/Los_Angeles',
+))
+------------
+Formatted DateTime is : 20001230 05:04 PM
+------------
+Date is: stdClass::__set_state(array(
+))
+------------
+Error while formatting as: 'datefmt_format: object must be an instance of DateTime: U_ILLEGAL_ARGUMENT_ERROR'
+------------
+Date is: stdClass::__set_state(array(
+))
+------------
+Error while formatting as: 'datefmt_format: object must be an instance of DateTime: U_ILLEGAL_ARGUMENT_ERROR'
+------------
+Date is: stdClass::__set_state(array(
+))
+------------
+Error while formatting as: 'datefmt_format: object must be an instance of DateTime: U_ILLEGAL_ARGUMENT_ERROR'
+------------
+Date is: stdClass::__set_state(array(
+))
+------------
+Error while formatting as: 'datefmt_format: object must be an instance of DateTime: U_ILLEGAL_ARGUMENT_ERROR'
+------------
+Date is: stdClass::__set_state(array(
+))
+------------
+Error while formatting as: 'datefmt_format: object must be an instance of DateTime: U_ILLEGAL_ARGUMENT_ERROR'