Merge branch 'datefmt_tz_cal_interop'

* datefmt_tz_cal_interop:
  Readded accidentally removed line
  Added IntlDateFormatter::formatObject(). Refactor
  Refactored internal_get_timestamp()
  Unified zval -> UDate conversions

4 files changed, 342 insertions, 92 deletions

diff --git a/ext/intl/dateformat/dateformat_class.c b/ext/intl/dateformat/dateformat_class.c
index d250f75e80..fc4a8b8eb1 100755
--- a/ext/intl/dateformat/dateformat_class.c
+++ b/ext/intl/dateformat/dateformat_class.c
@@ -19,6 +19,7 @@
 #include "php_intl.h"
 #include "dateformat_data.h"
 #include "dateformat_format.h"
+#include "dateformat_format_object.h"
 #include "dateformat_parse.h"
 #include "dateformat.h"
 #include "dateformat_attr.h"
@@ -121,6 +122,12 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_format, 0, 0, 0)
 	ZEND_ARG_INFO(0, array)
 ZEND_END_ARG_INFO()
 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_intldateformatter_format_object, 0, 0, 1)
+	ZEND_ARG_INFO(0, object)
+	ZEND_ARG_INFO(0, format)
+	ZEND_ARG_INFO(0, locale)
+ZEND_END_ARG_INFO()
+
 ZEND_BEGIN_ARG_INFO(arginfo_intldateformatter_getdatetype, 0)
 ZEND_END_ARG_INFO()
 
