bug #15065 [Form] Fixed: remove quoted strings from Intl date formats…

… (e.g. es_ES full pattern) (webmozart) This PR was merged into the 2.3 branch. Discussion ---------- [Form] Fixed: remove quoted strings from Intl date formats (e.g. es_ES full pattern) | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #15042 | License | MIT | Doc PR | - Commits ------- 5571caa [Form] Fixed: remove quoted strings from Intl date formats (e.g. es_ES full pattern)
symfony · Jun 22, 2015 · 92b0283 · 92b0283
2 parents 25a50f5 + 5571caa
commit 92b0283
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -145,6 +145,10 @@ public function finishView(FormView $view, FormInterface $form, array $options)
 
             // remove special characters unless the format was explicitly specified
             if (!is_string($options['format'])) {
+                // remove quoted strings first
+                $pattern = preg_replace('/\'[^\']+\'/', '', $pattern);
+
+                // remove remaining special chars
                 $pattern = preg_replace('/[^yMd]+/', '', $pattern);
             }
 

diff --git a/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php b/src/Symfony/Component/Form/Tests/Extension/Core/Type/DateTypeTest.php
@@ -614,6 +614,20 @@ public function testDontPassDatePatternIfText()
         $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()
     {
         $form = $this->factory->create('date', null, array(