14 files changed, 1022 insertions, 427 deletions

diff --git a/ext/intl/dateformat/dateformat.c b/ext/intl/dateformat/dateformat.c
index 8aded18bd6..fb83eeef05 100644
--- a/ext/intl/dateformat/dateformat.c
+++ b/ext/intl/dateformat/dateformat.c
@@ -17,12 +17,9 @@
 #include "config.h"
 #endif
 
-#include <unicode/ustring.h>
 #include <unicode/udat.h>
-#include <unicode/ucal.h>
 
 #include "php_intl.h"
-#include "intl_convert.h"
 #include "dateformat_class.h"
 #include "dateformat.h"
 
@@ -67,157 +64,6 @@ void dateformat_register_constants( INIT_FUNC_ARGS )
 }
 /* }}} */
 
-/* {{{ */
-static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
-{
-    char*       locale;
-	int         locale_len = 0;
-	zval*       object;
-    long        date_type = 0;
-    long        time_type = 0;
-    long        calendar = UCAL_GREGORIAN;
-    char*       timezone_str = NULL;
-    int         timezone_str_len = 0;
-    char*       pattern_str = NULL;
-    int         pattern_str_len = 0;
-    UChar*      svalue = NULL;		/* UTF-16 pattern_str */
-    int         slength = 0;
-    UChar*      timezone_utf16 = NULL;		/* UTF-16 timezone_str */
-    int         timezone_utf16_len = 0;
-	UCalendar   ucal_obj = NULL;
-	IntlDateFormatter_object* dfo;
-	
-	intl_error_reset( NULL TSRMLS_CC );
-	object = return_value;
-	/* Parse parameters. */
-    if( zend_parse_parameters( ZEND_NUM_ARGS() TSRMLS_CC, "sll|sls",
-		&locale, &locale_len, &date_type, &time_type, &timezone_str, &timezone_str_len, &calendar,&pattern_str, &pattern_str_len ) == FAILURE )
-    {
-		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,	"datefmt_create: unable to parse input parameters", 0 TSRMLS_CC );
-		zval_dtor(return_value);
-		RETURN_NULL();
-    }
-
-	INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
-	
-	if (calendar != UCAL_TRADITIONAL && calendar != UCAL_GREGORIAN) {
-		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_create: "
-				"invalid value for calendar type; it must be one of "
-				"IntlDateFormatter::TRADITIONAL (locale's default calendar) "
-				"or IntlDateFormatter::GREGORIAN", 0 TSRMLS_CC);
-		goto error;
-	}
-	
-	DATE_FORMAT_METHOD_FETCH_OBJECT_NO_CHECK;
-	
-	if (DATE_FORMAT_OBJECT(dfo) != NULL) {
-		intl_errors_set(INTL_DATA_ERROR_P(dfo), U_ILLEGAL_ARGUMENT_ERROR,
-				"datefmt_create: cannot call constructor twice", 0 TSRMLS_CC);
-		return;
-	}
-	
-	/* Convert pattern (if specified) to UTF-16. */
-	if( pattern_str && pattern_str_len>0 ){
-		intl_convert_utf8_to_utf16(&svalue, &slength,
-				pattern_str, pattern_str_len, &INTL_DATA_ERROR_CODE(dfo));
-		if (U_FAILURE(INTL_DATA_ERROR_CODE(dfo))) {
-			/* object construction -> only set global error */
-			intl_error_set(NULL, INTL_DATA_ERROR_CODE(dfo), "datefmt_create: "
-					"error converting pattern to UTF-16", 0 TSRMLS_CC);
-			goto error;
-		}
-	}
-	
-	/* resources allocated from now on */
-
-	/* Convert pattern (if specified) to UTF-16. */
-	if( timezone_str && timezone_str_len >0 ){
-		intl_convert_utf8_to_utf16(&timezone_utf16, &timezone_utf16_len,
-				timezone_str, timezone_str_len, &INTL_DATA_ERROR_CODE(dfo));
-		if (U_FAILURE(INTL_DATA_ERROR_CODE(dfo))) {
-			intl_error_set(NULL, INTL_DATA_ERROR_CODE(dfo), "datefmt_create: "
-					"error converting timezone_str to UTF-16", 0 TSRMLS_CC);
-			goto error;
-		}
-	}
-
-	if(locale_len == 0) {
-		locale = INTL_G(default_locale);
-	}
-
-	if( pattern_str && pattern_str_len>0 ){
-		DATE_FORMAT_OBJECT(dfo) = udat_open(UDAT_IGNORE, UDAT_IGNORE, locale, timezone_utf16, timezone_utf16_len, svalue, slength, &INTL_DATA_ERROR_CODE(dfo));
-	} else {
-		DATE_FORMAT_OBJECT(dfo) = udat_open(time_type, date_type, locale, timezone_utf16, timezone_utf16_len, svalue, slength, &INTL_DATA_ERROR_CODE(dfo));
-	}
-
-    if (!U_FAILURE(INTL_DATA_ERROR_CODE(dfo))) {
-		if (calendar != UCAL_TRADITIONAL) {
-			ucal_obj = ucal_open(timezone_utf16, timezone_utf16_len, locale,
-					calendar, &INTL_DATA_ERROR_CODE(dfo));
-			if (!U_FAILURE(INTL_DATA_ERROR_CODE(dfo))) {
-				udat_setCalendar(DATE_FORMAT_OBJECT(dfo), ucal_obj);
-				ucal_close(ucal_obj);
-			} else {
-				intl_error_set(NULL, INTL_DATA_ERROR_CODE(dfo), "datefmt_create"
-						": error opening calendar", 0 TSRMLS_CC);
-				goto error;
-			}
-		}
-    } else {
-		intl_error_set(NULL, INTL_DATA_ERROR_CODE(dfo),	"datefmt_create: date "
-				"formatter creation failed", 0 TSRMLS_CC);
-		goto error;
-	}
-
-	/* Set the class variables */
-	dfo->date_type = date_type;
-	dfo->time_type = time_type;
-	dfo->calendar  = calendar;
-	if( timezone_str && timezone_str_len > 0){
-		dfo->timezone_id = estrndup( timezone_str, timezone_str_len);
-	}
-	
-error:
-	if (svalue) {
-		efree(svalue);
-	}
-	if (timezone_utf16) {
-		efree(timezone_utf16);
-	}
-	if (U_FAILURE(intl_error_get_code(NULL TSRMLS_CC))) {
-		/* free_object handles partially constructed instances fine */
-		zval_dtor(return_value);
-		RETVAL_NULL();
-	}
-}
-/* }}} */
-
-/* {{{ proto IntlDateFormatter IntlDateFormatter::create(string $locale, long date_type, long time_type[, string $timezone_str, long $calendar, string $pattern] )
- * Create formatter. }}} */
-/* {{{ proto IntlDateFormatter datefmt_create(string $locale, long date_type, long time_type[, string $timezone_str, long $calendar, string $pattern] )
- 
- * Create formatter.
- */
-PHP_FUNCTION( datefmt_create )
-{
-    object_init_ex( return_value, IntlDateFormatter_ce_ptr );
-	datefmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-/* }}} */
-
-/* {{{ proto void IntlDateFormatter::__construct(string $locale, long date_type, long time_type[, string $timezone_str, long $calendar, string $pattern])
- * IntlDateFormatter object constructor.
- */
-PHP_METHOD( IntlDateFormatter, __construct )
-{
-	/* return_value param is being changed, therefore we will always return
-	 * NULL here */
-	return_value = getThis();
-	datefmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU);
-}
-/* }}} */
-
 /* {{{ proto int IntlDateFormatter::getErrorCode()
  * Get formatter's last error code. }}} */
 /* {{{ proto int datefmt_get_error_code( IntlDateFormatter $nf )
diff --git a/ext/intl/dateformat/dateformat_attr.c b/ext/intl/dateformat/dateformat_attr.c
index b8c5f25e3a..bf6b544667 100644
--- a/ext/intl/dateformat/dateformat_attr.c
+++ b/ext/intl/dateformat/dateformat_attr.c
@@ -25,39 +25,6 @@
 
 #include <unicode/ustring.h>
 #include <unicode/udat.h>
-#include <unicode/ucal.h>
-
-static void internal_set_calendar(IntlDateFormatter_object *dfo, char* timezone_id, int timezone_id_len, int calendar, zval* return_value TSRMLS_DC){
-	int         timezone_utf16_len = 0;
-	UChar*      timezone_utf16  = NULL; /* timezone_id in UTF-16 */
-	char*       locale = NULL;
-
-	UCalendar*   ucal_obj = NULL;
-
-	/* check for the validity  of value of calendar passed */
-	intl_error_reset( NULL TSRMLS_CC );
-	if( calendar > 1){
-		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"datefmt_set_calendar: calendar value specified is out of valid range", 0 TSRMLS_CC);
-		RETURN_FALSE;
-	}
-
-	/* Convert timezone to UTF-16. */
-	intl_convert_utf8_to_utf16(&timezone_utf16, &timezone_utf16_len, timezone_id, timezone_id_len, &INTL_DATA_ERROR_CODE(dfo));
-	INTL_METHOD_CHECK_STATUS(dfo, "Error converting timezone to UTF-16" );
-
-	/* Get the locale for the dateformatter */
-	locale = (char *)udat_getLocaleByType(DATE_FORMAT_OBJECT(dfo), ULOC_ACTUAL_LOCALE, &INTL_DATA_ERROR_CODE(dfo));
-
-	/* Set the calendar if passed */
-	ucal_obj = ucal_open(timezone_utf16, timezone_utf16_len, locale, calendar, &INTL_DATA_ERROR_CODE(dfo) );
-	udat_setCalendar( DATE_FORMAT_OBJECT(dfo), ucal_obj );
-	INTL_METHOD_CHECK_STATUS(dfo, "Error setting the calendar.");
-
-	if( timezone_utf16){
-		efree(timezone_utf16);
-	}
-}
 
 /* {{{ proto unicode IntlDateFormatter::getDateType( )
  * Get formatter datetype. }}} */
