DateFormat plays nice with Calendar, TimeZone

The following changes were made:

* The IntlDateFormatter constructor now accepts the usual values
  for its $timezone argument. This includes timezone identifiers,
  IntlTimeZone objects, DateTimeZone objects and NULL. An empty
  string is not accepted. An invalid time zone is no longer accepted
  (it used to use UTC in this case).
* When NULL is passed to IntlDateFormatter, the time zone specified in
  date.timezone is used instead of the ICU default.
* The IntlDateFormatter $calendar argument now accepts also an
  IntlCalendar. In this case, IntlDateFormatter::getCalendar() will
  return false.
* The time zone passed to the IntlDateFormatter is ignored if it is
  NULL and if the calendar passed is an IntlCalendar object -- in this
  case, the IntlCalendar time zone will be used instead. Otherwise,
  the time zone specified in the $timezone argument is used instead.
* Added IntlDateFormatter::getCalendarObject(), which always returns
  the IntlCalendar object that backs the DateFormat, even if a
  constant was passed to the constructor, i.e., if an IntlCalendar
  was not passed to the constructor.
* Added IntlDateFormatter::setTimeZone(). It accepts the usual values
  for time zone arguments. If NULL is passed, the time zone of the
  IntlDateFormatter WILL be overridden with the default time zone,
  even if an IntlCalendar object was passed to the constructor.
* Added IntlDateFormatter::getTimeZone(), which returns the time zone
  that's associated with the DateFormat.
* Depreacated IntlDateFormatter::setTimeZoneId() and made it an alias
  for IntlDateFormatter::setTimeZone(), as the new ::setTimeZone()
  also accepts plain identifiers, besides other types.
  IntlDateFormatter::getTimeZoneId() is not deprecated however.
* IntlDateFormatter::setCalendar() with a constant passed should now
  work correctly. This requires saving the requested locale to the
  constructor.
* Centralized the hacks required to avoid compilation disasters on
  Windows due to some headers being included inside and outside of
  extern "C" blocks.

1 files changed, 0 insertions, 164 deletions

diff --git a/ext/intl/dateformat/dateformat_attr.c b/ext/intl/dateformat/dateformat_attr.c
index 6131cedc95..a32a4860c9 100755
--- a/ext/intl/dateformat/dateformat_attr.c
+++ b/ext/intl/dateformat/dateformat_attr.c
@@ -24,39 +24,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. }}} */
@@ -110,97 +77,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 )
@@ -369,43 +245,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;
-}
-/* }}} */
-
-