Commited68472

committed

not use reflection to get value of FormType::$emptyData

1 parentcb1ee76 commited68472Copy full SHA for ed68472

File tree

+11

-9

lines changed

+11

-9

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,13 @@`
`29`	`29`	`class FormTypeextends BaseType`
`30`	`30`	`{`
`31`	`31`	`private$dataMapper;`
`32`		`-privatestatic$emptyData =null;`
	`32`	`+`
	`33`	`+/**`
	`34`	`+ * @internal`
	`35`	`+ *`
	`36`	`+ * @deprecated Don't use this property. It will be removed in symfony/form 6.0`
	`37`	`+ */`
	`38`	`+publicstatic$emptyData =null;`
`33`	`39`
`34`	`40`	`publicfunction__construct(PropertyAccessorInterface$propertyAccessor =null)`
`35`	`41`	`{`
`@@ -159,7 +165,7 @@ public function configureOptions(OptionsResolver $resolver)`
`159`	`165`	`};`
`160`	`166`
`161`	`167`	`// Derive "empty_data" closure from "data_class" option`
`162`		`-if (self::$emptyData ===null) {`
	`168`	`+if (null ===self::$emptyData) {`
`163`	`169`	`self::$emptyData =function (Options$options) {`
`164`	`170`	`$class =$options['data_class'];`
`165`	`171`

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,13 +27,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`27`	`27`	`// See https://github.com/symfony/symfony/issues/5906#issuecomment-203189375`
`28`	`28`	`if ('' ===$options['empty_data']) {`
`29`	`29`	`$builder->addViewTransformer($this);`
`30`		`- }elseif ($options['empty_data']instanceof \Closure) {`
`31`		`-$emptyData =new \ReflectionProperty(FormType::class,'emptyData');`
`32`		`-$emptyData->setAccessible(true);`
`33`		`-// Closure in "empty_data" option is the default value from FormType::configureOptions()`
`34`		`-if ($emptyData->getValue($builder->getForm()) ===$options['empty_data']) {`
`35`		`-trigger_deprecation('symfony/form','5.4','The default value of "empty_data" option in "%s" will be changed to empty string. Declare "NULL" as value for "empty_data" if you still want use "NULL" as data.',__CLASS__);`
`36`		`- }`
	`30`	`+ }elseif (FormType::$emptyData ===$options['empty_data']) {`
	`31`	`+// "empty_data" option is the default value from FormType::configureOptions()`
	`32`	`+trigger_deprecation('symfony/form','5.4','The default value of "empty_data" option in "%s" will be changed to empty string. Declare "NULL" as value for "empty_data" if you still want use "NULL" as data.',__CLASS__);`
`37`	`33`	`}`
`38`	`34`	`}`
`39`	`35`

Comments

(0)