@@ -111,97 +78,6 @@ PHP_FUNCTION( datefmt_get_timetype )
 }
 /* }}} */
 
-
-/* {{{ proto unicode IntlDateFormatter::getCalendar( )
- * Get formatter calendar. }}} */
-/* {{{ proto string datefmt_get_calendar( IntlDateFormatter $mf )
- * Get formatter calendar.
- */
-PHP_FUNCTION( datefmt_get_calendar )
-{
-	DATE_FORMAT_METHOD_INIT_VARS;
-
-	/* Parse parameters. */
-	if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, IntlDateFormatter_ce_ptr ) == FAILURE )
-	{
-		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,	
-			"datefmt_get_calendar: unable to parse input params", 0 TSRMLS_CC );
-		RETURN_FALSE;
-	}
-
-	/* Fetch the object. */
-	DATE_FORMAT_METHOD_FETCH_OBJECT;
-
-	INTL_METHOD_CHECK_STATUS(dfo, "Error getting formatter calendar." );
-
-	RETURN_LONG(dfo->calendar);
-}
-/* }}} */
-
-/* {{{ proto unicode IntlDateFormatter::getTimeZoneId( )
- * Get formatter timezone_id. }}} */
-/* {{{ proto string datefmt_get_timezone_id( IntlDateFormatter $mf )
- * Get formatter timezone_id.
- */
-PHP_FUNCTION( datefmt_get_timezone_id )
-{
-	DATE_FORMAT_METHOD_INIT_VARS;
-
-	/* Parse parameters. */
-	if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &object, IntlDateFormatter_ce_ptr ) == FAILURE )
-	{
-		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,	
-			"datefmt_get_timezone_id: unable to parse input params", 0 TSRMLS_CC );
-		RETURN_FALSE;
-	}
-
-	/* Fetch the object. */
-	DATE_FORMAT_METHOD_FETCH_OBJECT;
-
-	INTL_METHOD_CHECK_STATUS(dfo, "Error getting formatter timezone_id." );
-
-	if( dfo->timezone_id ){
-		RETURN_STRING((char*)dfo->timezone_id, TRUE );
-	}else{
-		RETURN_NULL();
-	}
-}
-
-/* {{{ proto boolean IntlDateFormatter::setTimeZoneId( $timezone_id)
- * Set formatter timezone_id. }}} */
-/* {{{ proto boolean datefmt_set_timezone_id( IntlDateFormatter $mf,$timezone_id)
- * Set formatter timezone_id.
- */
-PHP_FUNCTION( datefmt_set_timezone_id )
-{
-	char* 		timezone_id 		= NULL;
-	int 		timezone_id_len 	= 0;
-
-	DATE_FORMAT_METHOD_INIT_VARS;
-
-	/* Parse parameters. */
-	if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &object, IntlDateFormatter_ce_ptr,&timezone_id, &timezone_id_len) == FAILURE )
-	{
-		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"datefmt_set_timezone_id: unable to parse input params", 0 TSRMLS_CC );
-		RETURN_FALSE;
-	}
-
-	/* Fetch the object. */
-	DATE_FORMAT_METHOD_FETCH_OBJECT;
-
-	/* set the timezone for the calendar */
-	internal_set_calendar( dfo, timezone_id, timezone_id_len, dfo->calendar, return_value TSRMLS_CC );
-
-	/* Set the IntlDateFormatter variable */
-        if( dfo->timezone_id ){
-		efree(dfo->timezone_id);
-	}
-	dfo->timezone_id = estrndup(timezone_id, timezone_id_len);
-
-	RETURN_TRUE;
-}
-
 /* {{{ proto string IntlDateFormatter::getPattern( )
  * Get formatter pattern. }}} */
 /* {{{ proto string datefmt_get_pattern( IntlDateFormatter $mf )
@@ -370,43 +246,3 @@ PHP_FUNCTION( datefmt_set_lenient )
 	udat_setLenient(DATE_FORMAT_OBJECT(dfo), (UBool)isLenient );
 }
 /* }}} */
