trigger deprecation warning when using empty_value

xabbuh · xabbuh · commit 8e215f2c8efb · 2015-09-27T17:36:31.000+02:00
The `empty_value` option is deprecated in the `choice`, `date`, and
`time` form types. Therefore, a deprecation warning must be triggered
when the users configures a value for this option.

The `datetime` form type does not need to be updated as it passes
configured values to the `date` and `time` form types which trigger
deprecation warnings anyway.
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -253,7 +253,11 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         // for BC with the "empty_value" option
-        $placeholder = function (Options $options) {
+        $placeholder = function (Options $options) use ($emptyValue) {
+            if ($emptyValue !== $options['empty_value']) {
+                @trigger_error('The form option "empty_value" is deprecated since version 2.6 and will be removed in 3.0. Use "placeholder" instead.', E_USER_DEPRECATED);
+            }
+
             return $options['empty_value'];
         };
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/DateType.php b/src/Symfony/Component/Form/Extension/Core/Type/DateType.php
@@ -179,7 +179,11 @@ public function configureOptions(OptionsResolver $resolver)
             return $options['required'] ? null : '';
         };
 
-        $placeholder = function (Options $options) {
+        $placeholder = function (Options $options) use ($emptyValue) {
+            if ($emptyValue !== $options['empty_value']) {
+                @trigger_error('The form option "empty_value" is deprecated since version 2.6 and will be removed in 3.0. Use "placeholder" instead.', E_USER_DEPRECATED);
+            }
+
             return $options['empty_value'];
         };
 
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php b/src/Symfony/Component/Form/Extension/Core/Type/TimeType.php
@@ -168,7 +168,11 @@ public function configureOptions(OptionsResolver $resolver)
         };
 
         // for BC with the "empty_value" option
-        $placeholder = function (Options $options) {
+        $placeholder = function (Options $options) use ($emptyValue) {
+            if ($emptyValue !== $options['empty_value']) {
+                @trigger_error('The form option "empty_value" is deprecated since version 2.6 and will be removed in 3.0. Use "placeholder" instead.', E_USER_DEPRECATED);
+            }
+
             return $options['empty_value'];
         };
 