@@ -171,6 +178,7 @@ static zend_function_entry IntlDateFormatter_class_functions[] = {
 	PHP_NAMED_FE( setLenient, ZEND_FN( datefmt_set_lenient ), arginfo_intldateformatter_setlenient )
 	PHP_NAMED_FE( isLenient, ZEND_FN( datefmt_is_lenient ), arginfo_intldateformatter_getdatetype )
 	PHP_NAMED_FE( format, ZEND_FN( datefmt_format ), arginfo_intldateformatter_format )
+	PHP_ME_MAPPING( formatObject, datefmt_format_object, arginfo_intldateformatter_format_object, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
 	PHP_NAMED_FE( parse, ZEND_FN( datefmt_parse), datefmt_parse_args )
 	PHP_NAMED_FE( localtime, ZEND_FN( datefmt_localtime ), datefmt_parse_args )
 	PHP_NAMED_FE( getErrorCode, ZEND_FN( datefmt_get_error_code ), arginfo_intldateformatter_getdatetype )
diff --git a/ext/intl/dateformat/dateformat_format.c b/ext/intl/dateformat/dateformat_format.c
index 82f825f140..d5a17f91cd 100755
--- a/ext/intl/dateformat/dateformat_format.c
+++ b/ext/intl/dateformat/dateformat_format.c
@@ -21,15 +21,13 @@
 #include <unicode/ustring.h>
 #include <unicode/ucal.h>
 
-#include "php_intl.h"
-#include "intl_convert.h"
+#include "../php_intl.h"
+#include "../intl_convert.h"
+#include "../common/common_date.h"
 #include "dateformat.h"
 #include "dateformat_class.h"
 #include "dateformat_format.h"
 #include "dateformat_data.h"
-/* avoid redefinition of int8_t, already defined in unicode/pwin32.h */
-#define _MSC_STDINT_H_ 1
-#include "ext/date/php_date.h"
 
 /* {{{ 
  * Internal function which calls the udat_format
@@ -61,20 +59,38 @@ static void internal_format(IntlDateFormatter_object *dfo, UDate timestamp, zval
 /* {{{ 
  * Internal function which fetches an element from the passed array for the key_name passed 
 */
-static double internal_get_arr_ele(IntlDateFormatter_object *dfo, HashTable* hash_arr, char* key_name TSRMLS_DC)
+static int32_t internal_get_arr_ele(IntlDateFormatter_object *dfo,
+		HashTable* hash_arr, char* key_name, intl_error *err TSRMLS_DC)
 {
-	zval**  ele_value       = NULL;
-	UDate result = -1;
-
-        if( zend_hash_find( hash_arr, key_name, strlen(key_name) + 1, (void **)&ele_value ) == SUCCESS ){
-                if( Z_TYPE_PP(ele_value)!= IS_LONG ){
-			intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-				"datefmt_format: parameter array does not contain a long element.", 0 TSRMLS_CC );
-                }else{
-			result =  Z_LVAL_PP(ele_value);
+	zval	**ele_value	= NULL;
+	int32_t	result		= 0;
+	char	*message;
+
+	if (U_FAILURE(err->code)) {
+		return result;
+	}
+
+	if (zend_hash_find(hash_arr, key_name, strlen(key_name) + 1,
+			(void **)&ele_value) == SUCCESS) {
+		if(Z_TYPE_PP(ele_value) != IS_LONG) {
+			spprintf(&message, 0, "datefmt_format: parameter array contains "
+					"a non-integer element for key '%s'", key_name);
+			intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, message, 1 TSRMLS_CC);
+			efree(message);
+		} else {
+			if (Z_LVAL_PP(ele_value) > INT32_MAX ||
+					Z_LVAL_PP(ele_value) < INT32_MIN) {
+				spprintf(&message, 0, "datefmt_format: value %ld is out of "
+						"bounds for a 32-bit integer in key '%s'",
+						Z_LVAL_PP(ele_value), key_name);
+				intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, message, 1 TSRMLS_CC);
+				efree(message);
+			} else {
+				result = Z_LVAL_PP(ele_value);
+			}
 		}
 	}
-	/* printf("\n Inside internal_get_arr_ele key_name= %s, result = %g \n", key_name, result); */
+
 	return result;
 }
 /* }}} */
@@ -82,41 +98,49 @@ static double internal_get_arr_ele(IntlDateFormatter_object *dfo, HashTable* has
 /* {{{ 
  * Internal function which sets UCalendar  from the passed array and retrieves timestamp
 */
-static UDate internal_get_timestamp(IntlDateFormatter_object *dfo, HashTable* hash_arr  TSRMLS_DC)
+static UDate internal_get_timestamp(IntlDateFormatter_object *dfo,
+		HashTable *hash_arr TSRMLS_DC)
 {
-	long year =0;
-	long month =0;
-	long hour =0;
-	long minute =0;
-	long second =0;
-	long wday =0;
-	long yday =0;
-	long mday =0;
-	UBool isInDST = FALSE;
-	const UCalendar *pcal;
+	int32_t		year,
+				month,
+				hour,
+				minute,
+				second,
+				mday;
+	UCalendar	*pcal;
+	intl_error	*err = &dfo->datef_data.error;
+
+#define INTL_GET_ELEM(elem) \
+	internal_get_arr_ele(dfo, hash_arr, (elem), err TSRMLS_CC)
 
 	/* Fetch  values from the incoming array */
-	year = internal_get_arr_ele( dfo, hash_arr, CALENDAR_YEAR TSRMLS_CC) + 1900; /* tm_year is years since 1900 */
+	year	= INTL_GET_ELEM(CALENDAR_YEAR) + 1900; /* tm_year is years since 1900 */
 	/* Month in ICU and PHP starts from January =0 */
-	month = internal_get_arr_ele( dfo, hash_arr, CALENDAR_MON TSRMLS_CC);
-	hour = internal_get_arr_ele( dfo, hash_arr, CALENDAR_HOUR TSRMLS_CC);
-	minute = internal_get_arr_ele( dfo, hash_arr, CALENDAR_MIN TSRMLS_CC);
-	second = internal_get_arr_ele( dfo, hash_arr, CALENDAR_SEC TSRMLS_CC);
-	wday = internal_get_arr_ele( dfo, hash_arr, CALENDAR_WDAY TSRMLS_CC);
-	yday = internal_get_arr_ele( dfo, hash_arr, CALENDAR_YDAY TSRMLS_CC);
-	isInDST = internal_get_arr_ele( dfo, hash_arr, CALENDAR_ISDST TSRMLS_CC);
+	month	= INTL_GET_ELEM(CALENDAR_MON);
+	hour	= INTL_GET_ELEM(CALENDAR_HOUR);
+	minute	= INTL_GET_ELEM(CALENDAR_MIN);
+	second	= INTL_GET_ELEM(CALENDAR_SEC);
 	/* For the ucal_setDateTime() function, this is the 'date'  value */
-	mday = internal_get_arr_ele( dfo, hash_arr, CALENDAR_MDAY TSRMLS_CC);
+	mday	= INTL_GET_ELEM(CALENDAR_MDAY);
 
-	pcal = udat_getCalendar(DATE_FORMAT_OBJECT(dfo));
-	/* set the incoming values for the calendar */
-	ucal_setDateTime( pcal, year, month, mday, hour, minute, second, &INTL_DATA_ERROR_CODE(dfo));
-	if( INTL_DATA_ERROR_CODE(dfo) != U_ZERO_ERROR){
+#undef INTL_GET_ELEM
+
+	pcal = ucal_clone(udat_getCalendar(DATE_FORMAT_OBJECT(dfo)),
+			&INTL_DATA_ERROR_CODE(dfo));
+
+	if (INTL_DATA_ERROR_CODE(dfo) != U_ZERO_ERROR) {
+		intl_errors_set(err, INTL_DATA_ERROR_CODE(dfo), "datefmt_format: "
+				"error cloning calendar", 0 TSRMLS_CC);
 		return 0;
 	}
+
+	/* set the incoming values for the calendar */
+	ucal_setDateTime(pcal, year, month, mday, hour, minute, second, &INTL_DATA_ERROR_CODE(dfo));
+	/* actually, ucal_setDateTime cannot fail */
 	
 	/* Fetch the timestamp from the UCalendar */
-	return ucal_getMillis(pcal, &INTL_DATA_ERROR_CODE(dfo) );
+	return ucal_getMillis(pcal, &INTL_DATA_ERROR_CODE(dfo));
+	udat_close(pcal);
 }
 
 
@@ -126,70 +150,39 @@ static UDate internal_get_timestamp(IntlDateFormatter_object *dfo, HashTable* ha
  * Format the time value as a string. }}}*/
 PHP_FUNCTION(datefmt_format) 
 {
-	UDate 		timestamp =0;
-	UDate 		p_timestamp =0;
-	HashTable*      hash_arr        = NULL;
-	zval*		zarg	= NULL;
+	UDate 		timestamp	= 0;
+	HashTable	*hash_arr	= NULL;
+	zval		*zarg		= NULL;
 
 	DATE_FORMAT_METHOD_INIT_VARS;
 
 	/* Parse parameters. */
-	if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oz", &object, IntlDateFormatter_ce_ptr,&zarg ) == FAILURE )
-	{
-		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_format: unable to parse input params", 0 TSRMLS_CC );
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oz",
+			&object, IntlDateFormatter_ce_ptr, &zarg) == FAILURE) {
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_format: unable "
+				"to parse input params", 0 TSRMLS_CC );
 		RETURN_FALSE;
 	}
 