-
-/* {{{ proto bool IntlDateFormatter::setPattern( int $calendar )
- * Set formatter calendar. }}} */
-/* {{{ proto bool datefmt_set_calendar( IntlDateFormatter $mf, int $calendar )
- * Set formatter calendar.
- */
-PHP_FUNCTION( datefmt_set_calendar )
-{
-	long	calendar = 0;
-
-	DATE_FORMAT_METHOD_INIT_VARS;
-
-	/* Parse parameters. */
-	if( zend_parse_method_parameters( ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol",
-		&object, IntlDateFormatter_ce_ptr, &calendar ) == FAILURE ) {
-		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"datefmt_set_calendar: unable to parse input params", 0 TSRMLS_CC);
-		RETURN_FALSE;
-	}
-
-	/* check for the validity  of value of calendar passed */
-	intl_error_reset( NULL TSRMLS_CC );
-	if (calendar > 1) {
-		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
-			"datefmt_set_calendar: calendar value specified is out of valid range", 0 TSRMLS_CC);
-		RETURN_FALSE;
-	}
-
-	DATE_FORMAT_METHOD_FETCH_OBJECT;
-
-	internal_set_calendar( dfo, dfo->timezone_id, strlen(dfo->timezone_id), calendar, return_value TSRMLS_CC );
-
-	/* Set the calendar  value in the IntlDateFormatter object */
-	dfo->calendar = calendar;
-
-	RETURN_TRUE;
-}
-/* }}} */
-
-
diff --git a/ext/intl/dateformat/dateformat_attr.h b/ext/intl/dateformat/dateformat_attr.h
index bf28824d63..6fe82a6e00 100644
--- a/ext/intl/dateformat/dateformat_attr.h
+++ b/ext/intl/dateformat/dateformat_attr.h
@@ -21,11 +21,7 @@
 //PHP_FUNCTION( datefmt_get_timezone );
 PHP_FUNCTION( datefmt_get_datetype );
 PHP_FUNCTION( datefmt_get_timetype );
-PHP_FUNCTION( datefmt_get_calendar );
-PHP_FUNCTION( datefmt_set_calendar );
 PHP_FUNCTION( datefmt_get_locale );
-PHP_FUNCTION( datefmt_get_timezone_id );
-PHP_FUNCTION( datefmt_set_timezone_id );
 PHP_FUNCTION( datefmt_get_pattern );
 PHP_FUNCTION( datefmt_set_pattern );
 PHP_FUNCTION( datefmt_is_lenient );
