[Form] Fixed DateType format option

HeahDude · HeahDude · commit cc7a6b2a2f70 · 2016-12-27T15:46:49.000+01:00
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -51,7 +51,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             throw new InvalidOptionsException('The "format" option must be one of the IntlDateFormatter constants (FULL, LONG, MEDIUM, SHORT) or a string representing a custom format.');
         }
 
-        if (null !== $pattern && (false === strpos($pattern, 'y') || false === strpos($pattern, 'M') || false === strpos($pattern, 'd'))) {
+        if (null !== $pattern && (false === strpos($pattern, 'y') && false === strpos($pattern, 'M') && false === strpos($pattern, 'd'))) {
             throw new InvalidOptionsException(sprintf('The "format" option should contain the letters "y", "M" and "d". Its current value is "%s".', $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
@@ -67,6 +67,22 @@ public function testSubmitFromSingleTextDateTimeWithDefaultFormat()
         $this->assertEquals('2010-06-02', $form->getViewData());
     }
 
+    public function testSubmitFromSingleTextDateTimeWithCustomFormat()
+    {
+        $form = $this->factory->create('date', null, array(
+            'model_timezone' => 'UTC',
+            'view_timezone' => 'UTC',
+            'widget' => 'single_text',
+            'input' => 'datetime',
+            'format' => 'yyyy'
+        ));
+
+        $form->submit('2010');
+
+        $this->assertDateTimeEquals(new \DateTime('2010-01-01 UTC'), $form->getData());
+        $this->assertEquals('2010', $form->getViewData());
+    }
+
     public function testSubmitFromSingleTextDateTime()
     {
         // we test against "de_AT", so we need the full implementation
@@ -342,7 +358,7 @@ public function testThrowExceptionIfFormatDoesNotContainYearMonthAndDay()
     {
         $this->factory->create('date', null, array(
             'months' => array(6, 7),
-            'format' => 'yy',
+            'format' => 'wrong',
         ));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`51`	`51`	`throw new InvalidOptionsException('The "format" option must be one of the IntlDateFormatter constants (FULL, LONG, MEDIUM, SHORT) or a string representing a custom format.');`
`52`	`52`	`}`
`53`	`53`
`54`		`- if (null !== $pattern && (false === strpos($pattern, 'y') \|\| false === strpos($pattern, 'M') \|\| false === strpos($pattern, 'd'))) {`
	`54`	`+ if (null !== $pattern && (false === strpos($pattern, 'y') && false === strpos($pattern, 'M') && false === strpos($pattern, 'd'))) {`
`55`	`55`	`throw new InvalidOptionsException(sprintf('The "format" option should contain the letters "y", "M" and "d". Its current value is "%s".', $pattern));`
`56`	`56`	`}`
`57`	`57`