-	/* Fetch the object. */
 	DATE_FORMAT_METHOD_FETCH_OBJECT;
 
-	switch(Z_TYPE_P(zarg) ){
-		case IS_LONG:
-			p_timestamp = Z_LVAL_P(zarg) ;
-			timestamp = p_timestamp * 1000;
-			break;
-		case IS_DOUBLE:
-			/* timestamp*1000 since ICU expects it in milliseconds */
-			p_timestamp = Z_DVAL_P(zarg) ;
-			timestamp = p_timestamp * 1000;
-			break;
-		case IS_ARRAY:
-			hash_arr = Z_ARRVAL_P(zarg);
-			if( !hash_arr || zend_hash_num_elements( hash_arr ) == 0 )
-				RETURN_FALSE;
-
-			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 TSRMLS_CC) != 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;
+	if (Z_TYPE_P(zarg) == IS_ARRAY) {
+		hash_arr = Z_ARRVAL_P(zarg);
+		if (!hash_arr || zend_hash_num_elements(hash_arr) == 0) {
+			RETURN_FALSE;
 		}
-			break;
-		default:
-			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 );
+
+		timestamp = internal_get_timestamp(dfo, hash_arr TSRMLS_CC);
+		INTL_METHOD_CHECK_STATUS(dfo, "datefmt_format: date formatting failed")
+	} else {
+		timestamp = intl_zval_to_millis(zarg, INTL_DATA_ERROR_P(dfo),
+				"datefmt_format" TSRMLS_CC);
+		if (U_FAILURE(INTL_DATA_ERROR_CODE(dfo))) {
 			RETURN_FALSE;
+		}
 	}
-
-	internal_format( dfo, timestamp, return_value TSRMLS_CC);
 	
+	internal_format( dfo, timestamp, return_value TSRMLS_CC);
 }
 
 /* }}} */