diff --git a/ext/intl/dateformat/dateformat_attrcpp.cpp b/ext/intl/dateformat/dateformat_attrcpp.cpp
new file mode 100644
index 0000000000..b68abec659
--- /dev/null
+++ b/ext/intl/dateformat/dateformat_attrcpp.cpp
@@ -0,0 +1,261 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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/timezone.h>
+#include <unicode/calendar.h>
+#include <unicode/datefmt.h>
+
+extern "C" {
+#include "../php_intl.h"
+#include "dateformat_class.h"
+#include "dateformat_attrcpp.h"
+#define USE_TIMEZONE_POINTER 1
+#include "../timezone/timezone_class.h"
+#define USE_CALENDAR_POINTER 1
+#include "../calendar/calendar_class.h"
+}
+
+#include "../intl_convertcpp.h"
+#include "dateformat_helpers.h"
+
+static inline DateFormat *fetch_datefmt(IntlDateFormatter_object *dfo) {
+	return (DateFormat *)dfo->datef_data.udatf;
+}
+
+/* {{{ proto string IntlDateFormatter::getTimeZoneId()
+ * Get formatter timezone_id. }}} */
+/* {{{ proto string datefmt_get_timezone_id(IntlDateFormatter $mf)
+ * Get formatter timezone_id.
+ */
+U_CFUNC PHP_FUNCTION(datefmt_get_timezone_id)
+{
+	DATE_FORMAT_METHOD_INIT_VARS;
+
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
+			&object, IntlDateFormatter_ce_ptr ) == FAILURE) {
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,	"datefmt_get_timezone_"
+				"id: unable to parse input params", 0 TSRMLS_CC);
+		RETURN_FALSE;
+	}
+
+	DATE_FORMAT_METHOD_FETCH_OBJECT;
+
+	UnicodeString res = UnicodeString();
+	fetch_datefmt(dfo)->getTimeZone().getID(res);
+	intl_charFromString(res, &Z_STRVAL_P(return_value),
+			&Z_STRLEN_P(return_value), &INTL_DATA_ERROR_CODE(dfo));
+	INTL_METHOD_CHECK_STATUS(dfo, "Could not convert time zone id to UTF-8");
+
+	Z_TYPE_P(return_value) = IS_STRING;
+}
+
+/* {{{ proto IntlTimeZone IntlDateFormatter::getTimeZone()
+ * Get formatter timezone. }}} */
+/* {{{ proto IntlTimeZone datefmt_get_timezone(IntlDateFormatter $mf)
+ * Get formatter timezone.
+ */
+U_CFUNC PHP_FUNCTION(datefmt_get_timezone)
+{
+	DATE_FORMAT_METHOD_INIT_VARS;
+
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
+			&object, IntlDateFormatter_ce_ptr ) == FAILURE) {
+		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,
+			"datefmt_get_timezone: unable to parse input params", 0 TSRMLS_CC );
+		RETURN_FALSE;
+	}
+
+	DATE_FORMAT_METHOD_FETCH_OBJECT;
+
+	const TimeZone& tz = fetch_datefmt(dfo)->getTimeZone();
+	TimeZone *tz_clone = tz.clone();
+	if (tz_clone == NULL) {
+		intl_errors_set(INTL_DATA_ERROR_P(dfo), U_MEMORY_ALLOCATION_ERROR,
+				"datefmt_get_timezone: Out of memory when cloning time zone",
+				0 TSRMLS_CC);
+		RETURN_FALSE;
+	}
+
+	object_init_ex(return_value, TimeZone_ce_ptr);
+	timezone_object_construct(tz_clone, return_value, 1 TSRMLS_CC);
+}
+
+U_CFUNC PHP_FUNCTION(datefmt_set_timezone_id)
+{
+	php_error_docref0(NULL TSRMLS_CC, E_DEPRECATED,
+			"Use datefmt_set_timezone() instead, which also accepts a plain "
+			"time zone identifier and for which this function is now an "
+			"alias");
+	PHP_FN(datefmt_set_timezone)(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+}
+
+/* {{{ proto boolean IntlDateFormatter::setTimeZone(mixed $timezone)
+ * Set formatter's timezone. }}} */
+/* {{{ proto boolean datefmt_set_timezone_id(IntlDateFormatter $mf, $timezone_id)
+ * Set formatter timezone_id.
+ */
+U_CFUNC PHP_FUNCTION(datefmt_set_timezone)
+{
+	zval		**timezone_zv;
+	TimeZone	*timezone;
+
+	DATE_FORMAT_METHOD_INIT_VARS;
+
+	if ( zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
+			"OZ", &object, IntlDateFormatter_ce_ptr, &timezone_zv) == FAILURE) {
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR, "datefmt_set_timezone: "
+				"unable to parse input params", 0 TSRMLS_CC);
+		RETURN_FALSE;
+	}
+
+	DATE_FORMAT_METHOD_FETCH_OBJECT;
+
+	timezone = timezone_process_timezone_argument(timezone_zv,
+			INTL_DATA_ERROR_P(dfo), "datefmt_set_timezone" TSRMLS_CC);
+	if (timezone == NULL) {
+		RETURN_FALSE;
+	}
+
+	fetch_datefmt(dfo)->adoptTimeZone(timezone);
+}
+
+/* {{{ proto int IntlDateFormatter::getCalendar( )
+ * Get formatter calendar type. }}} */
+/* {{{ proto int datefmt_get_calendar(IntlDateFormatter $mf)
+ * Get formatter calendar type.
+ */
+U_CFUNC PHP_FUNCTION(datefmt_get_calendar)
+{
+	DATE_FORMAT_METHOD_INIT_VARS;
+
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
+			&object, IntlDateFormatter_ce_ptr ) == FAILURE) {
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+			"datefmt_get_calendar: unable to parse input params", 0 TSRMLS_CC);
+		RETURN_FALSE;
+	}
+
+	DATE_FORMAT_METHOD_FETCH_OBJECT;
+
+	if (dfo->calendar == -1) {
+		/* an IntlCalendar was provided to the constructor */
+		RETURN_FALSE;
+	}
+
+	RETURN_LONG(dfo->calendar);
+}
+/* }}} */
+
+/* {{{ proto IntlCalendar IntlDateFormatter::getCalendarObject()
+ * Get formatter calendar. }}} */
+/* {{{ proto IntlCalendar datefmt_get_calendar_object(IntlDateFormatter $mf)
+ * Get formatter calendar.
+ */
+U_CFUNC PHP_FUNCTION(datefmt_get_calendar_object)
+{
+	DATE_FORMAT_METHOD_INIT_VARS;
+
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O",
+			&object, IntlDateFormatter_ce_ptr ) == FAILURE) {
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+				"datefmt_get_calendar_object: unable to parse input params",
+				0 TSRMLS_CC);
+		RETURN_FALSE;
+	}
+
+	DATE_FORMAT_METHOD_FETCH_OBJECT;
+
+	const Calendar *cal = fetch_datefmt(dfo)->getCalendar();
+	if (cal == NULL) {
+		RETURN_NULL();
+	}
+
+	Calendar *cal_clone = cal->clone();
+	if (cal_clone == NULL) {
+		intl_errors_set(INTL_DATA_ERROR_P(dfo), U_MEMORY_ALLOCATION_ERROR,
+				"datefmt_get_calendar_object: Out of memory when cloning "
+				"calendar", 0 TSRMLS_CC);
+		RETURN_FALSE;
+	}
+
+	calendar_object_create(return_value, cal_clone TSRMLS_CC);
+}
+/* }}} */
+
+/* {{{ proto bool IntlDateFormatter::setCalendar(mixed $calendar)
+ * Set formatter's calendar. }}} */
+/* {{{ proto bool datefmt_set_calendar(IntlDateFormatter $mf, mixed $calendar)
+ * Set formatter's calendar.
+ */
+U_CFUNC PHP_FUNCTION(datefmt_set_calendar)
+{
+	zval	*calendar_zv;
+	DATE_FORMAT_METHOD_INIT_VARS;
+
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oz",
+			&object, IntlDateFormatter_ce_ptr, &calendar_zv) == FAILURE) {
+		intl_error_set(NULL, U_ILLEGAL_ARGUMENT_ERROR,
+			"datefmt_set_calendar: unable to parse input params", 0 TSRMLS_CC);
+		RETURN_FALSE;
+	}
+
+	DATE_FORMAT_METHOD_FETCH_OBJECT;
+
+	Calendar	*cal;
+	long		cal_type;
+	bool		cal_owned;
+	Locale		locale = Locale::createFromName(dfo->requested_locale);
+	// getting the actual locale from the DateFormat is not enough
+	// because we would have lost modifiers such as @calendar. We
+	// must store the requested locale on object creation
+
+	if (datefmt_process_calendar_arg(calendar_zv, locale,
+			"datefmt_set_calendar",	INTL_DATA_ERROR_P(dfo), cal, cal_type,
+			cal_owned TSRMLS_CC) == FAILURE) {
+		RETURN_FALSE;
+	}
+
+	if (cal_owned) {
+		/* a non IntlCalendar was specified, we want to keep the timezone */
+		TimeZone *old_timezone = fetch_datefmt(dfo)->getTimeZone().clone();
+		if (old_timezone == NULL) {
+			intl_errors_set(INTL_DATA_ERROR_P(dfo), U_MEMORY_ALLOCATION_ERROR,
+					"datefmt_set_calendar: Out of memory when cloning calendar",
+					0 TSRMLS_CC);
+			delete cal;
+			RETURN_FALSE;
+		}
+		cal->adoptTimeZone(old_timezone);
+	} else {
+		cal = cal->clone();
+		if (cal == NULL) {
+			intl_errors_set(INTL_DATA_ERROR_P(dfo), U_MEMORY_ALLOCATION_ERROR,
+					"datefmt_set_calendar: Out of memory when cloning calendar",
+					0 TSRMLS_CC);
+			RETURN_FALSE;
+		}
+	}
+
+	fetch_datefmt(dfo)->adoptCalendar(cal);
+
+	dfo->calendar = cal_type;
+
+	RETURN_TRUE;
+}
+/* }}} */
+
diff --git a/ext/intl/dateformat/dateformat_attrcpp.h b/ext/intl/dateformat/dateformat_attrcpp.h
new file mode 100644
index 0000000000..408232f940
--- /dev/null
+++ b/ext/intl/dateformat/dateformat_attrcpp.h
@@ -0,0 +1,35 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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>                          |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef DATEFORMAT_ATTRCPP_H
+#define	DATEFORMAT_ATTRCPP_H
+
+PHP_FUNCTION(datefmt_get_timezone_id);
+
+PHP_FUNCTION(datefmt_set_timezone_id);
+
+PHP_FUNCTION(datefmt_get_timezone);
+
+PHP_FUNCTION(datefmt_set_timezone);
+
+PHP_FUNCTION(datefmt_get_calendar);
+
+PHP_FUNCTION(datefmt_set_calendar);
+
+PHP_FUNCTION(datefmt_get_calendar_object);
+
+#endif	/* DATEFORMAT_ATTRCPP_H */
+
diff --git a/ext/intl/dateformat/dateformat_class.c b/ext/intl/dateformat/dateformat_class.c
index 49f316f787..211c87f59f 100644
--- a/ext/intl/dateformat/dateformat_class.c
+++ b/ext/intl/dateformat/dateformat_class.c
@@ -19,9 +19,11 @@
 #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"
