Commitebf967d

committed

[Form] Check if IntlDateFormatter constructor returned a valid object before using it

1 parent37931f4 commitebf967dCopy full SHA for ebf967d

File tree

+14

-0

lines changed

src/Symfony/Component/Form/Extension/Core
- DataTransformer
  - DateTimeToLocalizedStringTransformer.php
- Type
  - DateType.php

+14

-0

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,8 @@ public function reverseTransform($value)`
`152`	`152`	`* Returns a preconfigured IntlDateFormatter instance`
`153`	`153`	`*`
`154`	`154`	`* @return \IntlDateFormatter`
	`155`	`+ *`
	`156`	`+ * @throws TransformationFailedException in case the date formatter can not be constructed.`
`155`	`157`	`*/`
`156`	`158`	`protectedfunctiongetIntlDateFormatter()`
`157`	`159`	`{`
`@@ -162,6 +164,12 @@ protected function getIntlDateFormatter()`
`162`	`164`	`$pattern =$this->pattern;`
`163`	`165`
`164`	`166`	`$intlDateFormatter =new \IntlDateFormatter(\Locale::getDefault(),$dateFormat,$timeFormat,$timezone,$calendar,$pattern);`
	`167`	`+`
	`168`	`+// new \intlDateFormatter may return null instead of false in case of failure, see https://bugs.php.net/bug.php?id=66323`
	`169`	`+if (!$intlDateFormatter) {`
	`170`	`+thrownewTransformationFailedException(intl_get_error_message(),intl_get_error_code());`
	`171`	`+ }`
	`172`	`+`
`165`	`173`	`$intlDateFormatter->setLenient(false);`
`166`	`174`
`167`	`175`	`return$intlDateFormatter;`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`77`	`77`	`$calendar,`
`78`	`78`	`$pattern`
`79`	`79`	`);`
	`80`	`+`
	`81`	`+// new \intlDateFormatter may return null instead of false in case of failure, see https://bugs.php.net/bug.php?id=66323`
	`82`	`+if (!$formatter) {`
	`83`	`+thrownewInvalidOptionsException(intl_get_error_message(),intl_get_error_code());`
	`84`	`+ }`
	`85`	`+`
`80`	`86`	`$formatter->setLenient(false);`
`81`	`87`
`82`	`88`	`if ('choice' ===$options['widget']) {`

Comments

(0)