Merge branch '3.4' into 4.4
* 3.4: ignore microseconds submitted by Edge
This commit is contained in:
commit
8848de5a6f
@ -60,16 +60,20 @@ class TimeType extends AbstractType
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ('single_text' === $options['widget']) {
|
if ('single_text' === $options['widget']) {
|
||||||
// handle seconds ignored by user's browser when with_seconds enabled
|
$builder->addViewTransformer(new DateTimeToStringTransformer($options['model_timezone'], $options['view_timezone'], $format));
|
||||||
// https://codereview.chromium.org/450533009/
|
|
||||||
if ($options['with_seconds']) {
|
$builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $e) use ($options) {
|
||||||
$builder->addEventListener(FormEvents::PRE_SUBMIT, function (FormEvent $e) {
|
$data = $e->getData();
|
||||||
$data = $e->getData();
|
if ($data && preg_match('/^(?P<hours>\d{2}):(?P<minutes>\d{2})(?::(?P<seconds>\d{2})(?:\.\d+)?)?$/', $data, $matches)) {
|
||||||
if ($data && preg_match('/^\d{2}:\d{2}$/', $data)) {
|
if ($options['with_seconds']) {
|
||||||
$e->setData($data.':00');
|
// handle seconds ignored by user's browser when with_seconds enabled
|
||||||
|
// https://codereview.chromium.org/450533009/
|
||||||
|
$e->setData(sprintf('%s:%s:%s', $matches['hours'], $matches['minutes'], isset($matches['seconds']) ? $matches['seconds'] : '00'));
|
||||||
|
} else {
|
||||||
|
$e->setData(sprintf('%s:%s', $matches['hours'], $matches['minutes']));
|
||||||
}
|
}
|
||||||
});
|
}
|
||||||
}
|
});
|
||||||
|
|
||||||
if (null !== $options['reference_date']) {
|
if (null !== $options['reference_date']) {
|
||||||
$format = 'Y-m-d '.$format;
|
$format = 'Y-m-d '.$format;
|
||||||
@ -82,8 +86,6 @@ class TimeType extends AbstractType
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
$builder->addViewTransformer(new DateTimeToStringTransformer($options['model_timezone'], $options['view_timezone'], $format));
|
|
||||||
} else {
|
} else {
|
||||||
$hourOptions = $minuteOptions = $secondOptions = [
|
$hourOptions = $minuteOptions = $secondOptions = [
|
||||||
'error_bubbling' => true,
|
'error_bubbling' => true,
|
||||||
|
@ -328,6 +328,54 @@ class TimeTypeTest extends BaseTypeTest
|
|||||||
$this->assertSame('14:09:10', $form->getData()->format('H:i:s'));
|
$this->assertSame('14:09:10', $form->getData()->format('H:i:s'));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testSubmitWithoutSecondsAndBrowserAddingSeconds()
|
||||||
|
{
|
||||||
|
$form = $this->factory->create(static::TESTED_TYPE, null, [
|
||||||
|
'model_timezone' => 'UTC',
|
||||||
|
'view_timezone' => 'UTC',
|
||||||
|
'input' => 'string',
|
||||||
|
'widget' => 'single_text',
|
||||||
|
'with_seconds' => false,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$form->submit('03:04:00');
|
||||||
|
|
||||||
|
$this->assertEquals('03:04:00', $form->getData());
|
||||||
|
$this->assertEquals('03:04', $form->getViewData());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSubmitWithSecondsAndBrowserAddingMicroseconds()
|
||||||
|
{
|
||||||
|
$form = $this->factory->create(static::TESTED_TYPE, null, [
|
||||||
|
'model_timezone' => 'UTC',
|
||||||
|
'view_timezone' => 'UTC',
|
||||||
|
'input' => 'string',
|
||||||
|
'widget' => 'single_text',
|
||||||
|
'with_seconds' => true,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$form->submit('03:04:00.000');
|
||||||
|
|
||||||
|
$this->assertEquals('03:04:00', $form->getData());
|
||||||
|
$this->assertEquals('03:04:00', $form->getViewData());
|
||||||
|
}
|
||||||
|
|
||||||
|
public function testSubmitWithoutSecondsAndBrowserAddingMicroseconds()
|
||||||
|
{
|
||||||
|
$form = $this->factory->create(static::TESTED_TYPE, null, [
|
||||||
|
'model_timezone' => 'UTC',
|
||||||
|
'view_timezone' => 'UTC',
|
||||||
|
'input' => 'string',
|
||||||
|
'widget' => 'single_text',
|
||||||
|
'with_seconds' => false,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$form->submit('03:04:00.000');
|
||||||
|
|
||||||
|
$this->assertEquals('03:04:00', $form->getData());
|
||||||
|
$this->assertEquals('03:04', $form->getViewData());
|
||||||
|
}
|
||||||
|
|
||||||
public function testSetDataWithoutMinutes()
|
public function testSetDataWithoutMinutes()
|
||||||
{
|
{
|
||||||
$form = $this->factory->create(static::TESTED_TYPE, null, [
|
$form = $this->factory->create(static::TESTED_TYPE, null, [
|
||||||
|
Reference in New Issue
Block a user