+#include "dateformat_attrcpp.h"
 
 #include <zend_exceptions.h>
 
@@ -46,12 +48,12 @@ void IntlDateFormatter_object_free( zend_object *object TSRMLS_DC )
 
 	zend_object_std_dtor( &dfo->zo TSRMLS_CC );
 
-	dateformat_data_free( &dfo->datef_data TSRMLS_CC );
-	
-	if( dfo->timezone_id ){
-		efree(dfo->timezone_id);
+	if (dfo->requested_locale) {
+		efree( dfo->requested_locale );
 	}
 
+	dateformat_data_free( &dfo->datef_data TSRMLS_CC );
+
 	efree( dfo );
 }
 /* }}} */
@@ -66,10 +68,10 @@ zend_object_value IntlDateFormatter_object_create(zend_class_entry *ce TSRMLS_DC
 	dateformat_data_init( &intern->datef_data TSRMLS_CC );
 	zend_object_std_init( &intern->zo, ce TSRMLS_CC );
 	object_properties_init(&intern->zo, ce);
-	intern->date_type = 0;
-	intern->time_type = 0;
-	intern->calendar  = 1;		/* Gregorian calendar */
-	intern->timezone_id =  NULL;
+	intern->date_type			= 0;
+	intern->time_type			= 0;
+	intern->calendar			= -1;
+	intern->requested_locale	= NULL;
 
 	retval.handle = zend_objects_store_put(
 		intern,
@@ -127,6 +129,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()
 
@@ -165,15 +173,19 @@ static zend_function_entry IntlDateFormatter_class_functions[] = {
 	PHP_NAMED_FE( getDateType, ZEND_FN( datefmt_get_datetype ), arginfo_intldateformatter_getdatetype )
 	PHP_NAMED_FE( getTimeType, ZEND_FN( datefmt_get_timetype ), arginfo_intldateformatter_getdatetype )
 	PHP_NAMED_FE( getCalendar, ZEND_FN( datefmt_get_calendar ), arginfo_intldateformatter_getdatetype )
+	PHP_NAMED_FE( getCalendarObject, ZEND_FN( datefmt_get_calendar_object ), arginfo_intldateformatter_getdatetype )
 	PHP_NAMED_FE( setCalendar, ZEND_FN( datefmt_set_calendar ), arginfo_intldateformatter_setcalendar )
 	PHP_NAMED_FE( getTimeZoneId, ZEND_FN( datefmt_get_timezone_id ), arginfo_intldateformatter_getdatetype )
 	PHP_NAMED_FE( setTimeZoneId, ZEND_FN( datefmt_set_timezone_id ), arginfo_intldateformatter_settimezoneid )
+	PHP_NAMED_FE( getTimeZone, ZEND_FN( datefmt_get_timezone ), arginfo_intldateformatter_getdatetype )
+	PHP_NAMED_FE( setTimeZone, ZEND_FN( datefmt_set_timezone ), arginfo_intldateformatter_settimezoneid )
 	PHP_NAMED_FE( setPattern, ZEND_FN( datefmt_set_pattern ), arginfo_intldateformatter_setpattern )
 	PHP_NAMED_FE( getPattern, ZEND_FN( datefmt_get_pattern ), arginfo_intldateformatter_getdatetype )
 	PHP_NAMED_FE( getLocale, ZEND_FN( datefmt_get_locale ), arginfo_intldateformatter_getdatetype )
 	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_class.h b/ext/intl/dateformat/dateformat_class.h
index d58abe42f5..b4304660e2 100644
--- a/ext/intl/dateformat/dateformat_class.h
+++ b/ext/intl/dateformat/dateformat_class.h
@@ -24,12 +24,12 @@
 #include "dateformat_data.h"
 
 typedef struct {
-	zend_object     	zo;
-	dateformat_data  	datef_data;
-	int			date_type ;
-	int			time_type ;
-	int			calendar ;
-	char*			timezone_id;
+	zend_object		zo;
+	dateformat_data	datef_data;
+	int				date_type;
+	int				time_type;
+	int				calendar;
+	char			*requested_locale;
 } IntlDateFormatter_object;
 
 void dateformat_register_IntlDateFormatter_class( TSRMLS_D );
diff --git a/ext/intl/dateformat/dateformat_create.cpp b/ext/intl/dateformat/dateformat_create.cpp
new file mode 100644
index 0000000000..a2899f7974
--- /dev/null
+++ b/ext/intl/dateformat/dateformat_create.cpp
@@ -0,0 +1,193 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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: Kirti Velankar <kirtig@yahoo-inc.com>                       |
+   |          Gustavo Lopes <cataphract@php.net>                          |
+   +----------------------------------------------------------------------+
+*/
+
+#include "../intl_cppshims.h"
+
+#include <unicode/timezone.h>
+#include <unicode/calendar.h>
+#include <unicode/datefmt.h>
+
+extern "C" {
+#include <unicode/ustring.h>
+#include <unicode/udat.h>
+
+#include "php_intl.h"
+#include "dateformat_create.h"
+#include "dateformat_class.h"
+#define USE_TIMEZONE_POINTER 1
+#include "../timezone/timezone_class.h"
+#include "../intl_convert.h"
+}
+
+#include "dateformat_helpers.h"
+
+/* {{{ */
+static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS)
+{
+	zval		*object;
+
+	const char	*locale_str;
+	int			locale_len		= 0;
+	Locale		locale;
+    long		date_type		= 0;
+    long		time_type		= 0;
+	zval		*calendar_zv	= NULL;
+	Calendar	*calendar		= NULL;
+	long		calendar_type;
+	bool		calendar_owned;
+	zval		**timezone_zv	= NULL;
+	TimeZone	*timezone		= NULL;
+	bool		explicit_tz;
+    char*       pattern_str		= NULL;
+    int         pattern_str_len	= 0;
+    UChar*      svalue			= NULL;		/* UTF-16 pattern_str */
+    int         slength			= 0;
+	IntlDateFormatter_object* dfo;
+
+	intl_error_reset(NULL TSRMLS_CC);
+	object = return_value;
+	/* Parse parameters. */
+    if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sll|Zzs",
+			&locale_str, &locale_len, &date_type, &time_type, &timezone_zv,
+			&calendar_zv, &pattern_str, &pattern_str_len) == FAILURE) {
+		intl_error_set( NULL, U_ILLEGAL_ARGUMENT_ERROR,	"datefmt_create: "
+				"unable to parse input parameters", 0 TSRMLS_CC);
+		zval_dtor(return_value);
+		RETURN_NULL();
+    }
+
+	INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
+	if (locale_len == 0) {
+		locale_str = intl_locale_get_default(TSRMLS_C);
+	}
+	locale = Locale::createFromName(locale_str);
+
+	DATE_FORMAT_METHOD_FETCH_OBJECT_NO_CHECK;
+
+	if (DATE_FORMAT_OBJECT(dfo) != NULL) {
+		intl_errors_set(INTL_DATA_ERROR_P(dfo), U_ILLEGAL_ARGUMENT_ERROR,
+				"datefmt_create: cannot call constructor twice", 0 TSRMLS_CC);
+		return;
+	}
+
+	/* process calendar */
+	if (datefmt_process_calendar_arg(calendar_zv, locale, "datefmt_create",
+			INTL_DATA_ERROR_P(dfo), calendar, calendar_type,
+			calendar_owned TSRMLS_CC)
+			== FAILURE) {
+		goto error;
+	}
+
+	/* process timezone */
+	explicit_tz = timezone_zv != NULL && Z_TYPE_PP(timezone_zv) != IS_NULL;
+
+	if (explicit_tz || calendar_owned ) {
+		//we have an explicit time zone or a non-object calendar
+		timezone = timezone_process_timezone_argument(timezone_zv,
+				INTL_DATA_ERROR_P(dfo), "datefmt_create" TSRMLS_CC);
+		if (timezone == NULL) {
+			goto error;
+		}
+	}
+
+	/* Convert pattern (if specified) to UTF-16. */
+	if (pattern_str && pattern_str_len > 0) {
+		intl_convert_utf8_to_utf16(&svalue, &slength,
+				pattern_str, pattern_str_len, &INTL_DATA_ERROR_CODE(dfo));
+		if (U_FAILURE(INTL_DATA_ERROR_CODE(dfo))) {
+			/* object construction -> only set global error */
+			intl_error_set(NULL, INTL_DATA_ERROR_CODE(dfo), "datefmt_create: "
+					"error converting pattern to UTF-16", 0 TSRMLS_CC);
+			goto error;
+		}
+	}
+
+	if (pattern_str && pattern_str_len > 0) {
+		DATE_FORMAT_OBJECT(dfo) = udat_open(UDAT_IGNORE, UDAT_IGNORE,
+				locale_str, NULL, 0, svalue, slength,
+				&INTL_DATA_ERROR_CODE(dfo));
+	} else {
+		DATE_FORMAT_OBJECT(dfo) = udat_open((UDateFormatStyle)time_type,
+				(UDateFormatStyle)date_type, locale_str, NULL, 0, svalue,
+				slength, &INTL_DATA_ERROR_CODE(dfo));
+	}
+
+    if (!U_FAILURE(INTL_DATA_ERROR_CODE(dfo))) {
+		DateFormat *df = (DateFormat*)DATE_FORMAT_OBJECT(dfo);
+		if (calendar_owned) {
+			df->adoptCalendar(calendar);
+			calendar_owned = false;
+		} else {
+			df->setCalendar(*calendar);
+		}
+
+		if (timezone != NULL) {
+			df->adoptTimeZone(timezone);
+		}
+    } else {
+		intl_error_set(NULL, INTL_DATA_ERROR_CODE(dfo),	"datefmt_create: date "
+				"formatter creation failed", 0 TSRMLS_CC);
+		goto error;
+	}
+
+	/* Set the class variables */
+	dfo->date_type			= date_type;
+	dfo->time_type			= time_type;
+	dfo->calendar			= calendar_type;
+	dfo->requested_locale	= estrdup(locale_str);
+
+error:
+	if (svalue) {
+		efree(svalue);
+	}
+	if (timezone != NULL && DATE_FORMAT_OBJECT(dfo) == NULL) {
+		delete timezone;
+	}
+	if (calendar != NULL && calendar_owned) {
+		delete calendar;
+	}
+	if (U_FAILURE(intl_error_get_code(NULL TSRMLS_CC))) {
+		/* free_object handles partially constructed instances fine */
+		zval_dtor(return_value);
+		RETVAL_NULL();
+	}
+}
+/* }}} */
+
+/* {{{ proto IntlDateFormatter IntlDateFormatter::create(string $locale, long date_type, long time_type[, string $timezone_str, long $calendar, string $pattern] )
+ * Create formatter. }}} */
+/* {{{ proto IntlDateFormatter datefmt_create(string $locale, long date_type, long time_type[, string $timezone_str, long $calendar, string $pattern)
+ * Create formatter.
+ */
+U_CFUNC PHP_FUNCTION( datefmt_create )
+{
+    object_init_ex( return_value, IntlDateFormatter_ce_ptr );
+	datefmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+}
+/* }}} */
+
+/* {{{ proto void IntlDateFormatter::__construct(string $locale, long date_type, long time_type[, string $timezone_str, long $calendar, string $pattern])
+ * IntlDateFormatter object constructor.
+ */
+U_CFUNC PHP_METHOD( IntlDateFormatter, __construct )
+{
+	/* return_value param is being changed, therefore we will always return
+	 * NULL here */
+	return_value = getThis();
+	datefmt_ctor(INTERNAL_FUNCTION_PARAM_PASSTHRU);
+}
+/* }}} */
diff --git a/ext/intl/dateformat/dateformat_create.h b/ext/intl/dateformat/dateformat_create.h
new file mode 100644
index 0000000000..47e67c2f45
--- /dev/null
+++ b/ext/intl/dateformat/dateformat_create.h
@@ -0,0 +1,25 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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>                          |
+   +----------------------------------------------------------------------+
+*/
+#ifndef DATE_FORMATTER_H
+#define DATE_FORMATTER_H
+
+#include <php.h>
+
+PHP_FUNCTION( datefmt_create );
+PHP_METHOD( IntlDateFormatter, __construct );
+void dateformat_register_constants( INIT_FUNC_ARGS );
+
+#endif // DATE_FORMATTER_H
diff --git a/ext/intl/dateformat/dateformat_format.c b/ext/intl/dateformat/dateformat_format.c
index 4d03d924c8..ffae15518b 100644
--- a/ext/intl/dateformat/dateformat_format.c
+++ b/ext/intl/dateformat/dateformat_format.c
@@ -21,13 +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"
-#include "ext/date/php_date.h"
 
 /* {{{ 
  * Internal function which calls the udat_format
@@ -59,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;
 }
 /* }}} */
