undeprecate date formats in single_text widgets
This commit is contained in:
parent
c6a2c3348f
commit
1a983d07db
@ -294,9 +294,9 @@ class DateTimeType extends AbstractType
|
||||
]);
|
||||
|
||||
$resolver->setDeprecated('date_format', function (Options $options, $dateFormat) {
|
||||
if (null !== $dateFormat && 'single_text' === $options['widget']) {
|
||||
return sprintf('Using the "date_format" option of %s when the "widget" option is set to "single_text" is deprecated since Symfony 4.3 and will lead to an exception in 5.0.', self::class);
|
||||
//throw new LogicException(sprintf('Cannot use the "date_format" option of the %s when the "widget" option is set to "single_text".', self::class));
|
||||
if (null !== $dateFormat && 'single_text' === $options['widget'] && self::HTML5_FORMAT === $options['format']) {
|
||||
return sprintf('Using the "date_format" option of %s with an HTML5 date widget is deprecated since Symfony 4.3 and will lead to an exception in 5.0.', self::class);
|
||||
//throw new LogicException(sprintf('Cannot use the "date_format" option of the %s with an HTML5 date.', self::class));
|
||||
}
|
||||
|
||||
return '';
|
||||
|
@ -491,6 +491,18 @@ class DateTimeTypeTest extends BaseTypeTest
|
||||
$this->assertArrayNotHasKey('type', $view->vars);
|
||||
}
|
||||
|
||||
public function testSingleTextWidgetWithCustomNonHtml5Format()
|
||||
{
|
||||
$form = $this->factory->create(static::TESTED_TYPE, new \DateTime('2019-02-13 19:12:13'), [
|
||||
'widget' => 'single_text',
|
||||
'date_format' => \IntlDateFormatter::SHORT,
|
||||
'format' => null,
|
||||
]);
|
||||
$view = $form->createView();
|
||||
|
||||
$this->assertSame('2/13/19, 7:12:13 PM', $view->vars['value']);
|
||||
}
|
||||
|
||||
public function testDateTypeChoiceErrorsBubbleUp()
|
||||
{
|
||||
$error = new FormError('Invalid!');
|
||||
|
Reference in New Issue
Block a user