diff --git a/ext/intl/dateformat/dateformat_format_object.cpp b/ext/intl/dateformat/dateformat_format_object.cpp
new file mode 100644
index 0000000000..e8981faa26
--- /dev/null
+++ b/ext/intl/dateformat/dateformat_format_object.cpp
@@ -0,0 +1,230 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Gustavo Lopes <cataphract@php.net>                          |
+   +----------------------------------------------------------------------+
+*/
+
+#include "../intl_cppshims.h"
+
+#include <unicode/calendar.h>
+#include <unicode/gregocal.h>
+#include <unicode/datefmt.h>
+#include <unicode/smpdtfmt.h>
+#include <unicode/locid.h>
+
+#include "../intl_convertcpp.h"
+
+extern "C" {
+#include "../php_intl.h"
+#include "../locale/locale.h"
+#define USE_CALENDAR_POINTER 1
+#include "../calendar/calendar_class.h"
+#include <ext/date/php_date.h>
+#include "../common/common_date.h"
+}
+
+static const DateFormat::EStyle valid_styles[] = {
+		DateFormat::kNone,
+		DateFormat::kFull,
+		DateFormat::kLong,
+		DateFormat::kMedium,
+		DateFormat::kShort,
+		DateFormat::kFullRelative,
+		DateFormat::kLongRelative,
+		DateFormat::kMediumRelative,
+		DateFormat::kShortRelative,
+};
+
+static bool valid_format(zval **z) {
+	if (Z_TYPE_PP(z) == IS_LONG) {
+		long lval = Z_LVAL_PP(z);
+		for (int i = 0; i < sizeof(valid_styles) / sizeof(*valid_styles); i++) {
+			if ((long)valid_styles[i] == lval) {
+				return true;
+			}
+		}
+	}
+
+	return false;
+}
+
+U_CFUNC PHP_FUNCTION(datefmt_format_object)
+{
+	zval				*object,
+						**format = NULL;
+	const char			*locale_str	= NULL;
+	int					locale_len;
+	bool				pattern		= false;
+	UDate				date;
+	TimeZone			*timeZone	= NULL;
+	UErrorCode			status		= U_ZERO_ERROR;
+	DateFormat			*df			= NULL;
+	Calendar			*cal		= NULL;
+	DateFormat::EStyle	dateStyle = DateFormat::kDefault,
+						timeStyle = DateFormat::kDefault;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "o|Zs!",
+			&object, &format, &locale_str, &locale_len) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	if (!locale_str) {
+		locale_str = intl_locale_get_default(TSRMLS_C);
+	}
+
+	if (format == NULL || Z_TYPE_PP(format) == IS_NULL) {
+		//nothing
+	} else if (Z_TYPE_PP(format) == IS_ARRAY) {
+		HashTable		*ht	= Z_ARRVAL_PP(format);
+		HashPosition	pos	= {0};
+		zval			**z;
+		if (zend_hash_num_elements(ht) != 2) {
+			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+					"datefmt_format_object: bad format; if array, it must have "
+					"two elements", 0 TSRMLS_CC);
+			RETURN_FALSE;
+		}
+
+		zend_hash_internal_pointer_reset_ex(ht, &pos);
+		zend_hash_get_current_data_ex(ht, (void**)&z, &pos);
+		if (!valid_format(z)) {
+			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+					"datefmt_format_object: bad format; the date format (first "
+					"element of the array) is not valid", 0 TSRMLS_CC);
+			RETURN_FALSE;
+		}
+		dateStyle = (DateFormat::EStyle)Z_LVAL_PP(z);
+
+		zend_hash_move_forward_ex(ht, &pos);
+		zend_hash_get_current_data_ex(ht, (void**)&z, &pos);
+		if (!valid_format(z)) {
+			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+					"datefmt_format_object: bad format; the time format ("
+					"second element of the array) is not valid", 0 TSRMLS_CC);
+			RETURN_FALSE;
+		}
+		timeStyle = (DateFormat::EStyle)Z_LVAL_PP(z);
+	} else if (Z_TYPE_PP(format) == IS_LONG) {
+		if (!valid_format(format)) {
+			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+					"datefmt_format_object: the date/time format type is invalid",
+					0 TSRMLS_CC);
+			RETURN_FALSE;
+		}
+		dateStyle = timeStyle = (DateFormat::EStyle)Z_LVAL_PP(format);
+	} else {
+		convert_to_string_ex(format);
+		if (Z_STRLEN_PP(format) == 0) {
+			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+					"datefmt_format_object: the format is empty", 0 TSRMLS_CC);
+			RETURN_FALSE;
+		}
+		pattern = true;
+	}
+
+	//there's no support for relative time in ICU yet
+	timeStyle = (DateFormat::EStyle)(timeStyle & ~DateFormat::kRelative);
+
+	zend_class_entry *instance_ce = Z_OBJCE_P(object);
+	if (instanceof_function(instance_ce, Calendar_ce_ptr TSRMLS_CC)) {
+		Calendar *obj_cal = calendar_fetch_native_calendar(object TSRMLS_CC);
+		if (obj_cal == NULL) {
+			intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+					"datefmt_format_object: bad IntlCalendar instance: "
+					"not initialized properly", 0 TSRMLS_CC);
+			RETURN_FALSE;
+		}
+		timeZone = obj_cal->getTimeZone().clone();
+		date = obj_cal->getTime(status);
+		if (U_FAILURE(status)) {
+			intl_error_set(NULL, status,
+					"datefmt_format_object: error obtaining instant from "
+					"IntlCalendar", 0 TSRMLS_CC);
+			RETVAL_FALSE;
+			goto cleanup;
+		}
+		cal = obj_cal->clone();
+	} else if (instanceof_function(instance_ce, php_date_get_date_ce() TSRMLS_CC)) {
+		if (intl_datetime_decompose(object, &date, &timeZone, NULL,
+				"datefmt_format_object" TSRMLS_CC) == FAILURE) {
+			RETURN_FALSE;
+		}
+		cal = new GregorianCalendar(Locale::createFromName(locale_str), status);
+		if (U_FAILURE(status)) {
+			intl_error_set(NULL, status,
+					"datefmt_format_object: could not create GregorianCalendar",
+					0 TSRMLS_CC);
+			RETVAL_FALSE;
+			goto cleanup;
+		}
+	} else {
+		intl_error_set(NULL, status, "datefmt_format_object: the passed object "
+				"must be an instance of either IntlCalendar or DateTime",
+				0 TSRMLS_CC);
+		RETURN_FALSE;
+	}
+
+	if (pattern) {
+		 df = new SimpleDateFormat(
+				UnicodeString(Z_STRVAL_PP(format), Z_STRLEN_PP(format),
+						UnicodeString::kInvariant),
+				Locale::createFromName(locale_str),
+				status);
+
+		if (U_FAILURE(status)) {
+			intl_error_set(NULL, status,
+					"datefmt_format_object: could not create SimpleDateFormat",
+					0 TSRMLS_CC);
+			RETVAL_FALSE;
+			goto cleanup;
+		}
+	} else {
+		df = DateFormat::createDateTimeInstance(dateStyle, timeStyle,
+				Locale::createFromName(locale_str));
+
+		if (df == NULL) { /* according to ICU sources, this should never happen */
+			intl_error_set(NULL, status,
+					"datefmt_format_object: could not create DateFormat",
+					0 TSRMLS_CC);
+			RETVAL_FALSE;
+			goto cleanup;
+		}
+	}
+
+	//must be in this order (or have the cal adopt the tz)
+	df->adoptCalendar(cal);
+	cal = NULL;
+	df->adoptTimeZone(timeZone);
+	timeZone = NULL;
+
+	{
+		UnicodeString result = UnicodeString();
+		df->format(date, result);
+
+		Z_TYPE_P(return_value) = IS_STRING;
+		if (intl_charFromString(result, &Z_STRVAL_P(return_value),
+				&Z_STRLEN_P(return_value), &status) == FAILURE) {
+			intl_error_set(NULL, status,
+					"datefmt_format_object: error converting result to UTF-8",
+					0 TSRMLS_CC);
+			RETVAL_FALSE;
+			goto cleanup;
+		}
+	}
+
+
+cleanup:
+	delete df;
+	delete timeZone;
+	delete cal;
+}
diff --git a/ext/intl/dateformat/dateformat_format_object.h b/ext/intl/dateformat/dateformat_format_object.h
new file mode 100644
index 0000000000..d80ea87e0f
--- /dev/null
+++ b/ext/intl/dateformat/dateformat_format_object.h
@@ -0,0 +1,19 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Gustavo Lopes <cataphract@php.net>                          |
+   +----------------------------------------------------------------------+
+ */
+
+#include <php.h>
+
+PHP_FUNCTION(datefmt_format_object);