minor #36128 [Form][CheckboxType] Remove _false_is_empty flag (fancyweb)

nicolas-grekas · nicolas-grekas · commit 836a72acba90 · 2020-03-19T21:44:30.000+01:00
This PR was merged into the 5.1-dev branch. Discussion ---------- [Form][CheckboxType] Remove _false_is_empty flag | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Cleanup of #35938. Commits ------- 6fac6d4 [Form][CheckboxType] Remove _false_is_empty flag
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php b/src/Symfony/Component/Form/Extension/Core/Type/CheckboxType.php
@@ -33,7 +33,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         // doing so also calls setDataLocked(true).
         $builder->setData(isset($options['data']) ? $options['data'] : false);
         $builder->addViewTransformer(new BooleanToStringTransformer($options['value'], $options['false_values']));
-        $builder->setAttribute('_false_is_empty', true); // @internal - A boolean flag to treat false as empty, see Form::isEmpty() - Do not rely on it, it will be removed in Symfony 5.1.
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Form.php b/src/Symfony/Component/Form/Form.php
@@ -740,9 +740,7 @@ public function isEmpty()
             // arrays, countables
             ((\is_array($this->modelData) || $this->modelData instanceof \Countable) && 0 === \count($this->modelData)) ||
             // traversables that are not countable
-            ($this->modelData instanceof \Traversable && 0 === iterator_count($this->modelData)) ||
-            // @internal - Do not rely on it, it will be removed in Symfony 5.1.
-            (false === $this->modelData && $this->config->getAttribute('_false_is_empty'));
+            ($this->modelData instanceof \Traversable && 0 === iterator_count($this->modelData));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)`
`33`	`33`	`// doing so also calls setDataLocked(true).`
`34`	`34`	`$builder->setData(isset($options['data']) ? $options['data'] : false);`
`35`	`35`	`$builder->addViewTransformer(new BooleanToStringTransformer($options['value'], $options['false_values']));`
`36`		`- $builder->setAttribute('_false_is_empty', true); // @internal - A boolean flag to treat false as empty, see Form::isEmpty() - Do not rely on it, it will be removed in Symfony 5.1.`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`/**`