FEATURE New DatetimeField class (form field wrapper composed of DateField andTimeField)
FEATURE New DateField and TimeField form classes with more consistent API and easier localization
API CHANGE Date/time parsing in DateField, TimeField and DatetimeField defaults to i18n::get_locale() ('en_US') instead of using en_NZ/en_GB specific parsing. Use i18n::set_locale('en_NZ') in mysite/_config.php to revert to old behaviour.
API CHANGE constructor parameter in TimeField needs to be in ISO date notation (not PHP's date())
API CHANGE TimeField, DateField and related subclasses use Zend_Date for date parsing, meaning they're stricer than the previously used strtotime()
API CHANGE Removed DMYCalendarDateField and CalendarDateField, use DateField with setConfig('showcalendar')
API CHANGE Removed CompositeDateField, DMYDateField, use DateField with setConfig('dmyfields')
API CHANGE Removed DropdownTimeField, use TimeField with setConfig('showdropdown')
API CHANGE Removed PopupDateTimeField, use DatetimeField
API CHANGE Changed 'date', 'month' and 'year' HTML field names to lowercase in DMYDateField
API CHANGE Removed support for ambiguous date formats in DateField, e.g. '06/03/03'. Use DateField->setConfig('dateformat', '<format>') to revert to this behaviour.
API CHANGE Removed flag from DateField, CalendarDateField etc., use DateField->setConfig('min') and DateField->setConfig('max')
ENHANCEMENT Using Zend_Date for DateField and TimeField, with more robust date handling, starting localization support. Set globally via i18n::set_locale(), or for a field instance through setLocale(). Note: Javascript validation is not localized yet. (from r99360)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102859 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-14 06:38:40 +02:00
|
|
|
<?php
|
2016-06-15 06:03:16 +02:00
|
|
|
|
2016-10-14 03:30:05 +02:00
|
|
|
namespace SilverStripe\Forms\Tests;
|
|
|
|
|
2016-08-19 00:51:35 +02:00
|
|
|
use SilverStripe\Dev\SapphireTest;
|
|
|
|
use SilverStripe\Control\Controller;
|
|
|
|
use SilverStripe\Forms\DatetimeField;
|
|
|
|
use SilverStripe\Forms\RequiredFields;
|
|
|
|
use SilverStripe\Forms\DateField;
|
2016-10-14 03:30:05 +02:00
|
|
|
use SilverStripe\Forms\Tests\DatetimeFieldTest\Model;
|
2016-08-19 00:51:35 +02:00
|
|
|
use SilverStripe\Forms\TimeField;
|
|
|
|
use SilverStripe\Forms\FieldList;
|
|
|
|
use SilverStripe\Forms\FormAction;
|
|
|
|
use SilverStripe\Forms\Form;
|
|
|
|
use SilverStripe\i18n\i18n;
|
2017-04-26 03:49:40 +02:00
|
|
|
use SilverStripe\ORM\FieldType\DBDatetime;
|
2016-08-19 00:51:35 +02:00
|
|
|
|
2016-12-16 05:34:21 +01:00
|
|
|
class DatetimeFieldTest extends SapphireTest
|
|
|
|
{
|
2017-01-26 05:20:08 +01:00
|
|
|
protected $timezone = null;
|
2016-12-16 05:34:21 +01:00
|
|
|
|
2017-03-24 04:00:54 +01:00
|
|
|
protected function setUp()
|
2016-12-16 05:34:21 +01:00
|
|
|
{
|
|
|
|
parent::setUp();
|
|
|
|
i18n::set_locale('en_NZ');
|
2017-01-26 05:20:08 +01:00
|
|
|
$this->timezone = date_default_timezone_get();
|
2016-12-16 05:34:21 +01:00
|
|
|
}
|
|
|
|
|
2017-03-24 04:00:54 +01:00
|
|
|
protected function tearDown()
|
2016-12-16 05:34:21 +01:00
|
|
|
{
|
2017-01-26 05:20:08 +01:00
|
|
|
date_default_timezone_set($this->timezone);
|
|
|
|
parent::tearDown(); // TODO: Change the autogenerated stub
|
2016-12-16 05:34:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public function testFormSaveInto()
|
|
|
|
{
|
2017-01-26 05:20:08 +01:00
|
|
|
$dateTimeField = new DatetimeField('MyDatetime');
|
2016-12-16 05:34:21 +01:00
|
|
|
$form = $this->getMockForm();
|
2017-01-26 05:20:08 +01:00
|
|
|
$form->Fields()->push($dateTimeField);
|
|
|
|
|
2017-04-20 05:08:44 +02:00
|
|
|
$dateTimeField->setSubmittedValue('2003-03-29T23:59:38');
|
2017-04-03 09:35:40 +02:00
|
|
|
$validator = new RequiredFields();
|
|
|
|
$this->assertTrue($dateTimeField->validate($validator));
|
|
|
|
$m = new Model();
|
|
|
|
$form->saveInto($m);
|
2017-04-20 05:08:44 +02:00
|
|
|
$this->assertEquals('2003-03-29T23:59:38', $m->MyDatetime);
|
2017-04-03 09:35:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
public function testFormSaveIntoLocalised()
|
|
|
|
{
|
|
|
|
$dateTimeField = new DatetimeField('MyDatetime');
|
2017-04-20 05:08:44 +02:00
|
|
|
$dateTimeField
|
2017-04-03 09:35:40 +02:00
|
|
|
->setHTML5(false)
|
|
|
|
->setLocale('en_NZ');
|
|
|
|
|
|
|
|
$form = $this->getMockForm();
|
|
|
|
$form->Fields()->push($dateTimeField);
|
|
|
|
|
2017-01-26 05:20:08 +01:00
|
|
|
// en_NZ standard format
|
2017-04-20 05:08:44 +02:00
|
|
|
$dateTimeField->setSubmittedValue('29/03/2003 11:59:38 pm');
|
2017-01-26 05:20:08 +01:00
|
|
|
$validator = new RequiredFields();
|
|
|
|
$this->assertTrue($dateTimeField->validate($validator));
|
2016-12-16 05:34:21 +01:00
|
|
|
$m = new Model();
|
|
|
|
$form->saveInto($m);
|
2017-04-20 05:08:44 +02:00
|
|
|
$this->assertEquals('2003-03-29T23:59:38', $m->MyDatetime);
|
2016-12-16 05:34:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public function testDataValue()
|
|
|
|
{
|
|
|
|
$f = new DatetimeField('Datetime');
|
|
|
|
$this->assertEquals(null, $f->dataValue(), 'Empty field');
|
|
|
|
|
|
|
|
$f = new DatetimeField('Datetime', null, '2003-03-29 23:59:38');
|
|
|
|
$this->assertEquals('2003-03-29 23:59:38', $f->dataValue(), 'From date/time string');
|
|
|
|
}
|
|
|
|
|
|
|
|
public function testConstructorWithoutArgs()
|
|
|
|
{
|
|
|
|
$f = new DatetimeField('Datetime');
|
|
|
|
$this->assertEquals($f->dataValue(), null);
|
|
|
|
}
|
|
|
|
|
|
|
|
// /**
|
|
|
|
// * @expectedException InvalidArgumentException
|
|
|
|
// */
|
|
|
|
// public function testConstructorWithLocalizedDateString() {
|
|
|
|
// $f = new DatetimeField('Datetime', 'Datetime', '29/03/2003 23:59:38');
|
|
|
|
// }
|
|
|
|
|
|
|
|
public function testConstructorWithIsoDate()
|
|
|
|
{
|
|
|
|
// used by Form->loadDataFrom()
|
|
|
|
$f = new DatetimeField('Datetime', 'Datetime', '2003-03-29 23:59:38');
|
|
|
|
$this->assertEquals($f->dataValue(), '2003-03-29 23:59:38');
|
|
|
|
}
|
|
|
|
|
|
|
|
// /**
|
|
|
|
// * @expectedException InvalidArgumentException
|
|
|
|
// */
|
|
|
|
// public function testSetValueWithDateString() {
|
|
|
|
// $f = new DatetimeField('Datetime', 'Datetime');
|
|
|
|
// $f->setValue('29/03/2003');
|
|
|
|
// }
|
|
|
|
|
|
|
|
public function testSetValueWithDateTimeString()
|
|
|
|
{
|
|
|
|
$f = new DatetimeField('Datetime', 'Datetime');
|
|
|
|
$f->setValue('2003-03-29 23:59:38');
|
|
|
|
$this->assertEquals($f->dataValue(), '2003-03-29 23:59:38');
|
|
|
|
}
|
|
|
|
|
2017-04-20 05:08:44 +02:00
|
|
|
public function testSetValue()
|
2016-12-16 05:34:21 +01:00
|
|
|
{
|
2017-01-26 05:20:08 +01:00
|
|
|
$datetimeField = new DatetimeField('Datetime', 'Datetime');
|
2017-04-20 05:08:44 +02:00
|
|
|
$datetimeField->setSubmittedValue('2003-03-29 23:00:00');
|
2017-04-03 09:35:40 +02:00
|
|
|
$this->assertEquals($datetimeField->dataValue(), '2003-03-29 23:00:00');
|
|
|
|
}
|
|
|
|
|
2017-04-20 05:08:44 +02:00
|
|
|
public function testSetValueWithLocalised()
|
2017-04-03 09:35:40 +02:00
|
|
|
{
|
|
|
|
$datetimeField = new DatetimeField('Datetime', 'Datetime');
|
|
|
|
|
2017-04-20 05:08:44 +02:00
|
|
|
$datetimeField
|
2017-04-03 09:35:40 +02:00
|
|
|
->setHTML5(false)
|
|
|
|
->setLocale('en_NZ');
|
|
|
|
|
2016-12-16 05:34:21 +01:00
|
|
|
// Values can only be localized (= non-ISO) in array notation
|
2017-04-20 05:08:44 +02:00
|
|
|
$datetimeField->setSubmittedValue('29/03/2003 11:00:00 pm');
|
2017-01-26 05:20:08 +01:00
|
|
|
$this->assertEquals($datetimeField->dataValue(), '2003-03-29 23:00:00');
|
2016-12-16 05:34:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public function testValidate()
|
|
|
|
{
|
|
|
|
$f = new DatetimeField('Datetime', 'Datetime', '2003-03-29 23:59:38');
|
|
|
|
$this->assertTrue($f->validate(new RequiredFields()));
|
|
|
|
|
2017-01-26 05:20:08 +01:00
|
|
|
$f = new DatetimeField('Datetime', 'Datetime', '2003-03-29 00:00:00');
|
2016-12-16 05:34:21 +01:00
|
|
|
$this->assertTrue($f->validate(new RequiredFields()));
|
|
|
|
|
2017-04-26 03:49:29 +02:00
|
|
|
$f = (new DatetimeField('Datetime', 'Datetime'))
|
|
|
|
->setSubmittedValue('2003-03-29 00:00');
|
|
|
|
$this->assertTrue($f->validate(new RequiredFields()), 'Leaving out seconds (like many browsers)');
|
|
|
|
|
2016-12-16 05:34:21 +01:00
|
|
|
$f = new DatetimeField('Datetime', 'Datetime', 'wrong');
|
|
|
|
$this->assertFalse($f->validate(new RequiredFields()));
|
|
|
|
}
|
|
|
|
|
2017-04-26 03:49:40 +02:00
|
|
|
public function testValidateMinDate()
|
|
|
|
{
|
|
|
|
$dateField = new DatetimeField('Datetime');
|
|
|
|
$dateField->setMinDatetime('2009-03-31 23:00:00');
|
|
|
|
$dateField->setValue('2009-03-31 23:00:01');
|
|
|
|
$this->assertTrue($dateField->validate(new RequiredFields()), 'Time above min datetime');
|
|
|
|
|
|
|
|
$dateField = new DatetimeField('Datetime');
|
|
|
|
$dateField->setMinDatetime('2009-03-31 23:00:00');
|
|
|
|
$dateField->setValue('2009-03-31 22:00:00');
|
|
|
|
$this->assertFalse($dateField->validate(new RequiredFields()), 'Time below min datetime');
|
|
|
|
|
|
|
|
$dateField = new DatetimeField('Datetime');
|
|
|
|
$dateField->setMinDatetime('2009-03-31 23:00:00');
|
|
|
|
$dateField->setValue('2009-03-31 23:00:00');
|
|
|
|
$this->assertTrue($dateField->validate(new RequiredFields()), 'Date and time matching min datetime');
|
|
|
|
|
|
|
|
$dateField = new DatetimeField('Datetime');
|
|
|
|
$dateField->setMinDatetime('2009-03-31 23:00:00');
|
|
|
|
$dateField->setValue('2008-03-31 23:00:00');
|
|
|
|
$this->assertFalse($dateField->validate(new RequiredFields()), 'Date below min datetime');
|
|
|
|
}
|
|
|
|
|
|
|
|
public function testValidateMinDateStrtotime()
|
|
|
|
{
|
|
|
|
$f = new DatetimeField('Datetime');
|
|
|
|
$f->setMinDatetime('-7 days');
|
|
|
|
$f->setValue(strftime('%Y-%m-%d %T', strtotime('-8 days', DBDatetime::now()->getTimestamp())));
|
|
|
|
$this->assertFalse($f->validate(new RequiredFields()), 'Date below min datetime, with strtotime');
|
|
|
|
|
|
|
|
$f = new DatetimeField('Datetime');
|
|
|
|
$f->setMinDatetime('-7 days');
|
|
|
|
$f->setValue(strftime('%Y-%m-%d %T', strtotime('-7 days', DBDatetime::now()->getTimestamp())));
|
|
|
|
$this->assertTrue($f->validate(new RequiredFields()), 'Date matching min datetime, with strtotime');
|
|
|
|
}
|
|
|
|
|
|
|
|
public function testValidateMaxDateStrtotime()
|
|
|
|
{
|
|
|
|
$f = new DatetimeField('Datetime');
|
|
|
|
$f->setMaxDatetime('7 days');
|
|
|
|
$f->setValue(strftime('%Y-%m-%d %T', strtotime('8 days', DBDatetime::now()->getTimestamp())));
|
|
|
|
$this->assertFalse($f->validate(new RequiredFields()), 'Date above max date, with strtotime');
|
|
|
|
|
|
|
|
$f = new DatetimeField('Datetime');
|
|
|
|
$f->setMaxDatetime('7 days');
|
|
|
|
$f->setValue(strftime('%Y-%m-%d %T', strtotime('7 days', DBDatetime::now()->getTimestamp())));
|
|
|
|
$this->assertTrue($f->validate(new RequiredFields()), 'Date matching max date, with strtotime');
|
|
|
|
}
|
|
|
|
|
|
|
|
public function testValidateMaxDate()
|
|
|
|
{
|
|
|
|
$f = new DatetimeField('Datetime');
|
|
|
|
$f->setMaxDatetime('2009-03-31 23:00:00');
|
|
|
|
$f->setValue('2009-03-31 22:00:00');
|
|
|
|
$this->assertTrue($f->validate(new RequiredFields()), 'Time below max datetime');
|
|
|
|
|
|
|
|
$f = new DatetimeField('Datetime');
|
|
|
|
$f->setMaxDatetime('2009-03-31 23:00:00');
|
|
|
|
$f->setValue('2010-03-31 23:00:01');
|
|
|
|
$this->assertFalse($f->validate(new RequiredFields()), 'Time above max datetime');
|
|
|
|
|
|
|
|
$f = new DatetimeField('Datetime');
|
|
|
|
$f->setMaxDatetime('2009-03-31 23:00:00');
|
|
|
|
$f->setValue('2009-03-31 23:00:00');
|
|
|
|
$this->assertTrue($f->validate(new RequiredFields()), 'Date and time matching max datetime');
|
|
|
|
|
|
|
|
$f = new DatetimeField('Datetime');
|
|
|
|
$f->setMaxDatetime('2009-03-31 23:00:00');
|
|
|
|
$f->setValue('2010-03-31 23:00:00');
|
|
|
|
$this->assertFalse($f->validate(new RequiredFields()), 'Date above max datetime');
|
|
|
|
}
|
|
|
|
|
2017-04-03 09:35:40 +02:00
|
|
|
public function testTimezoneSetLocalised()
|
2016-12-16 05:34:21 +01:00
|
|
|
{
|
|
|
|
date_default_timezone_set('Europe/Berlin');
|
|
|
|
// Berlin and Auckland have 12h time difference in northern hemisphere winter
|
2017-01-26 05:20:08 +01:00
|
|
|
$datetimeField = new DatetimeField('Datetime', 'Datetime');
|
2017-04-03 09:35:40 +02:00
|
|
|
|
2017-04-20 05:08:44 +02:00
|
|
|
$datetimeField
|
2017-04-03 09:35:40 +02:00
|
|
|
->setHTML5(false)
|
|
|
|
->setLocale('en_NZ');
|
|
|
|
|
2017-01-26 05:20:08 +01:00
|
|
|
$datetimeField->setTimezone('Pacific/Auckland');
|
|
|
|
$datetimeField->setValue('2003-12-24 23:59:59');
|
2016-12-16 05:34:21 +01:00
|
|
|
$this->assertEquals(
|
2017-01-26 05:20:08 +01:00
|
|
|
'25/12/2003 11:59:59 AM',
|
|
|
|
$datetimeField->Value(),
|
2016-12-16 05:34:21 +01:00
|
|
|
'User value is formatted, and in user timezone'
|
|
|
|
);
|
2017-04-20 05:08:44 +02:00
|
|
|
|
2016-12-16 05:34:21 +01:00
|
|
|
$this->assertEquals(
|
|
|
|
'2003-12-24 23:59:59',
|
2017-01-26 05:20:08 +01:00
|
|
|
$datetimeField->dataValue(),
|
2016-12-16 05:34:21 +01:00
|
|
|
'Data value is unformatted, and in server timezone'
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2017-04-03 09:35:40 +02:00
|
|
|
public function testTimezoneFromConfigLocalised()
|
2016-12-16 05:34:21 +01:00
|
|
|
{
|
|
|
|
date_default_timezone_set('Europe/Berlin');
|
|
|
|
// Berlin and Auckland have 12h time difference in northern hemisphere summer, but Berlin and Moscow only 2h.
|
2017-01-26 05:20:08 +01:00
|
|
|
$datetimeField = new DatetimeField('Datetime', 'Datetime');
|
2017-04-03 09:35:40 +02:00
|
|
|
|
2017-04-20 05:08:44 +02:00
|
|
|
$datetimeField
|
2017-04-03 09:35:40 +02:00
|
|
|
->setHTML5(false)
|
|
|
|
->setLocale('en_NZ');
|
|
|
|
|
2017-01-26 05:20:08 +01:00
|
|
|
$datetimeField->setTimezone('Europe/Moscow');
|
2017-04-20 05:08:44 +02:00
|
|
|
// pass in default format, at user time (Moscow)
|
|
|
|
$datetimeField->setSubmittedValue('24/06/2003 11:59:59 pm');
|
2017-01-26 05:20:08 +01:00
|
|
|
$this->assertTrue($datetimeField->validate(new RequiredFields()));
|
|
|
|
$this->assertEquals('2003-06-24 21:59:59', $datetimeField->dataValue(), 'Data value matches server timezone');
|
2016-12-16 05:34:21 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public function testGetName()
|
|
|
|
{
|
|
|
|
$field = new DatetimeField('Datetime');
|
|
|
|
|
|
|
|
$this->assertEquals('Datetime', $field->getName());
|
|
|
|
}
|
|
|
|
|
|
|
|
public function testSetName()
|
|
|
|
{
|
|
|
|
$field = new DatetimeField('Datetime', 'Datetime');
|
|
|
|
$field->setName('CustomDatetime');
|
|
|
|
$this->assertEquals('CustomDatetime', $field->getName());
|
|
|
|
}
|
|
|
|
|
|
|
|
protected function getMockForm()
|
|
|
|
{
|
2017-01-26 05:20:08 +01:00
|
|
|
/** @skipUpgrade */
|
2016-12-16 05:34:21 +01:00
|
|
|
return new Form(
|
|
|
|
new Controller(),
|
|
|
|
'Form',
|
|
|
|
new FieldList(),
|
|
|
|
new FieldList(
|
|
|
|
new FormAction('doSubmit')
|
|
|
|
)
|
|
|
|
);
|
|
|
|
}
|
2010-10-15 05:48:39 +02:00
|
|
|
}
|