tonyair
/
silverstripe-testsession
mirror of https://github.com/silverstripe/silverstripe-testsession
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #43 from open-sausages/pulls/4.0/i18n-locale 

Update to use php-intl instead of zend_date
This commit is contained in:
Ingo Schommer 2017-02-16 10:57:06 +13:00 committed by GitHub
parent 00367f210c 6ad8d24946
commit 9ca529492b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/TestSessionEnvironment.php
View File

@ -8,6 +8,7 @@ use SilverStripe\Dev\FixtureFactory;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\ORM\DB;
use SilverStripe\ORM\DatabaseAdmin;
use SilverStripe\ORM\FieldType\DBDatetime;
use SilverStripe\ORM\Versioning\Versioned;
@ -261,9 +262,10 @@ class TestSessionEnvironment extends Object
// Date and time
if (isset($state->datetime)) {
require_once 'Zend/Date.php';
$formatter = DBDatetime::singleton()->getFormatter();
$formatter->setPattern(DBDatetime::ISO_DATETIME);
// Convert DatetimeField format
if (!Zend_Date::isDate($state->datetime, 'yyyy-MM-dd HH:mm:ss')) {
if ($formatter->parse($state->datetime) === false) {
throw new LogicException(sprintf(
'Invalid date format "%s", use yyyy-MM-dd HH:mm:ss',
$state->datetime