@@ -80,41 +98,51 @@ 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;
-	UCalendar *pcal;
+	int32_t		year,
+				month,
+				hour,
+				minute,
+				second,
+				mday;
+	UCalendar	*pcal;
+	UDate		result;
+	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) );
+	result = ucal_getMillis(pcal, &INTL_DATA_ERROR_CODE(dfo));
+	ucal_close(pcal);
+	return result;
 }
 
 
@@ -124,70 +152,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);
diff --git a/ext/intl/dateformat/dateformat_helpers.cpp b/ext/intl/dateformat/dateformat_helpers.cpp
new file mode 100644
index 0000000000..74758bbec9
--- /dev/null
+++ b/ext/intl/dateformat/dateformat_helpers.cpp
@@ -0,0 +1,106 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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 "dateformat_helpers.h"
+
+extern "C" {
+#include "../php_intl.h"
+#include <Zend/zend_operators.h>
+#define USE_CALENDAR_POINTER 1
+#include "../calendar/calendar_class.h"
+}
+
+int datefmt_process_calendar_arg(zval* calendar_zv,
+								 Locale const& locale,
+								 const char *func_name,
+								 intl_error *err,
+								 Calendar*& cal,
+								 long& cal_int_type,
+								 bool& calendar_owned TSRMLS_DC)
+{
+	char *msg;
+	UErrorCode status = UErrorCode();
+
+	if (calendar_zv == NULL || Z_TYPE_P(calendar_zv) == IS_NULL) {
+
+		// default requested
+		cal = new GregorianCalendar(locale, status);
+		calendar_owned = true;
+
+		cal_int_type = UCAL_GREGORIAN;
+
+	} else if (Z_TYPE_P(calendar_zv) == IS_LONG) {
+
+		long v = Z_LVAL_P(calendar_zv);
+		if (v != (long)UCAL_TRADITIONAL && v != (long)UCAL_GREGORIAN) {
+			spprintf(&msg, 0, "%s: invalid value for calendar type; it must be "
+					"one of IntlDateFormatter::TRADITIONAL (locale's default "
+					"calendar) or IntlDateFormatter::GREGORIAN. "
+					"Alternatively, it can be an IntlCalendar object",
+					func_name);
+			intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
+			efree(msg);
+			return FAILURE;
+		} else if (v == (long)UCAL_TRADITIONAL) {
+			cal = Calendar::createInstance(locale, status);
+		} else { //UCAL_GREGORIAN
+			cal = new GregorianCalendar(locale, status);
+		}
+		calendar_owned = true;
+
+		cal_int_type = Z_LVAL_P(calendar_zv);
+
+	} else if (Z_TYPE_P(calendar_zv) == IS_OBJECT &&
+			instanceof_function_ex(Z_OBJCE_P(calendar_zv),
+			Calendar_ce_ptr, 0 TSRMLS_CC)) {
+
+		cal = calendar_fetch_native_calendar(calendar_zv TSRMLS_CC);
+		if (cal == NULL) {
+			spprintf(&msg, 0, "%s: Found unconstructed IntlCalendar object",
+					func_name);
+			intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
+			efree(msg);
+			return FAILURE;
+		}
+		calendar_owned = false;
+
+		cal_int_type = -1;
+
+	} else {
+		spprintf(&msg, 0, "%s: Invalid calendar argument; should be an integer "
+				"or an IntlCalendar instance", func_name);
+		intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
+		efree(msg);
+		return FAILURE;
+	}
+
+	if (cal == NULL && !U_FAILURE(status)) {
+		status = U_MEMORY_ALLOCATION_ERROR;
+	}
+	if (U_FAILURE(status)) {
+		spprintf(&msg, 0, "%s: Failure instantiating calendar", func_name);
+		intl_errors_set(err, U_ILLEGAL_ARGUMENT_ERROR, msg, 1 TSRMLS_CC);
+		efree(msg);
+		return FAILURE;
+	}
+
+	return SUCCESS;
+}
diff --git a/ext/intl/dateformat/dateformat_helpers.h b/ext/intl/dateformat/dateformat_helpers.h
new file mode 100644
index 0000000000..bded0b7d78
--- /dev/null
+++ b/ext/intl/dateformat/dateformat_helpers.h
@@ -0,0 +1,39 @@
+/*
+   +----------------------------------------------------------------------+
+   | 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>                          |
+   +----------------------------------------------------------------------+
+*/
+
+#ifndef DATEFORMAT_HELPERS_H
+#define	DATEFORMAT_HELPERS_H
+
+#ifndef __cplusplus
+#error For C++ only
+#endif
+
+#include <unicode/calendar.h>
+
+extern "C" {
+#include "../php_intl.h"
+}
+
+int datefmt_process_calendar_arg(zval* calendar_zv,
+								 Locale const& locale,
+								 const char *func_name,
+								 intl_error *err,
+								 Calendar*& cal,
+								 long& cal_int_type,
+								 bool& calendar_owned TSRMLS_DC);
+
+#endif	/* DATEFORMAT_HELPERS_H */
+