diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change datetime input to datetime-local

Browse Source
This commit is contained in:
Pierre du Plessis 2017-10-02 14:38:17 +02:00
parent f7d9701cdf
commit 802c67c324
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Symfony/Component/Form/Extension/Core/Type/DateTimeType.php
View File

@ -34,17 +34,12 @@ class DateTimeType extends AbstractType
/**
* This is not quite the HTML5 format yet, because ICU lacks the
* capability of parsing and generating RFC 3339 dates, which
* are like the below pattern but with a timezone suffix. The
* timezone suffix is.
*
* * "Z" for UTC
* * "(-|+)HH:mm" for other timezones (note the colon!)
* capability of parsing and generating RFC 3339 dates.
*
* For more information see:
*
* http://userguide.icu-project.org/formatparse/datetime#TOC-Date-Time-Format-Syntax
* http://www.w3.org/TR/html-markup/input.datetime.html
* https://www.w3.org/TR/html5/sec-forms.html#local-date-and-time-state-typedatetimelocal
* http://tools.ietf.org/html/rfc3339
*
* An ICU ticket was created:
@ -54,7 +49,7 @@ class DateTimeType extends AbstractType
* yet. To temporarily circumvent this issue, DateTimeToRfc3339Transformer
* is used when the format matches this constant.
*/
const HTML5_FORMAT = "yyyy-MM-dd'T'HH:mm:ssZZZZZ";
const HTML5_FORMAT = "yyyy-MM-dd'T'HH:mm:ss";
private static $acceptedFormats = array(
\IntlDateFormatter::FULL,
@ -192,7 +187,7 @@ class DateTimeType extends AbstractType
// * the format matches the one expected by HTML5
// * the html5 is set to true
if ($options['html5'] && 'single_text' === $options['widget'] && self::HTML5_FORMAT === $options['format']) {
$view->vars['type'] = 'datetime';
$view->vars['type'] = 'datetime-local';
}
}

4
src/Symfony/Component/Form/Tests/AbstractBootstrap3LayoutTest.php
View File

@ -1525,7 +1525,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
$this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
'/input
[@type="datetime"]
[@type="datetime-local"]
[@name="name"]
[@class="my&class form-control"]
[@value="2011-02-03T04:05:06Z"]
@ -1546,7 +1546,7 @@ abstract class AbstractBootstrap3LayoutTest extends AbstractLayoutTest
$this->assertWidgetMatchesXpath($form->createView(), array('attr' => array('class' => 'my&class')),
'/input
[@type="datetime"]
[@type="datetime-local"]
[@name="name"]
[@class="my&class form-control"]
[@value="2011-02-03T04:05:06Z"]

4
src/Symfony/Component/Form/Tests/AbstractLayoutTest.php
View File

@ -1426,7 +1426,7 @@ abstract class AbstractLayoutTest extends FormIntegrationTestCase
$this->assertWidgetMatchesXpath($form->createView(), array(),
'/input
[@type="datetime"]
[@type="datetime-local"]
[@name="name"]
[@value="2011-02-03T04:05:06Z"]
'
@ -1446,7 +1446,7 @@ abstract class AbstractLayoutTest extends FormIntegrationTestCase
$this->assertWidgetMatchesXpath($form->createView(), array(),
'/input
[@type="datetime"]
[@type="datetime-local"]
[@name="name"]
[@value="2011-02-03T04:05:06Z"]
'

4
src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTimeTypeTest.php
View File

@ -283,7 +283,7 @@ class DateTimeTypeTest extends BaseTypeTest
))
->createView();
$this->assertEquals('datetime', $view->vars['type']);
$this->assertEquals('datetime-local', $view->vars['type']);
}
public function testPassDefaultPlaceholderToViewIfNotRequired()
@ -433,7 +433,7 @@ class DateTimeTypeTest extends BaseTypeTest
))
->createView();
$this->assertSame('datetime', $view->vars['type']);
$this->assertSame('datetime-local', $view->vars['type']);
}
public function testDontPassHtml5TypeIfHtml5NotAllowed()