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

[Form] Fixed: remove quoted strings from Intl date formats (e.g. es_ES full pattern)

This commit is contained in:
Bernhard Schussek 2015-06-22 17:14:39 +02:00
parent 25a50f5b55
commit 5571caa305
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,6 +145,10 @@ class DateType extends AbstractType
// remove special characters unless the format was explicitly specified // remove special characters unless the format was explicitly specified
if (!is_string($options['format'])) { if (!is_string($options['format'])) {
// remove quoted strings first
$pattern = preg_replace('/\'[^\']+\'/', '', $pattern);
// remove remaining special chars
$pattern = preg_replace('/[^yMd]+/', '', $pattern); $pattern = preg_replace('/[^yMd]+/', '', $pattern);
} }

14
src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
View File

@ -614,6 +614,20 @@ class DateTypeTest extends TestCase
$this->assertFalse(isset($view->vars['date_pattern'])); $this->assertFalse(isset($view->vars['date_pattern']));
} }
public function testDatePatternFormatWithQuotedStrings()
{
\Locale::setDefault('es_ES');
$form = $this->factory->create('date', null, array(
// EEEE, d 'de' MMMM 'de' y
'format' => \IntlDateFormatter::FULL,
));
$view = $form->createView();
$this->assertEquals('{{ day }}{{ month }}{{ year }}', $view->vars['date_pattern']);
}
public function testPassWidgetToView() public function testPassWidgetToView()
{ {
$form = $this->factory->create('date', null, array( $form = $this->factory->create('date', null, array(